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

Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-9-2020

Browse Source 
 Conflicts:
	runelite-client/src/main/java/net/runelite/client/RuneLite.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.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/hotcold/HotColdLocation.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
	runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
This commit is contained in:
kyle-escobar
2020-04-09 20:57:21 -04:00
parent b0a6b38536 ec3fbabbe2
commit 3e2da6c375
12 changed files with 151 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/resources/item_variations.json
View File

@@ -2352,7 +2352,8 @@
],
"cake": [
1891,
1893
1893,
24549
],
"chocolate cake": [
1897,
@@ -6929,11 +6930,11 @@
10364,
10736
],
"zamorak dhide": [
"zamorak dhide body": [
10370,
10790
],
"saradomin dhide": [
"saradomin dhide body": [
10386,
10792
],
@@ -9584,7 +9585,9 @@
],
"blade of saeldor": [
23995,
23997
23997,
24551,
24553
],
"elven top": [
24009,