Merge remote-tracking branch 'orig_upstream/master' into ext

# Conflicts: # runelite-client/pom.xml
2019-04-25 14:32:16 +02:00
parent 5c6949231e 6f6832df7e
commit 239a477886
25 changed files with 989 additions and 996 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -6279,8 +6279,7 @@
  ],
  "kindling": [
    9094,
-    20799,
-    22350
+    20799
  ],
  "lunar helm": [
    9096,