Merge remote-tracking branch 'runelite/master'

runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc

@@ -151,6 +151,14 @@
       "ry2": 47,
       "z1": 0,
       "z2": 0
+    },
+    { // Tatie's house
+      "rx1": 28,
+      "ry1": 5,
+      "rx2": 35,
+      "ry2": 12,
+      "z1": 0,
+      "z2": 0
     }
   ],
   "13151":[ // Prif NE
@@ -315,6 +323,14 @@
       "ry2": 25,
       "z1": 0,
       "z2": 0
+    },
+    { // Crafting shop
+      "rx1": 21,
+      "ry1": 60,
+      "rx2": 23,
+      "ry2": 60,
+      "z1": 0,
+      "z2": 0
     }
   ],
   "13150": [ // Prif SE

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

@@ -719,7 +719,7 @@
       "level": 83,
       "icon": 21338,
       "name": "Amethyst Bolt Tips",
-      "xp": 60
+      "xp": 4
     },
     {
       "level": 83,
@@ -743,13 +743,13 @@
       "level": 85,
       "icon": 21350,
       "name": "Amethyst Arrowtips",
-      "xp": 60
+      "xp": 4
     },
     {
       "level": 87,
       "icon": 21352,
       "name": "Amethyst Javelin Heads",
-      "xp": 60
+      "xp": 12
     },
     {
       "level": 87,
@@ -757,6 +757,12 @@
       "name": "Light Orb",
       "xp": 70
     },
+    {
+      "level": 89,
+      "icon": 25853,
+      "name": "Amethyst Dart Tip",
+      "xp": 7.5
+    },
     {
       "level": 89,
       "icon": 19538,

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

@@ -564,6 +564,12 @@
       "name": "Magic Shield",
       "xp": 183
     },
+    {
+      "level": 90,
+      "icon": 25849,
+      "name": "Amethyst Dart",
+      "xp": 21
+    },
     {
       "level": 90,
       "icon": 11212,