Merge branch 'main' into rework_accessibility

# Conflicts: # worlds/alttp/Rules.py # worlds/messenger/options.py
2026-03-31 12:43:23 -07:00 · 2024-03-06 17:23:53 -06:00
parent f2aa14f9b8 e33ea0147b
commit 89f8f0ff1f
178 changed files with 13247 additions and 2156 deletions
--- a/test/general/test_helpers.py
+++ b/test/general/test_helpers.py
@@ -29,8 +29,8 @@ class TestHelpers(unittest.TestCase):
                "event_loc": None,
            },
            "TestRegion2": {
-                "loc_1": 321,
-                "loc_2": 654,
+                "loc_3": 321,
+                "loc_4": 654,
            }
        }