Merge remote-tracking branch 'pepper/multishop-all' into multishop

Browse Source

# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp

...

This commit is contained in:

Fabian Dill

2021-01-09 16:03:59 +01:00

parent eea4cb5815 62cfa8813f

commit e36c6e97c1

14 changed files with 508 additions and 33 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.bmbp

Binary file not shown.