Fabian Dill 122e360ec8 Merge branch 'main' into breaking_changes ... # Conflicts: # MultiClient.py # Utils.py # worlds/alttp/ItemPool.py # worlds/alttp/Main.py # worlds/alttp/Shops.py		2021-02-19 13:45:50 +01:00
..
alttp	Merge branch 'main' into breaking_changes	2021-02-19 13:45:50 +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