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

2019-10-11 04:51:39 +02:00
parent 1f5911b48c 7ea68d7e72
commit 8e1d6e8375
17 changed files with 196 additions and 115 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json
@@ -217,6 +217,12 @@
      "name": "Jade Necklace",
      "xp": 54
    },
+    {
+      "level": 26,
+      "icon": 6209,
+      "name": "Drift Net",
+      "xp": 55
+    },
    {
      "level": 27,
      "icon": 1605,
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/wilderness_crabs_teleport_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/wilderness_crabs_teleport_icon.png