Merge remote-tracking branch 'runelite/master'

2020-05-14 17:43:53 +02:00
parent c867fa0ce1 e6947be044
commit 28a7157341
30 changed files with 709 additions and 429 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -252,7 +252,8 @@
  ],
  "raw shrimps": [
    317,
-    2514
+    2514,
+    24652
  ],
  "burnt fish": [
    323,
@@ -545,7 +546,8 @@
  "bones": [
    526,
    2530,
-    3187
+    3187,
+    24655
  ],
  "monks robe": [
    542,
@@ -2163,7 +2165,8 @@
  ],
  "logs": [
    1511,
-    2511
+    2511,
+    24650
  ],
  "map part": [
    1535,