Commit Graph

2 Commits

Author SHA1 Message Date
aerinon
152c383233 Merge branch 'DoorDevUnstable' into Customizer
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 13:38:59 -06:00
aerinon
dfb9ebfbdb Customizer main work 2022-03-22 16:13:31 -06:00