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

2022-01-04 00:27:20 -08:00
parent 97e12652d8 d6c7e3a964
commit e2187e6581
15 changed files with 162 additions and 148 deletions
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -237,6 +237,7 @@
    "randomizer.item.goal.pedestal": "Master Sword Pedestal",
    "randomizer.item.goal.dungeons": "All Dungeons",
    "randomizer.item.goal.triforcehunt": "Triforce Hunt",
+    "randomizer.item.goal.trinity": "Trinity",
    "randomizer.item.goal.crystals": "Crystals",

    "randomizer.item.crystals_gt": "Crystals to open GT",
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -35,6 +35,7 @@
        "pedestal",
        "dungeons",
        "triforcehunt",
+        "trinity",
        "crystals"
      ]
    },