Fabian Dill a646594f08 Merge branch 'main' into breaking_changes ...

# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py

2021-01-30 23:29:32 +01:00

..

alttp

Merge branch 'main' into breaking_changes

2021-01-30 23:29:32 +01:00

generic

move networks commands to [str, Optional[dict]] across the board

2021-01-21 23:37:58 +01:00

__init__.py

move ALTTP to its own world folder

2020-10-24 05:38:56 +02:00