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

resources/app/cli/lang/en.json

@@ -8,6 +8,7 @@
     "player": "Player",
     "shuffling.world": "Shuffling the World about",
     "shuffling.dungeons": "Shuffling dungeons",
+    "shuffling.pots": "Shuffling pots",
     "basic.traversal": "--Basic Traversal",
     "generating.dungeon": "Generating dungeons",
     "shuffling.keydoors": "Shuffling Key doors",

resources/app/gui/lang/en.json

@@ -64,6 +64,7 @@
     "randomizer.dungeon.dungeonintensity.3": "3: Dungeon Lobbies",
     "randomizer.dungeon.dungeonintensity.random": "Random",
 
+    "randomizer.dungeon.potshuffle": "Pot Shuffle",
     "randomizer.dungeon.experimental": "Enable Experimental Features",
 
     "randomizer.dungeon.dungeon_counters": "Dungeon Chest Counters",
@@ -76,9 +77,6 @@
     "randomizer.dungeon.mixed_travel.prevent": "Prevent Mixed Dungeon Travel",
     "randomizer.dungeon.mixed_travel.allow": "Allow Mixed Dungeon Travel",
     "randomizer.dungeon.mixed_travel.force": "Force Reachable Areas to Same Dungeon",
-
-    "randomizer.enemizer.potshuffle": "Pot Shuffle",
-
     "randomizer.enemizer.enemyshuffle": "Enemy Shuffle",
     "randomizer.enemizer.enemyshuffle.none": "None",
     "randomizer.enemizer.enemyshuffle.shuffled": "Shuffled",

resources/app/gui/randomize/dungeon/widgets.json

@@ -22,6 +22,7 @@
         "width": 35
       }
     },
+    "potshuffle": { "type": "checkbox" },
     "experimental": { "type": "checkbox" },
     "dungeon_counters": {
       "type": "selectbox",

resources/app/gui/randomize/enemizer/widgets.json

@@ -1,7 +1,4 @@
 {
-  "checkboxes": {
-    "potshuffle": { "type": "checkbox" }
-  },
   "leftEnemizerFrame": {
     "enemyshuffle": {
       "type": "selectbox",