Merge branch 'main' into Archipelago_Main

Browse Source

# Conflicts:
#	BaseClasses.py
#	LttPAdjuster.py
#	Main.py
#	Mystery.py
#	Utils.py
#	WebHostLib/generate.py
#	playerSettings.yaml

...

This commit is contained in:

Fabian Dill

2021-04-01 11:44:37 +02:00

parent dc73fa0f33 641dbcb138

commit d24ee45462

20 changed files with 1979 additions and 1238 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

BIN

data/basepatch.apbp

Binary file not shown.