Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into cleanup-2

# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
#	src/main/java/de/hysky/skyblocker/utils/Http.java
#	src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java

Pull changes from upstream master

1 files changed, 89 insertions, 141 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 3d0c010f..31e7bb9c 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -38,6 +38,8 @@
   "text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "Highlight found fairy souls",
   "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "Only highlight nearby fairy souls",
   "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls.@Tooltip": "When enabled only fairy souls in a radius of 50 blocks are highlighted",
+  "text.autoconfig.skyblocker.option.general.mythologicalRitual": "Mythological Ritual Helper",
+  "text.autoconfig.skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper": "Enable Mythological Ritual Helper",
   "text.autoconfig.skyblocker.option.general.itemCooldown": "Item Cooldown",
   "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Enable Item Cooldown",
   "text.autoconfig.skyblocker.option.general.shortcuts": "Shortcuts",
@@ -75,12 +77,19 @@
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Enable Lowest BIN Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Enable Bazaar buy/sell Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Enable Museum & Date",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.enableExoticTooltip": "Enable Exotic Tooltip",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.enableExoticTooltip.@Tooltip": "Displays the type of exotic below the item's name if an armor piece is exotic.",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay": "Item Info Display",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo": "Attribute Shard Info",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo.@Tooltip": "Displays the attribute's level as the stack count and the initials of the attribute's name.",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds": "Item Rarity Backgrounds",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds.@Tooltip": "Displays a colored background behind an item, the color represents the item's rarity.",
   "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundsOpacity": "Item Rarity Backgrounds Opacity",
+  "text.autoconfig.skyblocker.option.general.wikiLookup": "Wiki Lookup",
+  "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup": "Enable Wiki Lookup",
+  "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip": "Opens the wiki page of the hovered item with the F4 key.",
+  "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki": "Use Official Wiki",
+  "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki.@Tooltip": "Use the official wiki instead of the Fandom wiki.",
   "text.autoconfig.skyblocker.option.general.specialEffects": "Special Effects",
   "text.autoconfig.skyblocker.option.general.specialEffects.rareDungeonDropEffects": "Rare Dungeon Drop Effects",
   "text.autoconfig.skyblocker.option.general.specialEffects.rareDungeonDropEffects.@Tooltip": "Adds a special visual effect triggered upon obtaining rare dungeon loot!",
@@ -90,10 +99,6 @@
   "text.autoconfig.skyblocker.option.general.titleContainer": "Title Container",
   "text.autoconfig.skyblocker.option.general.titleContainer.@Tooltip": "Used to display multiple titles at once, Example use: Vampire Slayer",
   "text.autoconfig.skyblocker.option.general.titleContainer.titleContainerScale": "Title Container Scale",
-  "text.autoconfig.skyblocker.option.general.titleContainer.x": "Title Container X Position",
-  "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",
@@ -102,8 +107,13 @@
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableEtherTransmission": "Enable Ether Transmission Overlay",
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableSinrecallTransmission": "Enable Sinrecall Transmission Overlay",
   "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWitherImpact": "Enable Wither Impact Overlay",
-  "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log",
+  "text.autoconfig.skyblocker.option.general.flameOverlay": "Flame Overlay",
+  "text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight": "Flame Height",
+  "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity": "Flame Opacity",
+  "skyblocker.itemTooltip.nullMessage": "§cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log",
   "skyblocker.itemTooltip.noData": "§cNo Data",
+  
+  "skyblocker.wikiLookup.noArticleFound": "§rUnable to locate a wiki article for this item...",
 
   "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence",
   "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock Info",
@@ -115,104 +125,16 @@
   "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Enabled",
   "text.autoconfig.skyblocker.option.richPresence.customMessage": "Custom Message",
 
