Commit Graph

10108 Commits

Author SHA1 Message Date
Tyler Bochard
7ec0e6e4db Merge pull request #1129 from runelite-extended/runelite-update
runeliteplus: Merge upstream
2019-07-25 16:43:07 -04:00
Zeruth
6f4cda63ac hooks: fix small typo 2019-07-25 14:47:14 -04:00
Zeruth
5de903304e runeliteplus: merge upstream 2019-07-25 14:30:56 -04:00
Zeruth
51e1ae5aaf Merge remote-tracking branch 'Upstream/master'
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/TileItem.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
2019-07-25 14:14:20 -04:00
Tomas Slusny
d7d9bef1e0 Merge pull request #9415 from Nightfirecat/fix-teleblock-timer-patterns
timersplugin: Escape periods in teleblock patterns
2019-07-25 18:18:34 +02:00
David
c0cc1a9fc4 Add GE limit for Drift net (#9411) 2019-07-25 15:32:05 +02:00
dekvall
e550fca3c9 Add gnome stronghold fishing spots to fishing plugin (#9444) 2019-07-25 15:31:15 +02:00
Tomas Slusny
75d1999731 Merge pull request #9323 from Decorth/patch-5
Adding Hespori to loot tracker
2019-07-25 14:18:40 +02:00
Tomas Slusny
272a80e23b Merge pull request #9450 from Trevor159/clue-fix
hot cold clues: center kandarin outpost dig location
2019-07-25 13:19:11 +02:00
Abex
90441d249b Merge pull request #9454 from abextm/cache-code-2019-07-25-rev181
Cache code 2019 07 25 rev181
2019-07-25 03:51:23 -06:00
RuneLite Cache-Code Autoupdater
2d036ce614 Update Scripts to 2019-07-25-rev181 2019-07-25 09:33:36 +00:00
RuneLite Cache-Code Autoupdater
9941851a6a Update NPC IDs to 2019-07-25-rev181 2019-07-25 09:33:33 +00:00
RuneLite Cache-Code Autoupdater
072b3068a9 Update Object IDs to 2019-07-25-rev181 2019-07-25 09:33:32 +00:00
RuneLite Cache-Code Autoupdater
04a27556ae Update Item variations to 2019-07-25-rev181 2019-07-25 09:33:31 +00:00
RuneLite Cache-Code Autoupdater
50d25f5ea2 Update Item IDs to 2019-07-25-rev181 2019-07-25 09:33:31 +00:00
Tyler Bochard
f0b715ee6a Merge pull request #1120 from Ganom/add-graphic-swaps-to-tmorph
tmorph: Add graphic swaps
2019-07-24 23:44:22 -04:00
Tyler Bochard
02028e0f9c Merge pull request #1111 from Owain94/gradlelelelelelele
gradle: Update
2019-07-24 23:24:59 -04:00
Owain van Brakel
1534ca47dd gradle: Enable deamon
This does not work in intellij only when running from command line, it
only disabled the deamon on travis

This reverts commit 220e150ca1.
2019-07-25 05:07:49 +02:00
Tyler Bochard
329d402b26 gradle: Don't cache script assembler 2019-07-25 05:05:36 +02:00
Tyler Bochard
26c83eae12 gradle: Don't cache injector 2019-07-25 04:44:47 +02:00
Ganom
2ccd3da5b0 Add new configs for graphic swap. 2019-07-24 22:40:46 -04:00
Ganom
83775a63c6 Add graphic swaps to tmorph 2019-07-24 22:40:18 -04:00
Owain van Brakel
220e150ca1 gradle: Disable deamon 2019-07-25 04:26:59 +02:00
Tyler Bochard
fa07ce2158 gradle: Cache vanilla 2019-07-25 03:42:34 +02:00
Owain van Brakel
9dbda2fff2 gradle: Parallel build 2019-07-25 03:03:43 +02:00
15987632
e741770083 hot cold clues: center kandarin outpost dig location 2019-07-24 20:40:14 -04:00
Owain van Brakel
55c8a8e0ee gradle: Some more build changes 2019-07-25 02:30:53 +02:00
Owain van Brakel
af4c2ad6ae gradle: Update all deps 2019-07-25 01:37:17 +02:00
Owain van Brakel
17a8fae48c gradle: Versions Plugin 2019-07-24 23:55:04 +02:00
Owain van Brakel
e911effeed gradle: Format build files 2019-07-24 23:51:35 +02:00
Owain van Brakel
da159fd765 gradle: Update default jvm options 2019-07-24 22:46:27 +02:00
Owain van Brakel
0935b5f836 gradle: Remove default memory sizes 2019-07-24 22:28:16 +02:00
Owain van Brakel
89be222b31 gradle: Shaded jar 2019-07-24 22:27:27 +02:00
Owain van Brakel
ec9c355ac1 travis: Don't chmod 2019-07-24 21:45:53 +02:00
Owain van Brakel
f3a696a7d3 Merge remote-tracking branch 'upstream/master' into gradlelelelelelele 2019-07-24 21:45:27 +02:00
Owain van Brakel
c3568cbe26 gradle: Add back gradlew 2019-07-24 21:45:12 +02:00
sdburns1998
7e4bc4400c Merge pull request #1112 from chrisjohnson/fix-gradlew-permissions
Fix permissions so ./gradlew is executable
2019-07-24 21:43:54 +02:00
Owain van Brakel
50ffd80c02 travis: Update scripts 2019-07-24 21:35:25 +02:00
Adam
f2cfea57cc chatfilter test: remove player bind 2019-07-24 15:10:47 -04:00
William Collishaw
87ec3f0bea emoji plugin: support nbsp in messages 2019-07-24 15:06:31 -04:00
Owain van Brakel
b94b9422cd gradle: Update to version 5.5.1 2019-07-24 21:05:41 +02:00
Sander de Groot
b59405eec0 chat filter: fix filtering messages containing nbsp
The chat history plugin replays messages by replacing spaces with nbsp to avoid triggering notifications and chat commands, and this was preventing the chat filter from filtering replayed messages. censorMessage already does a nbsp to space replacement.
2019-07-24 15:01:47 -04:00
Chris Johnson
4139491014 Fix permissions so ./gradlew is executable 2019-07-24 14:52:34 -04:00
Owain van Brakel
442df22f4c gradle: TaskInternal.execute() has been deprecated 2019-07-24 20:46:55 +02:00
Owain van Brakel
a0ecf6371a gradle: annotationProcessors 2019-07-24 19:40:34 +02:00
Tyler Bochard
06be6435a5 Merge pull request #1109 from Owain94/discordwarning
discord: builder default
2019-07-24 13:09:41 -04:00
Owain van Brakel
92ac422b67 discord: builder default 2019-07-24 18:59:09 +02:00
Decorth
5969a2d972 loottracker: Add Hespori loot tracking
Closes runelite/runelite#9249
2019-07-24 08:44:21 -07:00
xDemoN
4f71fb91f0 clue scrolls: Use consistent label for "Location" (#9421) 2019-07-24 17:25:41 +02:00
Adam
6d3f1208a0 Merge pull request #9389 from Nightfirecat/tag-to-untag
Use "Un-tag" and "Unmark" menu options for tagged NPCs and marked objects/tiles
2019-07-24 10:48:01 -04:00