Merge branch '1.10.21'

cache/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.20.4</version>
+		<version>1.10.21</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

pom.xml

@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.20.4</version>
+	<version>1.10.21</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -65,7 +65,7 @@
 		<url>https://github.com/runelite/runelite</url>
 		<connection>scm:git:git://github.com/runelite/runelite</connection>
 		<developerConnection>scm:git:[email protected]:runelite/runelite</developerConnection>
-		<tag>runelite-parent-1.10.20.4</tag>
+		<tag>runelite-parent-1.10.21</tag>
 	</scm>
 
 	<developers>

runelite-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.20.4</version>
+		<version>1.10.21</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

runelite-api/src/main/interfaces/interfaces.toml

@@ -321,37 +321,37 @@ root_interface_container=16
 minimap_draw_area=21
 fixed_viewport=32
 multicombat_indicator=36
-friends_chat_tab=46
-ignores_tab=47
-friends_tab=48
-logout_tab=49
-options_tab=50
-emotes_tab=51
-music_tab=52
-friends_chat_icon=53
-ignores_icon=54
-friends_icon=55
-logout_icon=56
-options_icon=57
-emotes_icon=58
-music_icon=59
-combat_tab=62
-stats_tab=63
-quests_tab=64
-inventory_tab=65
-equipment_tab=66
-prayer_tab=67
-magic_tab=68
-combat_icon=69
-stats_icon=70
-quests_icon=71
-inventory_icon=72
-equipment_icon=73
-prayer_icon=74
-magic_icon=75
-bank_container=77
-interface_container=78
-inventory_container=82
+friends_chat_tab=47
+ignores_tab=48
+friends_tab=49
+logout_tab=50
+options_tab=51
+emotes_tab=52
+music_tab=53
+friends_chat_icon=54
+ignores_icon=55
+friends_icon=56
+logout_icon=57
+options_icon=58
+emotes_icon=59
+music_icon=60
+combat_tab=63
+stats_tab=64
+quests_tab=65
+inventory_tab=66
+equipment_tab=67
+prayer_tab=68
+magic_tab=69
+combat_icon=70
+stats_icon=71
+quests_icon=72
+inventory_icon=73
+equipment_icon=74
+prayer_icon=75
+magic_icon=76
+bank_container=78
+interface_container=79
+inventory_container=83
 
 [fossil_island_oxygen_bar]
 id=609
@@ -648,72 +648,72 @@ id=500
 [resizable_viewport]
 id=161
 resizable_viewport_old_school_box=15
-multicombat_indicator=19
-minimap_draw_area=29
-minimap_orb_holder=32
-friends_chat_tab=42
-ignores_tab=43
-friends_tab=44
-logout_tab=45
-options_tab=46
-emotes_tab=47
-music_tab=48
-friends_chat_icon=49
-ignores_icon=50
-friends_icon=51
-logout_icon=52
-options_icon=53
-emotes_icon=54
-music_icon=55
-combat_tab=58
-stats_tab=59
-quests_tab=60
-inventory_tab=61
-equipment_tab=62
-prayer_tab=63
-magic_tab=64
-combat_icon=65
-stats_icon=66
-quests_icon=67
-inventory_icon=68
-equipment_icon=69
-prayer_icon=70
-magic_icon=71
-interface_container=72
-inventory_container=78
-minimap=93
-chatbox_parent=94
-inventory_parent=95
+multicombat_indicator=20
+minimap_draw_area=30
+minimap_orb_holder=33
+friends_chat_tab=43
+ignores_tab=44
+friends_tab=45
+logout_tab=46
+options_tab=47
+emotes_tab=48
+music_tab=49
+friends_chat_icon=50
+ignores_icon=51
+friends_icon=52
+logout_icon=53
+options_icon=54
+emotes_icon=55
+music_icon=56
+combat_tab=59
+stats_tab=60
+quests_tab=61
+inventory_tab=62
+equipment_tab=63
+prayer_tab=64
+magic_tab=65
+combat_icon=66
+stats_icon=67
+quests_icon=68
+inventory_icon=69
+equipment_icon=70
+prayer_icon=71
+magic_icon=72
+interface_container=73
+inventory_container=79
+minimap=95
+chatbox_parent=96
+inventory_parent=97
 
 [resizable_viewport_bottom_line]
 id=164
 resizable_viewport_bottom_line=15
-multicombat_indicator=19
-minimap_draw_area=29
-minimap_orb_holder=32
-logout_button_overlay=33
-minimap_logout_button=34
-fc_icon=43
-friend_icon=45
-settings_icon=46
-emote_icon=47
-music_icon=48
-inventory_tab=54
-prayer_tab=56
-cmb_icon=58
-skills_icon=59
-quests_icon=60
-inventory_icon=61
-equip_icon=62
-prayer_icon=63
-magic_icon=64
-interface_container=69
-inventory_container=75
-minimap=90
-chatbox_parent=91
-tabs1=92
-tabs2=93
-inventory_parent=94
+multicombat_indicator=20
+minimap_draw_area=30
+minimap_orb_holder=33
+logout_button_overlay=34
+minimap_logout_button=35
+fc_icon=44
+friend_icon=46
+settings_icon=47
+emote_icon=48
+music_icon=49
+inventory_tab=55
+prayer_tab=57
+cmb_icon=59
+skills_icon=60
+quests_icon=61
+inventory_icon=62
+equip_icon=63
+prayer_icon=64
+magic_icon=65
+interface_container=70
+inventory_container=76
+minimap=92
+chatbox_parent=93
+tabs1=94
+tabs2=95
+inventory_parent=96
 
 [rune_pouch]
 id=190

runelite-client/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.20.4</version>
+		<version>1.10.21</version>
 	</parent>
 
 	<artifactId>client</artifactId>