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

runelite-client/src/main/resources/item_variations.json

@@ -1337,7 +1337,13 @@
     23179,
     23180,
     23181,
-    23182
+    23182,
+    23770,
+    23814,
+    23815,
+    23816,
+    23817,
+    24253
   ],
   "radimus notes": [
     714,
@@ -2266,6 +2272,10 @@
     1755,
     5601
   ],
+  "molten glass": [
+    1775,
+    24260
+  ],
   "woad leaf": [
     1793,
     5738
@@ -3301,10 +3311,6 @@
     3755,
     20573
   ],
-  "fremennik shield": [
-    3758,
-    10826
-  ],
   "saradomin page": [
     3827,
     3828,
@@ -9534,5 +9540,17 @@
     24211,
     24213,
     24215
+  ],
+  "unsealed letter": [
+    24256,
+    24257
+  ],
+  "v sigil": [
+    24258,
+    24259
+  ],
+  "vs shield": [
+    24265,
+    24266
   ]
 }

runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json

@@ -4125,5 +4125,29 @@
   "23528": 70,
   "23839": 13000,
   "23865": 40,
-  "23879": 13000
+  "23879": 13000,
+  "23685": 2000,
+  "23688": 2000,
+  "23691": 2000,
+  "23694": 2000,
+  "23697": 2000,
+  "23700": 2000,
+  "23703": 2000,
+  "23706": 2000,
+  "23709": 2000,
+  "23712": 2000,
+  "23715": 2000,
+  "23718": 2000,
+  "23721": 2000,
+  "23724": 2000,
+  "23727": 2000,
+  "23730": 2000,
+  "23733": 2000,
+  "23736": 2000,
+  "23739": 2000,
+  "23742": 2000,
+  "23745": 2000,
+  "23748": 2000,
+  "23751": 2000,
+  "23754": 2000
 }

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

@@ -313,6 +313,12 @@
       "name": "Jade Amulet (U)",
       "xp": 70
     },
+    {
+      "level": 35,
+      "icon": 6235,
+      "name": "Broodoo shield",
+      "xp": 100
+    },
     {
       "level": 36,
       "icon": 5376,

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

@@ -72,6 +72,18 @@
       "name": "Bronze Scimitar",
       "xp": 25
     },
+    {
+      "level": 5,
+      "icon": 11367,
+      "name": "Bronze Hasta",
+      "xp": 25
+    },
+    {
+      "level": 5,
+      "icon": 1237,
+      "name": "Bronze Spear",
+      "xp": 25
+    },
     {
       "level": 6,
       "icon": 19570,
@@ -240,6 +252,18 @@
       "name": "Iron Scimitar",
       "xp": 50
     },
+    {
+      "level": 20,
+      "icon": 11369,
+      "name": "Iron Hasta",
+      "xp": 50
+    },
+    {
+      "level": 20,
+      "icon": 1239,
+      "name": "Iron Spear",
+      "xp": 50
+    },
     {
       "level": 21,
       "icon": 1293,
@@ -408,6 +432,18 @@
       "name": "Steel Arrowtips",
       "xp": 37.5
     },
+    {
+      "level": 35,
+      "icon": 11371,
+      "name": "Steel Hasta",
+      "xp": 75
+    },
+    {
+      "level": 35,
+      "icon": 1241,
+      "name": "Steel Spear",
+      "xp": 75
+    },
     {
       "level": 36,
       "icon": 9425,
@@ -588,6 +624,18 @@
       "name": "Mithril Scimitar",
       "xp": 100
     },
+    {
+      "level": 55,
+      "icon": 11373,
+      "name": "Mithril Hasta",
+      "xp": 100
+    },
+    {
+      "level": 55,
+      "icon": 1243,
+      "name": "Mithril Spear",
+      "xp": 100
+    },
     {
       "level": 56,
       "icon": 1299,
@@ -756,6 +804,18 @@
       "name": "Adamant Scimitar",
       "xp": 125
     },
+    {
+      "level": 75,
+      "icon": 11375,
+      "name": "Adamant Hasta",
+      "xp": 125
+    },
+    {
+      "level": 75,
+      "icon": 1245,
+      "name": "Adamant Spear",
+      "xp": 125
+    },
     {
       "level": 76,
       "icon": 9429,
@@ -912,6 +972,18 @@
       "name": "Rune Scimitar",
       "xp": 150
     },
+    {
+      "level": 90,
+      "icon": 11377,
+      "name": "Rune Hasta",
+      "xp": 150
+    },
+    {
+      "level": 90,
+      "icon": 1247,
+      "name": "Rune Spear",
+      "xp": 150
+    },
     {
       "level": 90,
       "icon": 11283,