Merge pull request #695 from runelite/master

bringup

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java

@@ -122,7 +122,7 @@ enum QuestStartLocation
 	MONKS_FRIEND(Quest.MONKS_FRIEND, new WorldPoint(2605, 3209, 0)),
 	MOUNTAIN_DAUGHTER(Quest.MOUNTAIN_DAUGHTER, new WorldPoint(2810, 3672, 0)),
 	MOURNINGS_ENDS_PART_I(Quest.MOURNINGS_ENDS_PART_I, new WorldPoint(2289, 3149, 0)),
-	MOURNINGS_ENDS_PART_II(Quest.MONKEY_MADNESS_II, new WorldPoint(2352, 3172, 0)),
+	MOURNINGS_ENDS_PART_II(Quest.MOURNINGS_ENDS_PART_II, new WorldPoint(2352, 3172, 0)),
 	MURDER_MYSTERY(Quest.MURDER_MYSTERY, new WorldPoint(2740, 3562, 0)),
 	MY_ARMS_BIG_ADVENTURE(Quest.MY_ARMS_BIG_ADVENTURE, new WorldPoint(2908, 10088, 0)),
 	NATURE_SPIRIT(Quest.NATURE_SPIRIT, new WorldPoint(3440, 9894, 0)),
@@ -139,7 +139,7 @@ enum QuestStartLocation
 	SCORPION_CATCHER(Quest.SCORPION_CATCHER, new WorldPoint(2701, 3399, 0)),
 	SEA_SLUG(Quest.SEA_SLUG, new WorldPoint(2715, 3302, 0)),
 	SHADES_OF_MORTTON(Quest.SHADES_OF_MORTTON, new WorldPoint(3463, 3308, 0)),
-	SHADOW_OF_THE_STORM(Quest.SHADES_OF_MORTTON, new WorldPoint(3270, 3159, 0)),
+	SHADOW_OF_THE_STORM(Quest.SHADOW_OF_THE_STORM, new WorldPoint(3270, 3159, 0)),
 	SHEEP_HERDER(Quest.SHEEP_HERDER, new WorldPoint(2616, 3299, 0)),
 	SHILO_VILLAGE(Quest.SHILO_VILLAGE, new WorldPoint(2882, 2951, 0)),
 	A_SOULS_BANE(Quest.A_SOULS_BANE, new WorldPoint(3307, 3454, 0)),

runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_crafting.json

@@ -367,12 +367,30 @@
       "name": "Topaz Amulet (U)",
       "xp": 80
     },
+    {
+      "level": 45,
+      "icon": 6328,
+      "name": "Snakeskin boots",
+      "xp": 30
+    },
     {
       "level": 46,
       "icon": 567,
       "name": "Unpowered Orb",
       "xp": 52.5
     },
+    {
+      "level": 47,
+      "icon": 6330,
+      "name": "Snakeskin vambraces",
+      "xp": 35
+    },
+    {
+      "level": 48,
+      "icon": 6326,
+      "name": "Snakeskin bandana",
+      "xp": 45
+    },
     {
       "level": 49,
       "icon": 4542,
@@ -385,6 +403,18 @@
       "name": "Ruby Amulet (U)",
       "xp": 85
     },
+    {
+      "level": 51,
+      "icon": 6324,
+      "name": "Snakeskin chaps",
+      "xp": 50
+    },
+    {
+      "level": 53,
+      "icon": 6322,
+      "name": "Snakeskin body",
+      "xp": 55
+    },
     {
       "level": 54,
       "icon": 1395,