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
parent 5d3c401f1f 1592fac792
commit 90f1629f0e
31 changed files with 289 additions and 155 deletions
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -66,6 +66,7 @@ SETTINGSTOPROCESS = {
      "crystals_ganon": "crystals_ganon",
      "weapons": "swords",

+      "retro": "retro",
      "sortingalgo": "algorithm",
      "accessibility": "accessibility",
      "restrict_boss_items": "restrict_boss_items",