Merge branch 'main' into breaking_changes

Browse Source

# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py

...

This commit is contained in:

Fabian Dill

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

parent 25bbfb2f3e b1cf1a80e6

commit 122e360ec8

46 changed files with 10942 additions and 6539 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.