mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-03-23 14:53:23 -07:00
# Conflicts: # BaseClasses.py # playerSettings.yaml # worlds/alttp/Options.py # worlds/alttp/Rules.py # worlds/alttp/test/dungeons/TestDungeon.py # worlds/alttp/test/inverted/TestInverted.py # worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py # worlds/alttp/test/inverted_owg/TestInvertedOWG.py # worlds/alttp/test/minor_glitches/TestMinor.py # worlds/alttp/test/owg/TestVanillaOWG.py # worlds/alttp/test/vanilla/TestVanilla.py # worlds/messenger/Options.py # worlds/messenger/Rules.py # worlds/pokemon_rb/options.py # worlds/pokemon_rb/rules.py