Merge branch 'upstream-master' into runelite

# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
55 changed files with 1763 additions and 395 deletions

View File

@@ -140,7 +140,7 @@ public final class WorldMapRectangle {
WorldMapSprite.archive1.clearFiles(); // L: 2905
class330.archive3.clearFiles(); // L: 2906
class227.archive4.clearFiles(); // L: 2907
GameShell.archive5.clearFiles(); // L: 2908
GameEngine.archive5.clearFiles(); // L: 2908
class217.archive6.clearFiles(); // L: 2909
BuddyRankComparator.archive7.clearFiles(); // L: 2910
Messages.archive8.clearFiles(); // L: 2911