Merge remote-tracking branch 'runelite/master'

2019-08-08 05:10:53 +02:00
parent e7fd183080 345f07d20f
commit 5f51d784c1
19 changed files with 276 additions and 43 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json
@@ -4087,5 +4087,10 @@
  "22622": 10,
  "22634": 100,
  "22636": 100,
-  "22647": 10
+  "22647": 10,
+  "23499": 11000,
+  "23517": 100,
+  "23522": 70,
+  "23525": 4,
+  "23528": 70
 }
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/collapsed.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/collapsed.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/expanded.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/loottracker/expanded.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
@@ -510,6 +510,12 @@
      "name": "Amethyst Arrow",
      "xp": 13.5
    },
+    {
+      "level": 84,
+      "icon": 21930,
+      "name": "Dragon Bolts",
+      "xp": 12
+    },
    {
      "level": 84,
      "icon": 21318,
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_herblore.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_herblore.json
@@ -276,6 +276,12 @@
      "name": "Stamina Potion (3)",
      "xp": 76.5
    },
+    {
+      "level": 77,
+      "icon": 12625,
+      "name": "Stamina Potion (4)",
+      "xp": 102
+    },
    {
      "level": 78,
      "icon": 189,