Merge remote-tracking branch 'runelite/master'

2020-01-23 13:13:07 +01:00
parent 6d4e1ddf85 32c8c497bd
commit 132ac1eb07
14 changed files with 130 additions and 170 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -9676,5 +9676,10 @@
    24438,
    24439,
    24440
+  ],
+  "twisted relichunter armour set": [
+    24469,
+    24472,
+    24475
  ]
 }
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/fixed_mode_minimap_clickmask.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/fixed_mode_minimap_clickmask.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki_selected.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/wiki/wiki_selected.png