-  "text.autoconfig.skyblocker.category.quickNav" : "Quick Navigation",
-  "text.autoconfig.skyblocker.option.quickNav.enableQuickNav" : "Enable Quick Navigation",
-  "text.autoconfig.skyblocker.option.quickNav.button1" : "Button 1",
-  "text.autoconfig.skyblocker.option.quickNav.button1.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button1.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button1.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button2" : "Button 2",
-  "text.autoconfig.skyblocker.option.quickNav.button2.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button2.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button2.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button3" : "Button 3",
-  "text.autoconfig.skyblocker.option.quickNav.button3.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button3.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button3.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button4" : "Button 4",
-  "text.autoconfig.skyblocker.option.quickNav.button4.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button4.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button4.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button5" : "Button 5",
-  "text.autoconfig.skyblocker.option.quickNav.button5.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button5.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button5.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button6" : "Button 6",
-  "text.autoconfig.skyblocker.option.quickNav.button6.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button6.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button6.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button7" : "Button 7",
-  "text.autoconfig.skyblocker.option.quickNav.button7.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button7.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button7.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button8" : "Button 8",
-  "text.autoconfig.skyblocker.option.quickNav.button8.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button8.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button8.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button9" : "Button 9",
-  "text.autoconfig.skyblocker.option.quickNav.button9.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button9.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button9.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button10" : "Button 10",
-  "text.autoconfig.skyblocker.option.quickNav.button10.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button10.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button10.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button11" : "Button 11",
-  "text.autoconfig.skyblocker.option.quickNav.button11.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button11.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button11.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent" : "Click event",
-  "text.autoconfig.skyblocker.option.quickNav.button12" : "Button 12",
-  "text.autoconfig.skyblocker.option.quickNav.button12.render" : "Render",
-  "text.autoconfig.skyblocker.option.quickNav.button12.item" : "Item",
-  "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName" : "Item name",
-  "text.autoconfig.skyblocker.option.quickNav.button12.item.count" : "Item Count",
-  "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt" : "NBT",
-  "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle" : "UI Title",
-  "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent" : "Click event",
+  "text.autoconfig.skyblocker.category.quickNav": "Quick Navigation",
+  "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Enable Quick Navigation",
+  "text.autoconfig.skyblocker.option.quickNav.button": "Button %d",
+  "text.autoconfig.skyblocker.option.quickNav.button.render": "Render",
+  "text.autoconfig.skyblocker.option.quickNav.button.item": "Item",
+  "text.autoconfig.skyblocker.option.quickNav.button.item.itemName": "Item ID",
+  "text.autoconfig.skyblocker.option.quickNav.button.item.count": "Item Count",
+  "text.autoconfig.skyblocker.option.quickNav.button.item.nbt": "NBT",
+  "text.autoconfig.skyblocker.option.quickNav.button.uiTitle": "UI Title",
+  "text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Click event",
 
   "text.autoconfig.skyblocker.option.general.itemList": "Item List",
   "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Enable Item List",
@@ -230,6 +152,9 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableSecretWaypoints": "Enable Dungeon Secret Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.noInitSecretWaypoints": "Do Not Initialize Secret Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.noInitSecretWaypoints.@Tooltip": "This option can save around 20 MB of ram if enabled, but Secret Waypoint will require a restart after turning off this option to work.",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType": "Waypoint Type",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.waypointType.@Tooltip": "Waypoint: Displays a highlight and beam.\n\nOutlined Waypoint: Displays both a waypoint and an outline.\n\nHighlight: Only displays a highlight.\n\nOutlined Highlight: Displays both a highlight and an outline.\n\nOutline: Outlines the secret in a box.",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.showSecretText": "Show Secret Text",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableEntranceWaypoints" : "Enable Entrance Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableSuperboomWaypoints" : "Enable Superboom Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableChestWaypoints" : "Enable Chest Waypoints",
@@ -239,6 +164,9 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints" : "Enable Lever Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints" : "Enable Fairy Soul Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableStonkWaypoints" : "Enable Stonk Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableAotvWaypoints" : "Enable AOTV Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints": "Enable Pearl Waypoints",
+  "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enablePearlWaypoints.@Tooltip": "With these waypoints, you throw a pearl towards the block and at the same time AOTV up.",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints" : "Enable Default Waypoints",
   "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints.@Tooltip" : "This includes all waypoints that do not belong to a category.",
   "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit": "Dungeon Chest Profit Calculator",
