Merge branch 'master' of https://github.com/runelite/runelite into upstream-2601

Conflicts: cache-client/pom.xml cache-updater/pom.xml cache/pom.xml pom.xml runelite-api/pom.xml runelite-client/pom.xml runelite-jshell/pom.xml runelite-script-assembler-plugin/pom.xml
2022-02-09 23:14:52 +11:00
parent e91fc1a16a 11f9454015
commit 03f2434cd6
9 changed files with 572 additions and 12 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -1398,7 +1398,8 @@
    25789,
    25790,
    25791,
-    25792
+    25792,
+    26566
  ],
  "radimus notes": [
    714,
@@ -6221,7 +6222,8 @@
    8887,
    8888,
    8889,
-    11062
+    11062,
+    26595
  ],
  "bone dagger": [
    8872,
@@ -10333,5 +10335,11 @@
    26554,
    26557,
    26560
+  ],
+  "goblin potion": [
+    26581,
+    26583,
+    26585,
+    26587
  ]
 }