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

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

@@ -36,7 +36,9 @@
         "dungeons",
         "triforcehunt",
         "trinity",
-        "crystals"
+        "crystals",
+        "ganonhunt",
+        "completionist"
       ]
     },
     "crystals_gt": {
@@ -102,6 +104,22 @@
         "expert"
       ]
     },
+    "flute_mode": {
+      "type": "selectbox",
+      "options": [
+        "normal",
+        "active"
+      ]
+    },
+    "bow_mode": {
+      "type": "selectbox",
+      "options": [
+        "progressive",
+        "silvers",
+        "retro",
+        "retro_silvers"
+      ]
+    },
     "timer": {
       "type": "selectbox",
       "options": [
@@ -113,14 +131,6 @@
         "timed-countdown"
       ]
     },
-    "progressives": {
-      "type": "selectbox",
-      "options": [
-        "on",
-        "off",
-        "random"
-      ]
-    },
     "accessibility": {
       "type": "selectbox",
       "options": [