@@ -260,8 +188,6 @@
   "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",
   "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Starred Mob Glow",
   "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible.",
   "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle",
@@ -293,11 +219,12 @@
   "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",
 
   "text.autoconfig.skyblocker.option.locations.rift": "The Rift",
   "text.autoconfig.skyblocker.option.locations.rift.mirrorverseWaypoints": "Enable Mirrorverse Waypoints",
+  "text.autoconfig.skyblocker.option.locations.rift.enigmaSoulWaypoints": "Enable Enigma Soul Waypoints",
+  "text.autoconfig.skyblocker.option.locations.rift.enigmaSoulWaypoints.@Tooltip": "Note: Many enigma souls have a small task you must complete in order to get it, so its recommended to also watch a YouTube video when finding them.",
+  "text.autoconfig.skyblocker.option.locations.rift.highlightFoundEnigmaSouls": "Highlight Found Enigma Souls",
   "text.autoconfig.skyblocker.option.locations.rift.mcGrubberStacks": "McGrubber Stacks",
   "text.autoconfig.skyblocker.option.locations.rift.mcGrubberStacks.@Tooltip": "Used for calculating Motes sell prices.",
 
@@ -340,23 +267,44 @@
   "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Hide empty item tooltips in menus",
   "text.autoconfig.skyblocker.option.general.hideStatusEffectOverlay": "Hide Status Effect Overlay",
 
-  "skyblocker.updaterepository.failed":  "§b[§6Skyblocker§b] §cUpdating local repository failed. Remove files manually and restart game.",
+  "skyblocker.updaterepository.failed":  "§cUpdating local repository failed. Remove files manually and restart game.",
+
+  "skyblocker.dungeons.secrets.physicalEntranceNotFound": "§cDungeon Entrance Room coordinates not found. Please go back to the green Entrance Room.",
+  "skyblocker.dungeons.secrets.markSecretFound": "§rMarked secret #%d as found.",
+  "skyblocker.dungeons.secrets.markSecretMissing": "§rMarked secret #%d as missing.",
+  "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cUnable to mark secret #%d as found.",
+  "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cUnable to mark secret #%d as missing.",
+  "skyblocker.dungeons.secrets.posMessage": "§rRoom: %s, X: %d, Y: %d, Z: %d",
+  "skyblocker.dungeons.secrets.noTarget": "§cNo target block found! (Are you pointing at a block in range?)",
+  "skyblocker.dungeons.secrets.notMatched": "§cThe current room is not matched! (Are you in a dungeon room?)",
+  "skyblocker.dungeons.secrets.customWaypointAdded": "§rAdded a custom waypoint at X: %d, Y: %d, Z: %d for room %s secret #%d of category %s with name '%s'.",
+  "skyblocker.dungeons.secrets.customWaypointRemoved": "§rRemoved custom waypoint at X: %d, Y: %d, Z: %d for room %s secret #%d of category %s with name '%s'.",
+  "skyblocker.dungeons.secrets.customWaypointNotFound": "§cNo custom waypoint found at X: %d, Y: %d, Z: %d for room %s.",
+  
+  "skyblocker.dungeons.secretsTracker.feedback": "%s§f found %s§f secrets. %s",
+  "skyblocker.dungeons.secretsTracker.failFeedback": "§cUnable to calculate the amount of secrets everybody did this run!",
+  
+  "skyblocker.api.cache.HIT": "This data was cached!\nIt's %d seconds old.",
+  "skyblocker.api.cache.MISS": "This data wasn't cached!",
 
