Merge branch 'main' into breaking_changes

Browse Source

# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py

...

This commit is contained in:

Fabian Dill

2021-03-03 01:54:52 +01:00

parent 0917f21384 2e275d1f4e

commit 0d576eefbb

14 changed files with 425 additions and 21 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.