Merge remote-tracking branch 'upstream/master' into master

buildSrc/src/main/kotlin/Dependencies.kt

@@ -25,7 +25,7 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.2.0"
-    const val rlVersion = "1.7.11"
+    const val rlVersion = "1.7.11.1"
 
     const val openosrsVersion = "4.8.1"
 

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java

@@ -102,6 +102,7 @@ public class HiscoreResult
 	private Skill gauntlet;
 	private Skill corruptedGauntlet;
 	private Skill theatreOfBlood;
+	private Skill theatreOfBloodHardMode;
 	private Skill thermonuclearSmokeDevil;
 	private Skill tzKalZuk;
 	private Skill tzTokJad;
@@ -260,6 +261,8 @@ public class HiscoreResult
 				return corruptedGauntlet;
 			case THEATRE_OF_BLOOD:
 				return theatreOfBlood;
+			case THEATRE_OF_BLOOD_HARD_MODE:
+				return theatreOfBloodHardMode;
 			case THERMONUCLEAR_SMOKE_DEVIL:
 				return thermonuclearSmokeDevil;
 			case TZKAL_ZUK:

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java

@@ -123,13 +123,14 @@ class HiscoreResultBuilder
 			hiscoreResult.setSarachnis(skills.get(index++));
 			hiscoreResult.setScorpia(skills.get(index++));
 			hiscoreResult.setSkotizo(skills.get(index++));
-			if (skills.size() >= 81)
+			hiscoreResult.setTempoross(skills.get(index++));
-			{
-				hiscoreResult.setTempoross(skills.get(index++));
-			}
 			hiscoreResult.setGauntlet(skills.get(index++));
 			hiscoreResult.setCorruptedGauntlet(skills.get(index++));
 			hiscoreResult.setTheatreOfBlood(skills.get(index++));
+			if (skills.size() >= 82)
+			{
+				hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++));
+			}
 			hiscoreResult.setThermonuclearSmokeDevil(skills.get(index++));
 			hiscoreResult.setTzKalZuk(skills.get(index++));
 			hiscoreResult.setTzTokJad(skills.get(index++));

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java

@@ -106,6 +106,7 @@ public enum HiscoreSkill
 	THE_GAUNTLET("The Gauntlet", BOSS),
 	THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS),
 	THEATRE_OF_BLOOD("Theatre of Blood", BOSS),
+	THEATRE_OF_BLOOD_HARD_MODE("Theatre of Blood: Hard Mode", BOSS),
 	THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", BOSS),
 	TZKAL_ZUK("TzKal-Zuk", BOSS),
 	TZTOK_JAD("TzTok-Jad", BOSS),

runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java

@@ -121,17 +121,6 @@ public interface ChatFilterConfig extends Config
 		return false;
 	}
 
-	@ConfigItem(
-		keyName = "filterLogin",
-		name = "Filter Logged In/Out Messages",
-		description = "Filter your private chat to remove logged in/out messages",
-		position = 8
-	)
-	default boolean filterLogin()
-	{
-		return false;
-	}
-
 	@ConfigItem(
 		keyName = "filterGameChat",
 		name = "Filter Game Chat",

runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java

@@ -205,12 +205,6 @@ public class ChatFilterPlugin extends Plugin
 					blockMessage = message == null;
 				}
 				break;
-			case LOGINLOGOUTNOTIFICATION:
-				if (config.filterLogin())
-				{
-					blockMessage = true;
-				}
-				break;
 		}
 
 		boolean shouldCollapse = chatMessageType == PUBLICCHAT || chatMessageType == MODCHAT

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java

@@ -107,9 +107,10 @@ public class HiscorePanel extends PluginPanel
 		NIGHTMARE, OBOR, SARACHNIS,
 		SCORPIA, SKOTIZO, TEMPOROSS,
 		THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD,
-		THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, TZTOK_JAD,
+		THEATRE_OF_BLOOD_HARD_MODE, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK,
-		VENENATIS, VETION, VORKATH,
+		TZTOK_JAD, VENENATIS, VETION,
-		WINTERTODT, ZALCANO, ZULRAH
+		VORKATH, WINTERTODT, ZALCANO,
+		ZULRAH
 	);
 
 	private static final HiscoreEndpoint[] ENDPOINTS = {