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

..

__init__.py

fix unit tests

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

AdjusterMain.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +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-30 23:29:32 +01:00

EntranceRandomizer.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +01:00

EntranceShuffle.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +01:00

InvertedRegions.py

Merge branch 'main' into breaking_changes

2021-02-19 13:45:50 +01:00

ItemPool.py

Merge branch 'main' into breaking_changes

2021-02-19 13:45:50 +01:00

Items.py

Merge branch 'main' into breaking_changes

2021-02-19 13:45:50 +01:00

Main.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +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-02-19 13:45:50 +01:00

Rom.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +01:00

Rules.py

Merge branch 'main' into breaking_changes

2021-02-19 13:45:50 +01:00

Shops.py

Merge branch 'main' into breaking_changes

2021-02-19 13:45:50 +01:00

Text.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +01:00