Commit Graph

11 Commits

Author SHA1 Message Date
aerinon
90f1629f0e 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
2023-08-04 11:33:31 -06:00
Catobat
bf9ad536fe Implement triforce_max_difference 2023-07-26 15:27:47 +02:00
aerinon
907639b984 any_enemy_logic option added 2023-04-10 09:07:01 -06:00
aerinon
4aae603462 Merge branch 'DoorDevUnstable' into Sandbox
# Conflicts:
#	ItemList.py
#	Items.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2023-03-10 13:43:38 -07:00
aerinon
9a71e56546 Trap door refinement with "optional" value versus "vanilla"
Slight balance of chaos mode
Warping Pool trap no longer shuffled
2023-02-17 16:55:35 -07:00
aerinon
b71c7aa2b4 Underworld dropshuffle 2022-09-30 15:38:35 -06:00
aerinon
87834986d4 Retro break up of various options 2022-09-02 13:09:39 -06:00
aerinon
21456b5c90 Merge branch 'Customizer' into Synthesis
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
2022-08-11 16:06:50 -06:00
aerinon
f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
c8f1e611f4 Mystery test suite 2021-10-27 15:02:33 -06:00