Merge branch 'DoorDevUnstable' into DoorDevVolatile

Browse Source

# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py

...

This commit is contained in:

aerinon

2023-08-04 11:33:31 -06:00

parent 5d3c401f1f 1592fac792

commit 90f1629f0e

31 changed files with 289 additions and 155 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.