Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into skyhytab

# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
#	src/main/resources/skyblocker.mixins.json

Pull newest changes from upstream master

4 files changed, 304 insertions, 34 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 1e31c638..71677a29 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -20,6 +20,8 @@
   "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana Bar Position",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Experience Bar Position",
+  "text.autoconfig.skyblocker.option.general.fishing": "Fishing Helper",
+  "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Enable Fishing Helper",
   "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav",
   "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav",
   "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift",
@@ -165,6 +167,11 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle",
+  "text.autoconfig.skyblocker.option.locations.dungeons.lividColor": "Livid Color",
+  "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor": "Enable Livid Color",
+  "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor.@Tooltip": "Send the livid color in the chat during the Livid boss fight.",
+  "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "Livid Color Text",
+  "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Text which will be sent in the chat during the Livid boss fight. The string \"[color]\" will be replaced with the livid color.",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Solvers",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Colored",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Solve Click In Order",
@@ -208,5 +215,7 @@
 
   "skyblocker.updaterepository.failed":  "§b[§6Skyblocker§b] §cUpdating local repository failed. Remove files manually and restart game.",
 
-  "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!"
+  "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!",
+
+  "skyblocker.fishing.reelNow": "Reel in now!"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json
index 5aa55294..7c5ea062 100644
--- a/src/main/resources/assets/skyblocker/lang/es_ES.json
+++ b/src/main/resources/assets/skyblocker/lang/es_ES.json
@@ -25,7 +25,7 @@
     "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "Ambos",
     "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Habilitar el precio mas bajo de BIN",
     "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Habilitar los precios de compra/venta del Bazar",
-    "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Habilitar Museo & datos",
+    "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Habilitar Fecha del Museo",
     "text.autoconfig.skyblocker.option.general.hitbox": "Cajas de Colisión",
     "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "Habilitar la Caja de Colisión de la 1.8 para la tierra de cultivo",
     "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Habilitar la Caja de Colisión de la 1.8 para la palanca",
@@ -47,5 +47,102 @@
     "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4",
     "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5",
     "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6",
-    "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7"
+    "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7",
+    "text.autoconfig.skyblocker.option.messages.hideImplosion": "Ocultar el mensaje de Implosion",
+    "text.autoconfig.skyblocker.option.messages.hideCombo": "Ocultar Mensajes de Combos",
+    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Obscurece los cofres que ya han sido abiertos.",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Habilitar Fondo",
+    "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Habilitar Navegación Rápida",
+    "text.autoconfig.skyblocker.option.general.quicknav": "Navegación Rápida",
+    "text.autoconfig.skyblocker.option.general.itemTooltip": "Información extra de los objetos",
+    "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cEl precio en la información en los objetos se actualiza cada 60 segundos. De lo contrario revisa lastest.log",
+    "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Este valor no importa si estas ciclando",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button2": "Botón 2",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.messages.hideAds": "Ocultar anuncios del Chat Publico",
+    "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Ocultar mensajes del Pad de Teletransporte",
+    "text.autoconfig.skyblocker.option.messages.hideAutopet": "Ocultar mensajes del Autopet",
+    "text.autoconfig.skyblocker.option.general.itemList": "Lista de Objetos",
+    "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Habilitar la Lista de Objetos",
+    "text.autoconfig.skyblocker.category.locations": "Localizaciones",
+    "text.autoconfig.skyblocker.option.locations.dungeons": "Mazmorras",
+    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Ayuda con Croesus",
+    "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Habilitar Mapa",
+    "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Escala del Mapa",
+    "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Resuelve el Acertijo de \"Los Tres Chiflados\"",
+    "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Resuelve el Acertijo del Blaze",
+    "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Resuelve el Acertijo de Trivia",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Minas Dwarven",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Habilitar Combustible del Taladro",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Resolver Fetchur",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Interfaz de Dwarven",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Habilitado",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y",
+    "text.autoconfig.skyblocker.category.messages": "Mensajes",
+    "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Deshabilitado",
+    "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "Filtro",
+    "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "Mover a la barra de acción",
+    "text.autoconfig.skyblocker.option.messages.hideAbility": "Ocultar Mensaje de Enfriamiento (Cooldown)",
+    "text.autoconfig.skyblocker.option.messages.hideHeal": "Ocultar Mensajes de Curación",
+    "text.autoconfig.skyblocker.option.messages.hideAOTE": "Ocultar Mensajes de la AOTE",
+    "text.autoconfig.skyblocker.option.messages.hideMana": "Ocultar los Mensajes del Consumo de Maná de la Barra de Acción",
+    "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Da una mejor experiencia con FancyBar",
+    "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2¡Hay Una nueva versión disponible!",
+    "skyblocker.update.update_link": " §2§nHas Click Aquí§r",
+    "skyblocker.update.update_message_end": " §aPara conocer mas sobre las nuevas características.",
+    "skyblocker.update.hover_text": "Abrir Modrinth",
+    "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Notificaciones sobre actualizaciones",
+    "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2¡Se añadió tu API key automáticamente!",
+    "skyblocker.updaterepository.failed": "§b[§6Skyblocker§b] §cLa actualización del repositorio local fallo. Elimina los archivos manualmente y reinicia el juego.",
+    "text.autoconfig.skyblocker.option.quickNav.button11": "Botón 11",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button8": "Botón 8",
+    "text.autoconfig.skyblocker.option.quickNav.button9": "Botón 9",
+    "text.autoconfig.skyblocker.option.quickNav.button10": "Botón 10",
+    "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "Titulo de la Interfaz",
+    "text.autoconfig.skyblocker.option.quickNav.button12": "Botón 12",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item": "Objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Nombre del objeto",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Titulo de la Interfaz"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/nb_NO.json b/src/main/resources/assets/skyblocker/lang/nb_NO.json
index 3c7cae87..0f96ebb6 100644
--- a/src/main/resources/assets/skyblocker/lang/nb_NO.json
+++ b/src/main/resources/assets/skyblocker/lang/nb_NO.json
@@ -82,5 +82,83 @@
     "text.autoconfig.skyblocker.option.quickNav.button1": "Knapp 1",
     "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Gjenstand navn",
     "text.autoconfig.skyblocker.option.quickNav.button3.render": "Rendering",
