Merge branch 'DoorDevUnstable' into Sandbox

# Conflicts: # Gui.py # Main.py # Rom.py # Rules.py # data/base2current.bps # resources/app/gui/lang/en.json # resources/app/gui/randomize/dungeon/widgets.json
2023-04-05 16:26:26 -06:00
parent a0b781521f abb11558d8
commit 187478eb24
47 changed files with 2813 additions and 4065 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -243,8 +243,11 @@
    ]
  },
  "openpyramid": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "auto",
+      "yes",
+      "no"
+    ]
  },
  "rom": {},
  "loglevel": {