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

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,
-		VENENATIS, VETION, VORKATH,
-		WINTERTODT, ZALCANO, ZULRAH
+		THEATRE_OF_BLOOD_HARD_MODE, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK,
+		TZTOK_JAD, VENENATIS, VETION,
+		VORKATH, WINTERTODT, ZALCANO,
+		ZULRAH
 	);
 
 	private static final HiscoreEndpoint[] ENDPOINTS = {