-    "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "UI Tittel"
+    "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Aktiver gjenstad liste",
+    "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Løs Blaze-puslespillet",
+    "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button6": "Knapp 6",
+    "text.autoconfig.skyblocker.option.quickNav.button6.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "Gjenstand mengde",
+    "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button7": "Knapp 7",
+    "text.autoconfig.skyblocker.option.quickNav.button7.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button8": "Knapp 8",
+    "text.autoconfig.skyblocker.option.quickNav.button8.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button9": "Knapp 8",
+    "text.autoconfig.skyblocker.option.quickNav.button9.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Gjenstand Navn",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "Gjenstand navn",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button10": "Knapp 1",
+    "text.autoconfig.skyblocker.option.quickNav.button10.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Gjenstand Navn",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "Gjenstand Mengde",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button11": "Knapp 1",
+    "text.autoconfig.skyblocker.option.quickNav.button11.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item": "Gjenstand",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Gjenstand Navn",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "Gjenstand Mengde",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.quickNav.button12": "Knapp 1",
+    "text.autoconfig.skyblocker.option.quickNav.button12.render": "Rendering",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Gjenstand Navn",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Gjenstand Mengde",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "UI Tittel",
+    "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Klikk hendelse",
+    "text.autoconfig.skyblocker.option.general.itemList": "Gjenstand liste",
+    "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
+    "text.autoconfig.skyblocker.category.locations": "Lokasjoner",
+    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus Hjelper",
+    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Grå ut kister som allerede er åpnet.",
+    "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Aktiver kart",
+    "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Kart skalering",
+    "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Løs Three Weirdos-puslespillet",
+    "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve the Blaze puzzle",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminalløser",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Løsning Velg farget",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Løs klikk i rekkefølge",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Løsning starter med",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Dverggruver",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Aktiver Drill Fuel",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Løse Fetchur",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Løs Puzzler Puzzle",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dverg-HUD"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index 3f4ccdc8..ef752b6e 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -9,7 +9,7 @@
     "text.autoconfig.skyblocker.option.general.bars.barpositions": "配置属性条位置",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "下排",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "上排",
-    "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "右侧",
+    "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "快捷栏右侧",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "禁用",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "生命条位置",
     "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "法力条位置",
@@ -23,8 +23,8 @@
     "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "显示平均BIN（立即购买）价格",
     "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均类型",
     "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "你可以选择查看多少天的平均价格",
-    "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "1天价格",
-    "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3天价格",
+    "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "一日内均价",
+    "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "三日内均价",
     "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "同时显示",
     "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "显示最低BIN（立即购买）价格",
     "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "显示集市购买/卖出价格",
@@ -37,41 +37,41 @@
     "text.autoconfig.skyblocker.category.richPresence": "Discord活动状态",
     "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock信息",
     "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "钱包",
-    "text.autoconfig.skyblocker.option.richPresence.info.BITS": "比特",
+    "text.autoconfig.skyblocker.option.richPresence.info.BITS": "点券",
     "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "位置",
     "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "如果您正在循环模式，这个值将不会生效",
     "text.autoconfig.skyblocker.option.richPresence.cycleMode": "循环Skyblock信息",
-    "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "启用",
+    "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "已启用",
     "text.autoconfig.skyblocker.option.richPresence.customMessage": "自定义消息",
     "text.autoconfig.skyblocker.category.quickNav": "快速导航",
     "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "启用快速导航",
