ThatGamerBlue 7b261b0cc7 Merge remote-tracking branch 'runelite/master' into 23072020 ...

# 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/widgets/WidgetID.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/dpscounter/DpsCounterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
#	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
#	runelite-script-assembler-plugin/pom.xml

2020-07-23 15:07:56 +01:00

..

src/main/kotlin

Merge remote-tracking branch 'runelite/master' into 23072020

2020-07-23 15:07:56 +01:00

build.gradle.kts

gradle: Refactor and update to gradle 6

2019-11-10 01:42:11 +01:00