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

2019-06-21 03:32:14 -04:00
parent 711e6c1a82 9620a4fce6
commit 1f5ac7a86a
72 changed files with 2852 additions and 491 deletions
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -176,6 +176,10 @@
    237,
    1487
  ],
+  "wine of zamorak": [
+    245,
+    23489
+  ],
  "key": [
    275,
    423,
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_30px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_30px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_large.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_large.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_30px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_30px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_large.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_large.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_completed_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_completed_icon.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_not_started_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_not_started_icon.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_started_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/quest_started_icon.png