Merge remote-tracking branch 'runelite/master' into ready-set-action

Conflicts:
	.gitignore
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
	deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java
	http-api/pom.xml
	http-service/pom.xml
	http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
	pom.xml
	protocol-api/pom.xml
	protocol/pom.xml
	runelite-api/pom.xml
	runelite-api/src/main/java/net/runelite/api/Client.java
	runelite-client/pom.xml
	runelite-client/src/main/java/net/runelite/client/RuneLite.java
	runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
	runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
	runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
	runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
	runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java
	runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java
	runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
	runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java
	runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
	runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
	runelite-client/src/main/resources/net/runelite/client/runelite.properties
	runelite-client/src/main/resources/npc_health.json
	runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
	runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
	runelite-script-assembler-plugin/pom.xml

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

@@ -9670,5 +9670,10 @@
     24393,
     24403,
     24411
+  ],
+  "iced gingerbread shield": [
+    24438,
+    24439,
+    24440
   ]
 }

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

@@ -1,5 +1,11 @@
 {
   "actions": [
+    {
+      "level": 1,
+      "icon": 9436,
+      "name": "Sinew",
+      "xp": 3
+    },
     {
       "level": 1,
       "icon": 315,
@@ -24,24 +30,36 @@
       "name": "Cooked Rabbit",
       "xp": 30
     },
+    {
+      "level": 1,
+      "icon": 319,
+      "name": "Anchovies",
+      "xp": 30
+    },
     {
       "level": 1,
       "icon": 325,
       "name": "Sardine",
       "xp": 40
     },
+    {
+      "level": 1,
+      "icon": 3146,
+      "name": "Poison Karambwan",
+      "xp": 80
+    },
+    {
+      "level": 1,
+      "icon": 1861,
+      "name": "Ugthanki Meat",
+      "xp": 40
+    },
     {
       "level": 1,
       "icon": 2309,
       "name": "Bread",
       "xp": 40
     },
-    {
-      "level": 3,
-      "icon": 9436,
-      "name": "Sinew",
-      "xp": 3
-    },
     {
       "level": 5,
       "icon": 347,
@@ -70,7 +88,7 @@
       "level": 9,
       "icon": 7072,
       "name": "Spicy Sauce",
-      "xp": 24
+      "xp": 25
     },
     {
       "level": 10,
@@ -108,6 +126,12 @@
       "name": "Thin Snail Meat",
       "xp": 70
     },
+    {
+      "level": 12,
+      "icon": 2213,
+      "name": "Spicy Crunchies",
+      "xp": 100
+    },
     {
       "level": 13,
       "icon": 7078,
@@ -126,24 +150,36 @@
       "name": "Worm Crunchies",
       "xp": 104
     },
-    {
-      "level": 15,
-      "icon": 319,
-      "name": "Anchovies",
-      "xp": 30
-    },
     {
       "level": 15,
       "icon": 333,
       "name": "Trout",
       "xp": 70
     },
+    {
+      "level": 16,
+      "icon": 6293,
+      "name": "Spider on stick",
+      "xp": 80
+    },
+    {
+      "level": 16,
+      "icon": 6295,
+      "name": "Spider on shaft",
+      "xp": 80
+    },
     {
       "level": 16,
       "icon": 7223,
       "name": "Roast Rabbit",
       "xp": 72.5
     },
+    {
+      "level": 16,
+      "icon": 2209,
+      "name": "Chocchip crunchies",
+      "xp": 100
+    },
     {
       "level": 17,
       "icon": 3371,
@@ -186,12 +222,30 @@
       "name": "Pike",
       "xp": 80
     },
+    {
+      "level": 20,
+      "icon": 712,
+      "name": "Cup of tea",
+      "xp": 52
+    },
     {
       "level": 21,
       "icon": 9988,
       "name": "Roast Beast Meat",
       "xp": 82.5
     },
+    {
+      "level": 21,
+      "icon": 7521,
+      "name": "Cooked Crab Meat",
+      "xp": 100
+    },
+    {
+      "level": 21,
+      "icon": 2130,
+      "name": "Pot of cream",
+      "xp": 18
+    },
     {
       "level": 22,
       "icon": 3373,
@@ -264,6 +318,18 @@
       "name": "Mud Pie",
       "xp": 128
     },
+    {
+      "level": 29,
+      "icon": 1909,
+      "name": "Greenman's ale",
+      "xp": 281
+    },
+    {
+      "level": 29,
+      "icon": 2259,
+      "name": "Cheese and Tomato Batta",
+      "xp": 158
+    },
     {
       "level": 30,
       "icon": 361,
@@ -288,18 +354,42 @@
       "name": "Cooked Karambwan",
       "xp": 190
     },
+    {
+      "level": 30,
+      "icon": 2878,
+      "name": "Roasted Chompy",
+      "xp": 100
+    },
+    {
+      "level": 31,
+      "icon": 7530,
+      "name": "Fishcake",
+      "xp": 100
+    },
     {
       "level": 32,
       "icon": 2092,
       "name": "Drunk Dragon",
       "xp": 160
     },
+    {
+      "level": 33,
+      "icon": 2074,
+      "name": "Choc Saturday",
+      "xp": 170
+    },
     {
       "level": 34,
       "icon": 7178,
       "name": "Garden Pie",
       "xp": 138
     },
+    {
+      "level": 34,
+      "icon": 1907,
+      "name": "Wizard's mind bomb",
+      "xp": 314
+    },
     {
       "level": 35,
       "icon": 1993,
@@ -318,6 +408,12 @@
       "name": "Rainbow Fish",
       "xp": 110
     },
+    {
+      "level": 35,
+      "icon": 2195,
+      "name": "Veg ball",
+      "xp": 175
+    },
     {
       "level": 37,
       "icon": 2064,
@@ -330,12 +426,24 @@
       "name": "Cave Eel",
       "xp": 115
     },
+    {
+      "level": 38,
+      "icon": 6697,
+      "name": "Pat of butter",
+      "xp": 40.5
+    },
     {
       "level": 39,
       "icon": 1911,
       "name": "Dragon Bitter",
       "xp": 347
     },
+    {
+      "level": 39,
+      "icon": 6703,
+      "name": "Potato with butter",
+      "xp": 40
+    },
     {
       "level": 40,
       "icon": 379,
@@ -348,18 +456,36 @@
       "name": "Cake",
       "xp": 180
     },
+    {
+      "level": 40,
+      "icon": 2187,
+      "name": "Tangled toad's legs",
+      "xp": 185
+    },
     {
       "level": 41,
       "icon": 7054,
       "name": "Chilli Potato",
       "xp": 165.5
     },
+    {
+      "level": 41,
+      "icon": 7568,
+      "name": "Cooked Jubbly",
+      "xp": 160
+    },
     {
       "level": 42,
       "icon": 2185,
       "name": "Chocolate Bomb",
       "xp": 190
     },
+    {
+      "level": 42,
+      "icon": 7084,
+      "name": "Fried Onions",
+      "xp": 60
+    },
     {
       "level": 43,
       "icon": 365,
@@ -384,12 +510,36 @@
       "name": "Meat Pizza",
       "xp": 169
     },
+    {
+      "level": 46,
+      "icon": 7082,
+      "name": "Fried Mushrooms",
+      "xp": 60
+    },
     {
       "level": 47,
       "icon": 7188,
       "name": "Fish Pie",
       "xp": 164
     },
+    {
+      "level": 47,
+      "icon": 6705,
+      "name": "Potato with cheese",
+      "xp": 40
+    },
+    {
+      "level": 48,
+      "icon": 1985,
+      "name": "Cheese",
+      "xp": 64
+    },
+    {
+      "level": 49,
+      "icon": 5751,
+      "name": "Axeman's folly",
+      "xp": 413
+    },
     {
       "level": 50,
       "icon": 2343,
@@ -414,18 +564,48 @@
       "name": "Botanical Pie",
       "xp": 180
     },
+    {
+      "level": 53,
+      "icon": 2149,
+      "name": "Lava Eel",
+      "xp": 30
+    },
+    {
+      "level": 54,
+      "icon": 5755,
+      "name": "Chef's Delight",
+      "xp": 446
+    },
     {
       "level": 55,
       "icon": 2297,
       "name": "Anchovy Pizza",
       "xp": 182
     },
+    {
+      "level": 57,
+      "icon": 7066,
+      "name": "Mushroom & onion",
+      "xp": 120
+    },
     {
       "level": 58,
       "icon": 1883,
       "name": "Ugthanki Kebab (Fresh)",
       "xp": 80
     },
+    {
+      "level": 58,
+      "icon": 1865,
+      "name": "Pitta Bread",
+      "xp": 40
+    },
+    {
+      "level": 59,
+      "icon": 5759,
+      "name": "Slayer's respite",
+      "xp": 479
+    },
     {
       "level": 60,
       "icon": 2011,
@@ -456,6 +636,12 @@
       "name": "Pineapple Pizza",
       "xp": 188
     },
+    {
+      "level": 65,
+      "icon": 245,
+      "name": "Wine of Zamorak",
+      "xp": 200
+    },
     {
       "level": 67,
       "icon": 7068,
@@ -474,6 +660,12 @@
       "name": "Admiral Pie",
       "xp": 210
     },
+    {
+      "level": 72,
+      "icon": 13339,
+      "name": "Sacred Eel",
+      "xp": 109
+    },
     {
       "level": 73,
       "icon": 22795,

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

@@ -4,7 +4,7 @@
       "level": 1,
       "icon": 52,
       "name": "Arrow Shaft",
-      "xp": 5
+      "xp": 0.33
     },
     {
       "level": 1,