Merge remote-tracking branch 'runelite/master'

runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java

@@ -75,7 +75,12 @@ public enum PohIcons
 		PORTAL_NEXUS_33396, PORTAL_NEXUS_33397, PORTAL_NEXUS_33398, PORTAL_NEXUS_33399, PORTAL_NEXUS_33400, PORTAL_NEXUS_33401, PORTAL_NEXUS_33402,
 		PORTAL_NEXUS_33403, PORTAL_NEXUS_33404, PORTAL_NEXUS_33405, PORTAL_NEXUS_33406, PORTAL_NEXUS_33407, PORTAL_NEXUS_33408, PORTAL_NEXUS_33409,
 		PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428,
-		PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431
+		PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550,
+		PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557,
+		PORTAL_NEXUS_37558, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564,
+		PORTAL_NEXUS_37565, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37570, PORTAL_NEXUS_37571,
+		PORTAL_NEXUS_37572, PORTAL_NEXUS_37573, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578,
+		PORTAL_NEXUS_37579, PORTAL_NEXUS_37580
 	),
 	XERICSTALISMAN("xericstalisman",
 		XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419

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

@@ -7787,7 +7787,8 @@
     21890,
     23073,
     23075,
-    24370
+    24370,
+    24444
   ],
   "slayer ring": [
     11866,

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

@@ -6,6 +6,12 @@
       "name": "Man / Woman",
       "xp": 8
     },
+    {
+      "level": 1,
+      "icon": 10851,
+      "name": "Winter Sq'irkjuice",
+      "xp": 350
+    },
     {
       "level": 2,
       "icon": 1965,
@@ -78,6 +84,12 @@
       "name": "Fruit Stall",
       "xp": 28
     },
+    {
+      "level": 25,
+      "icon": 10848,
+      "name": "Spring Sq'irkjuice",
+      "xp": 1350
+    },
     {
       "level": 27,
       "icon": 5318,
@@ -132,6 +144,12 @@
       "name": "Fremennik Citizen",
       "xp": 65
     },
+    {
+      "level": 45,
+      "icon": 10850,
+      "name": "Autumn Sq'irkjuice",
+      "xp": 2350
+    },
     {
       "level": 49,
       "icon": 837,
@@ -192,6 +210,12 @@
       "name": "Yanille Watchman",
       "xp": 137.5
     },
+    {
+      "level": 65,
+      "icon": 10849,
+      "name": "Summer Sq'irkjuice",
+      "xp": 3000
+    },
     {
       "level": 70,
       "icon": 3255,

runelite-client/src/main/scripts/BankSearchLayout.hash

@@ -1 +1 @@
-EE35EDE5A14C6D9934C329F6921548C6E7C34810C0D441ECEE130276A38809EA
+D3B1299112E56F2F3DABC162507F243C5BCD50C21296F5CABD23A8A6F1CB4A12

runelite-client/src/main/scripts/TriggerBankLayout.hash

@@ -1 +1 @@
-DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369
+BAA6532BC7BE7C6B39DA194976DA1223646557F982A52DC7E28EFF80F59FD6E3

runelite-client/src/main/scripts/TriggerBankLayout.rs2asm

@@ -1,7 +1,7 @@
 .id                 276
-.int_stack_count    17
+.int_stack_count    16
 .string_stack_count 0
-.int_var_count      17
+.int_var_count      16
 .string_var_count   0
 
 ; Check if we should allow server to relayout bank
@@ -41,6 +41,5 @@ LABEL2:
    iload                  13
    iload                  14
    iload                  15
-   iload                  16
    invoke                 277
    return