-  "skyblocker.dungeons.secrets.physicalEntranceNotFound": "§b[§6Skyblocker§b] §cDungeon Entrance Room coordinates not found. Please go back to the green Entrance Room.",
-  "skyblocker.dungeons.secrets.markSecretFound": "§b[§6Skyblocker§b] §rMarked secret #%d as found.",
-  "skyblocker.dungeons.secrets.markSecretMissing": "§b[§6Skyblocker§b] §rMarked secret #%d as missing.",
-  "skyblocker.dungeons.secrets.markSecretFoundUnable": "§b[§6Skyblocker§b] §cUnable to mark secret #%d as found.",
-  "skyblocker.dungeons.secrets.markSecretMissingUnable": "§b[§6Skyblocker§b] §cUnable to mark secret #%d as missing.",
+  "skyblocker.exotic.crystal": "CRYSTAL",
+  "skyblocker.exotic.fairy": "FAIRY",
+  "skyblocker.exotic.og_fairy": "OG_FAIRY",
+  "skyblocker.exotic.spook": "SPOOK",
+  "skyblocker.exotic.glitched": "GLITCHED",
+  "skyblocker.exotic.exotic": "EXOTIC",
 
   "skyblocker.fishing.reelNow": "Reel in now!",
   "skyblocker.rift.healNow": "Heal now!",
   "skyblocker.rift.iceNow": "Ice now!",
   "skyblocker.rift.mania": "Mania!",
   "skyblocker.rift.stakeNow": "Stake now!",
-  "skyblocker.fairySouls.markAllFound": "§b[§6Skyblocker§b] §rMarked all fairy souls in the current island as found",
-  "skyblocker.fairySouls.markAllMissing": "§b[§6Skyblocker§b] §rMarked all fairy souls in the current island as missing",
-  "skyblocker.relics.markAllFound": "§b[§6Skyblocker§b] §rMarked all relics as found",
-  "skyblocker.relics.markAllMissing": "§b[§6Skyblocker§b] §rMarked all relics as missing",
+  "skyblocker.rift.enigmaSouls.markAllFound": "§rMarked all enigma souls as found!",
+  "skyblocker.rift.enigmaSouls.markAllMissing": "§rMarked all enigma souls as missing!",
+  "skyblocker.fairySouls.markAllFound": "§rMarked all fairy souls in the current island as found",
+  "skyblocker.fairySouls.markAllMissing": "§rMarked all fairy souls in the current island as missing",
+  "skyblocker.relics.markAllFound": "§rMarked all relics as found",
+  "skyblocker.relics.markAllMissing": "§rMarked all relics as missing",
   "skyblocker.shortcuts.config": "Shortcuts Config",
   "skyblocker.shortcuts.notLoaded": "§c§lShortcuts not loaded yet",
   "skyblocker.shortcuts.command.target": "Target Command",
@@ -369,36 +317,36 @@
   "skyblocker.shortcuts.new": "New Shortcut",
   "skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after a restart of the game.",
 
-  "skyblocker.customItemNames.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom name.",
-  "skyblocker.customItemNames.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom name set, but why not add one? ;)",
-  "skyblocker.customItemNames.added": "§b[§6Skyblocker§b] §fSet a custom name for your currently held item!",
-  "skyblocker.customItemNames.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom name!",
-  "skyblocker.customItemNames.unableToSetName": "§b[§6Skyblocker§b] §cUnable to set a custom item name :( (Are you in skyblock?, are you holding an item?)",
+  "skyblocker.customItemNames.removed": "§fRemoved this item's custom name.",
+  "skyblocker.customItemNames.neverHad": "§fThis item doesn't have a custom name set, but why not add one? ;)",
+  "skyblocker.customItemNames.added": "§fSet a custom name for your currently held item!",
+  "skyblocker.customItemNames.noItemUuid": "§cYou must be holding an item that has a uuid in order to set a custom name!",
+  "skyblocker.customItemNames.unableToSetName": "§cUnable to set a custom item name :( (Are you in skyblock?, are you holding an item?)",
 
