Merge branch 'main' into breaking_changes

Browse Source

# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py

...

This commit is contained in:

Fabian Dill

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

parent 4dc84e1dac b7f41e8991

commit 08ca4245c1

558 changed files with 13839 additions and 3095 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

803

worlds/alttp/Rom.py

File diff suppressed because it is too large Load Diff