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

..

__init__.py

fix unit tests

2021-01-03 17:16:07 +01:00

AdjusterMain.py

update Archipelago

2021-01-03 14:32:32 +01:00

Bosses.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

Dungeons.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

EntranceRandomizer.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

EntranceShuffle.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

InvertedRegions.py

move ALTTP to its own world folder

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

ItemPool.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

Items.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

Main.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

OverworldGlitchRules.py

move ALTTP to its own world folder

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

Regions.py

Merge branch 'main' into breaking_changes

2021-01-03 13:13:59 +01:00

Rom.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

Rules.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

Text.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00