-  "skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX color code!",
-  "skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armor piece!",
-  "skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye color.",
-  "skyblocker.customDyeColors.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom dye color set, but why not add one? ;)",
-  "skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye color for your currently held item!",
-  "skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye color!",
-  "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye color :( (Are you in skyblock?, are you holding an item?)",
+  "skyblocker.customDyeColors.invalidHex": "§cInvalid HEX color code!",
+  "skyblocker.customDyeColors.notDyeable": "§cThis item isn't a dyeable armor piece!",
+  "skyblocker.customDyeColors.removed": "§fRemoved this item's custom dye color.",
+  "skyblocker.customDyeColors.neverHad": "§fThis item doesn't have a custom dye color set, but why not add one? ;)",
+  "skyblocker.customDyeColors.added": "§fSet a custom dye color for your currently held item!",
+  "skyblocker.customDyeColors.noItemUuid": "§cYou must be holding an item that has a uuid in order to set a custom dye color!",
+  "skyblocker.customDyeColors.unableToSetColor": "§cUnable to set a custom dye color :( (Are you in skyblock?, are you holding an item?)",
 
-  "skyblocker.customArmorTrims.invalidMaterialOrPattern": "§b[§6Skyblocker§b] §cYou supplied either an invalid material, or an invalid trim pattern!",
-  "skyblocker.customArmorTrims.notAnArmorPiece": "§b[§6Skyblocker§b] §cThis item isn't an armor piece!",
-  "skyblocker.customArmorTrims.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom armor trim.",
-  "skyblocker.customArmorTrims.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a armor trim set, but why not add one? ;)",
-  "skyblocker.customArmorTrims.added": "§b[§6Skyblocker§b] §fSet a custom armor trim for your currently held item!",
-  "skyblocker.customArmorTrims.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom armor trim!",
-  "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)",
+  "skyblocker.customArmorTrims.invalidMaterialOrPattern": "§cYou supplied either an invalid material, or an invalid trim pattern!",
+  "skyblocker.customArmorTrims.notAnArmorPiece": "§cThis item isn't an armor piece!",
+  "skyblocker.customArmorTrims.removed": "§fRemoved this item's custom armor trim.",
+  "skyblocker.customArmorTrims.neverHad": "§fThis item doesn't have a armor trim set, but why not add one? ;)",
+  "skyblocker.customArmorTrims.added": "§fSet a custom armor trim for your currently held item!",
+  "skyblocker.customArmorTrims.noItemUuid": "§cYou must be holding an item that has a uuid in order to set a custom armor trim!",
+  "skyblocker.customArmorTrims.unableToSetTrim": "§cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)",
 
   "skyblocker.quiverWarning.50Left": "You only have 50 Arrows left in your Quiver!",
   "skyblocker.quiverWarning.10Left": "You only have 10 Arrows left in your Quiver!",
   "skyblocker.quiverWarning.empty": "You don't have any more Arrows left in your Quiver!",
   
-  "skyblocker.itemProtection.added": "§b[§6Skyblocker§b] §fYour %s will now be protected! §o*your item now feels a little safer :')*",
-  "skyblocker.itemProtection.removed": "§b[§6Skyblocker§b] §fYour %s will §nno longer be protected§f :( - §lBeware of the dangers in doing this!",
-  "skyblocker.itemProtection.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to protect it!",
-  "skyblocker.itemProtection.unableToProtect": "§b[§6Skyblocker§b] §cUnable to protect this item :( (Are you in skyblock?, are you holding an item?)",
+  "skyblocker.itemProtection.added": "§fYour %s will now be protected! §o*your item now feels a little safer :')*",
+  "skyblocker.itemProtection.removed": "§fYour %s will §nno longer be protected§f :( - §lBeware of the dangers in doing this!",
+  "skyblocker.itemProtection.noItemUuid": "§cYou must be holding an item that has a uuid in order to protect it!",
+  "skyblocker.itemProtection.unableToProtect": "§cUnable to protect this item :( (Are you in skyblock?, are you holding an item?)",
 
   "emi.category.skyblocker.skyblock": "Skyblock"
-}
+}
\ No newline at end of file