Files
Archipelago/worlds/minecraft/docs
alwaysintreble 6f9cbe7750 Merge remote-tracking branch 'Main/main' into rework_accessibility
# 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
2023-10-10 17:47:40 -05:00
..