Merge branch 'DoorDevUnstable' into DoorDevVolatile

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

View File

@@ -84,6 +84,7 @@ triforce_goal_max: 30
triforce_pool_min: 30
triforce_pool_max: 40
triforce_min_difference: 10
triforce_max_difference: 12
map_shuffle:
on: 1
off: 1