ThatGamerBlue
f4580f37e0
Merge remote-tracking 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/FarmingTrackerTest.java
# runelite-client/pom.xml
# runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
# runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/grounditems/GroundItemsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
# runelite-script-assembler-plugin/pom.xml