Fabian Dill dcce53f8c8 Merge branch 'main' into breaking_changes ... # Conflicts: # Adjuster.py # Gui.py # MultiClient.py # setup.py # worlds/alttp/AdjusterMain.py # worlds/alttp/Main.py		2021-02-21 20:15:07 +01:00
..
alttp	Merge branch 'main' into breaking_changes	2021-02-21 20:15:07 +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