Merge remote-tracking branch 'upstream/master' into runelite-master-1

# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
This commit is contained in:
Zeruth
2019-07-05 00:59:14 -04:00
25 changed files with 317 additions and 131 deletions

View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.28-SNAPSHOT</version>
<version>1.5.29-SNAPSHOT</version>
</parent>
<groupId>net.runelite.rs</groupId>