Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

2021-02-18 22:44:17 -06:00
parent 2235aab579 4ee60db31a
commit 87381e495c
34 changed files with 1432 additions and 403 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -59,6 +59,10 @@
      "expert"
    ]
  },
+  "shopsanity" : {
+    "action": "store_true",
+    "type": "bool"
+  },
  "keydropshuffle" : {
    "action": "store_true",
    "type": "bool"
@@ -363,5 +367,6 @@
      "never"
    ]
  },
-  "outputname": {}
+  "outputname": {},
+  "code": {}
 }