Merge remote-tracking branch 'remotes/origin/DoorDevUnstable' into DoorDevUnstable

2020-11-07 18:48:26 +11:00
parent fdcd179186 7c9e02b182
commit 078b5eeb85
11 changed files with 435 additions and 15 deletions
--- a/resources/app/gui/randomize/dungeon/widgets.json
+++ b/resources/app/gui/randomize/dungeon/widgets.json
@@ -22,6 +22,7 @@
        "width": 35
      }
    },
+    "potshuffle": { "type": "checkbox" },
    "experimental": { "type": "checkbox" },
    "dungeon_counters": {
      "type": "selectbox",
--- a/resources/app/gui/randomize/enemizer/widgets.json
+++ b/resources/app/gui/randomize/enemizer/widgets.json
@@ -1,7 +1,4 @@
 {
-  "checkboxes": {
-    "potshuffle": { "type": "checkbox" }
-  },
  "leftEnemizerFrame": {
    "enemyshuffle": {
      "type": "selectbox",