ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
ThatGamerBlue
2020-07-23 15:07:56 +01:00
parent 66ceba6af1 b5abb09152
commit 7b261b0cc7
15 changed files with 367 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -25,9 +25,9 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.22"
const val rlVersion = "1.6.23"
const val openosrsVersion = "3.4.0"
const val openosrsVersion = "3.4.1"
const val rsversion = 190
const val cacheversion = 165