-    "text.autoconfig.skyblocker.option.quickNav.button1": "按钮1",
-    "text.autoconfig.skyblocker.option.quickNav.button2": "按钮2",
-    "text.autoconfig.skyblocker.option.quickNav.button3": "按钮3",
-    "text.autoconfig.skyblocker.option.quickNav.button4": "按钮4",
-    "text.autoconfig.skyblocker.option.quickNav.button5": "按钮5",
-    "text.autoconfig.skyblocker.option.quickNav.button6": "按钮6",
-    "text.autoconfig.skyblocker.option.quickNav.button7": "按钮7",
-    "text.autoconfig.skyblocker.option.quickNav.button8": "按钮8",
-    "text.autoconfig.skyblocker.option.quickNav.button9": "按钮9",
-    "text.autoconfig.skyblocker.option.quickNav.button10": "按钮10",
-    "text.autoconfig.skyblocker.option.quickNav.button11": "按钮11",
-    "text.autoconfig.skyblocker.option.quickNav.button12": "按钮12",
+    "text.autoconfig.skyblocker.option.quickNav.button1": "热键1",
+    "text.autoconfig.skyblocker.option.quickNav.button2": "热键2",
+    "text.autoconfig.skyblocker.option.quickNav.button3": "热键3",
+    "text.autoconfig.skyblocker.option.quickNav.button4": "热键4",
+    "text.autoconfig.skyblocker.option.quickNav.button5": "热键5",
+    "text.autoconfig.skyblocker.option.quickNav.button6": "热键6",
+    "text.autoconfig.skyblocker.option.quickNav.button7": "热键7",
+    "text.autoconfig.skyblocker.option.quickNav.button8": "热键8",
+    "text.autoconfig.skyblocker.option.quickNav.button9": "热键9",
+    "text.autoconfig.skyblocker.option.quickNav.button10": "热键10",
+    "text.autoconfig.skyblocker.option.quickNav.button11": "热键11",
+    "text.autoconfig.skyblocker.option.quickNav.button12": "热键12",
     "text.autoconfig.skyblocker.option.general.itemList": "物品列表",
     "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "启用物品列表",
     "text.autoconfig.skyblocker.category.locations": "位置",
     "text.autoconfig.skyblocker.option.locations.dungeons": "地牢",
     "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus助手",
-    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "用灰色显示出已经打开过的箱子",
-    "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "启用地图",
+    "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "将打开过的箱子标记为灰色",
+    "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "启用地牢地图",
     "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "解决三怪人迷题",
-    "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "解决烈焰人迷题",
-    "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "解决常识迷题",
+    "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "烈焰人迷题助手",
+    "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "常识问答谜题助手",
     "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "终端助手",
-    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "解决颜色迷题",
-    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "解决排序迷题",
-    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "解决开头字母迷题",
-    "text.autoconfig.skyblocker.option.locations.dwarvenMines": "矮人矿道",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "选色终端助手",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "排序终端助手",
+    "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "首字母谜题终端助手",
+    "text.autoconfig.skyblocker.option.locations.dwarvenMines": "矮人矿井",
     "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "显示钻头燃料",
     "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "解决Fetchur的迷题",
     "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "解决Puzzler的迷题",
@@ -86,14 +86,14 @@
     "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "移动到动作栏",
     "text.autoconfig.skyblocker.option.messages.hideAbility": "隐藏技能冷却",
     "text.autoconfig.skyblocker.option.messages.hideHeal": "隐藏治疗消息",
-    "text.autoconfig.skyblocker.option.messages.hideAOTE": "隐藏AOTE消息",
-    "text.autoconfig.skyblocker.option.messages.hideImplosion": "隐藏内爆技能消息",
-    "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "隐藏熔融波技能消息",
+    "text.autoconfig.skyblocker.option.messages.hideAOTE": "隐藏瞬息之刃的提示消息",
+    "text.autoconfig.skyblocker.option.messages.hideImplosion": "隐藏核心爆裂技能的提示消息",
+    "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "隐藏 Molten Wave 技能的提示消息",
     "text.autoconfig.skyblocker.option.messages.hideAds": "从公屏聊天中隐藏广告",
     "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "隐藏传送点消息",
     "text.autoconfig.skyblocker.option.messages.hideCombo": "隐藏连杀消息",
     "text.autoconfig.skyblocker.option.messages.hideAutopet": "隐藏自动宠物消息",
-    "text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏魔力消耗信息",
+    "text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏法力消耗信息",
     "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "被已经提供了更好方案的属性条代替",
     "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2有新版本可用！",
     "skyblocker.update.update_link": " §2§n点击这里§r",
@@ -101,5 +101,91 @@
     "skyblocker.update.hover_text": "打开Modrinth",
     "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "更新通知",
     "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2自动设置你的API秘钥！",
-    "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT"
+    "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息",
+    "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "地图界面大小",
+    "skyblocker.updaterepository.failed": "§b[§6Skyblocker§b] §c更新本地数据存储库失败，请手动删库并重启游戏",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button1.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button2.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button3.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button4.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button5.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button6.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button7.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "热键物品显示数量",
+    "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button8.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "热键物品显示数量",
+    "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button9.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button10.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button11.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button12.render": "是否显示该热键",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "快捷界面标题",
+    "text.autoconfig.skyblocker.option.quickNav.button3.item": "热键所显示物品",
+    "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "物品数量",
+    "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "物品NBT",
+    "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "点击时所执行的命令",
+    "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "物品ID",
+    "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "点击时所执行的命令"
 }