Merge remote-tracking branch 'origin' into OverworldShuffle

2021-07-08 20:22:05 -07:00
parent 8ccf3db3c8 322f70a979
commit 2f836ff47c
20 changed files with 282 additions and 46 deletions
--- a/resources/app/gui/randomize/enemizer/widgets.json
+++ b/resources/app/gui/randomize/enemizer/widgets.json
@@ -5,7 +5,8 @@
      "options": [
        "none",
        "shuffled",
-        "random"
+        "random",
+        "legacy"
      ]
    },
    "bossshuffle": {
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -4,7 +4,8 @@
    "shopsanity": { "type": "checkbox" },
    "hints": {
      "type": "checkbox"
-    }
+    },
+    "fakeboots": { "type": "checkbox" }
  },
  "leftItemFrame": {
    "worldstate": {