Merge branch 'master' into item-cooldown

2 files changed, 12 insertions, 3 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index e8ad7f59..11a14d95 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -6,6 +6,11 @@
   "key.skyblocker.toggleA": "Toggle tab HUD to screen A",
   "key.wikiLookup": "Wiki Lookup",
 
+  "text.skyblocker.open": "Open",
+  "text.skyblocker.quit_config": "Changes Not Saved",
+  "text.skyblocker.quit_config_sure": "Are you sure you want to quit editing the config? Changes will not be saved!",
+  "text.skyblocker.quit_discard": "Quit & Discard Changes",
+
   "text.autoconfig.skyblocker.title": "Skyblocker Settings",
 
   "text.autoconfig.skyblocker.category.general": "General",
@@ -40,6 +45,7 @@
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "Shortcuts for commands consisting of only one word. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "Enable Command Argument Shortcuts",
   "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Shortcuts that replace one or more word(s)/argument(s) of a command which has multiple words/arguments. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
+  "text.autoconfig.skyblocker.option.general.shortcuts.config": "Shortcuts Config...",
   "text.autoconfig.skyblocker.option.general.quiverWarning": "Quiver Warning",
   "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "Enable Quiver Warning",
   "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons": "Enable Quiver Warning In Dungeons",
@@ -83,6 +89,7 @@
   "text.autoconfig.skyblocker.option.general.titleContainer.y": "Title Container Y Position",
   "text.autoconfig.skyblocker.option.general.titleContainer.direction": "Title Container Orientation",
   "text.autoconfig.skyblocker.option.general.titleContainer.alignment": "Title Container Horizontal Alignment",
+  "text.autoconfig.skyblocker.option.general.titleContainer.config": "Title Container Placement Config...",
   "text.autoconfig.skyblocker.option.general.teleportOverlay": "Teleport Overlay",
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "Enable Teleport Overlays",
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWeirdTransmission": "Enable Weird Transmission Overlay",
@@ -246,6 +253,7 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus Helper",
   "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Gray out chests that have already been opened.",
   "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map",
+  "text.autoconfig.skyblocker.option.locations.dungeons.mapScreen": "Dungeon Map Placement Config...",
   "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling",
   "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "Map X",
   "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Map Y",
@@ -274,8 +282,9 @@
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Enabled",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style": "Style for HUD",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]": "Simple: Shows name and percentage.",
-  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]": "Fancy: Shows name, percentage, progress bar and an icon.",
-  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "Classic: Shows name and percentage in a very simple box.",
+  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]": "\nFancy: Shows name, percentage, progress bar and an icon.",
+  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "\nClassic: Shows name and percentage in a very simple box.",
+  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen": "Dwarven HUD Config...",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Enable Background",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y",
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 888e3374..0920d7d7 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -38,7 +38,7 @@
   "depends": {
     "fabricloader": ">=0.14.22",
     "fabric-api": ">=0.89.1+1.20.2",
-    "cloth-config2": "*",
+    "yet_another_config_lib_v3": ">=3.2.0+1.20.2",
     "minecraft": "~1.20.2"
   },
   "conflicts": {