Merge remote-tracking branch 'runelite/master' into 3107-merge

2019-07-31 08:03:28 +02:00
parent 92917fb421 72d7a88014
commit 9070f6c5ef
11 changed files with 296 additions and 129 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_agility.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_agility.json
@@ -78,6 +78,12 @@
      "name": "Pollnivneach Rooftop",
      "xp": 890
    },
+    {
+      "level": 75,
+      "icon": 23962,
+      "name": "Prifddinas Agility Course",
+      "xp": 1220
+    },
    {
      "level": 80,
      "icon": 11849,
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_farming.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_farming.json
@@ -240,6 +240,12 @@
      "name": "Lantadyme",
      "xp": 134.5
    },
+    {
+      "level": 74,
+      "icon": 23962,
+      "name": "Crystal Tree",
+      "xp": 13366
+    },
    {
      "level": 75,
      "icon": 1513,