Fabian Dill 514cd19367 Merge branch 'main' into breaking_changes ... # Conflicts: # BaseClasses.py # Mystery.py # WebHostLib/downloads.py # WebHostLib/models.py # WebHostLib/templates/macros.html # WebHostLib/upload.py # worlds/alttp/ItemPool.py # worlds/alttp/Main.py		2021-01-17 06:50:25 +01:00
..
alttp	Merge branch 'main' into breaking_changes	2021-01-17 06:50:25 +01:00
generic	fix unit tests	2021-01-03 17:16:07 +01:00
__init__.py	move ALTTP to its own world folder	2020-10-24 05:38:56 +02:00