Merge branch 'ArchipelagoMW:main' into gl

kvui.py

@@ -836,6 +836,10 @@ def _handle_color(self, node: JSONMessagePart):
         return self._handle_text(node)
 
     def _handle_text(self, node: JSONMessagePart):
+        # All other text goes through _handle_color, and we don't want to escape markup twice,
+        # or mess up text that already has intentional markup applied to it
+        if node.get("type", "text") == "text":
+            node["text"] = escape_markup(node["text"])
         for ref in node.get("refs", []):
             node["text"] = f"[ref={self.ref_count}|{ref}]{node['text']}[/ref]"
             self.ref_count += 1

setup.py

@@ -21,7 +21,7 @@
 
 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
 try:
-    requirement = 'cx-Freeze==7.0.0'
+    requirement = 'cx-Freeze==7.2.0'
     import pkg_resources
     try:
         pkg_resources.require(requirement)

worlds/subnautica/__init__.py

@@ -44,7 +44,7 @@ class SubnauticaWorld(World):
     location_name_to_id = all_locations
     options_dataclass = options.SubnauticaOptions
     options: options.SubnauticaOptions
-    required_client_version = (0, 4, 1)
+    required_client_version = (0, 5, 0)
 
     creatures_to_scan: List[str]