Merge remote-tracking branch 'runelite/master'

2020-01-29 14:20:52 +01:00
parent add4ca8005 38c6478c40
commit 7f2f43364b
6 changed files with 109 additions and 84 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -8692,6 +8692,13 @@
    20691,
    21990
  ],
+  "phoenix": [
+    20693,
+    24483,
+    24484,
+    24485,
+    24486
+  ],
  "rejuvenation potion": [
    20697,
    20699,