Merge branch 'master' of https://github.com/runelite/runelite into upstream

 Conflicts:

	runelite-api/src/main/java/net/runelite/api/Point.java

	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java

	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java

	runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java

	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java

	runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampConfig.java

	runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java

	runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java

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

@@ -1401,11 +1401,13 @@
   ],
   "coal bag": [
     764,
-    12019
+    12019,
+    24480
   ],
   "gem bag": [
     766,
-    12020
+    12020,
+    24481
   ],
   "phoenix crossbow": [
     767,
@@ -7609,6 +7611,10 @@
     11736,
     11737
   ],
+  "herb box": [
+    11738,
+    11739
+  ],
   "armadyl crossbow": [
     11785,
     23611
@@ -7815,6 +7821,10 @@
     11912,
     11914
   ],
+  "slice of birthday cake": [
+    11916,
+    11917
+  ],
   "dragon pickaxe": [
     11920,
     12797,
@@ -8271,6 +8281,10 @@
     13222,
     13224
   ],
+  "herb sack": [
+    13226,
+    24478
+  ],
   "eternal boots": [
     13235,
     23644
@@ -8539,6 +8553,10 @@
     13576,
     20785
   ],
+  "seed box": [
+    13639,
+    24482
+  ],
   "farmers boro trousers": [
     13640,
     13641
@@ -9692,9 +9710,5 @@
     24469,
     24472,
     24475
-  ],
-  "cat ears": [
-    24522,
-    24525
   ]
 }