Merge branch 'DoorDevUnstable' into DoorDevVolatile

# Conflicts: # CLI.py # Main.py # RELEASENOTES.md # Rom.py # Rules.py # data/base2current.bps # source/classes/CustomSettings.py # source/tools/MysteryUtils.py
2023-09-29 11:44:23 -06:00
parent dd9cdee37f 7a16ea4fe1
commit 267e3214a7
25 changed files with 516 additions and 157 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -215,6 +215,10 @@
    "action": "store_true",
    "type": "bool"
  },
+  "door_self_loops": {
+    "action": "store_true",
+    "type": "bool"
+  },
  "experimental": {
    "action": "store_true",
    "type": "bool"
@@ -518,5 +522,6 @@
    ]
  },
  "outputname": {},
+  "notes": {},
  "code": {}
 }