Merge branch 'DoorDevUnstable' into Sandbox

Browse Source

# Conflicts:
#	Gui.py
#	Main.py
#	Rom.py
#	Rules.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/dungeon/widgets.json

...

This commit is contained in:

aerinon

2023-04-05 16:26:26 -06:00

parent a0b781521f abb11558d8

commit 187478eb24

47 changed files with 2813 additions and 4065 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/base2current.bps

Binary file not shown.