Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

2022-01-01 15:34:17 -08:00
parent 85c7eaf248 b4a873755e
commit 683bea7af4
21 changed files with 425 additions and 260 deletions
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -119,6 +119,7 @@

    "randomizer.overworld.crossed": "Crossed",
    "randomizer.overworld.crossed.none": "None",
+    "randomizer.overworld.crossed.allowed": "None (Allowed)",
    "randomizer.overworld.crossed.polar": "Polar",
    "randomizer.overworld.crossed.grouped": "Grouped",
    "randomizer.overworld.crossed.limited": "Limited",
--- a/resources/app/gui/randomize/overworld/widgets.json
+++ b/resources/app/gui/randomize/overworld/widgets.json
@@ -14,6 +14,7 @@
      "default": "vanilla",
      "options": [
        "none",
+        "allowed",
        "polar",
        "grouped",
        "limited",