aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-11-13 21:03:26 -0500
committerGitHub <noreply@github.com>2023-11-13 21:03:26 -0500
commit736db8f1b0076ebe639bf0c1590e86d05191f01f (patch)
tree490e07d455521daa0579ec6b5ae49649925caa07 /src/main/resources
parent4828dd781882324bd455c199bbf6ad625886a96b (diff)
parentf4ff9aad7b97230fd70dd70f067c0aac4d1e2682 (diff)
downloadSkyblocker-736db8f1b0076ebe639bf0c1590e86d05191f01f.tar.gz
Skyblocker-736db8f1b0076ebe639bf0c1590e86d05191f01f.tar.bz2
Skyblocker-736db8f1b0076ebe639bf0c1590e86d05191f01f.zip
Merge branch 'master' into batched-rendering
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/secretlocations.json6
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
index a0a97c67..0f22f597 100644
--- a/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
+++ b/src/main/resources/assets/skyblocker/dungeons/secretlocations.json
@@ -2173,7 +2173,7 @@
},
{
"secretName":"3 - Lever 2",
- "category":"Lever",
+ "category":"lever",
"x":31,
"y":53,
"z":24
@@ -2375,7 +2375,7 @@
},
{
"secretName":"2 - Item",
- "category":"Item",
+ "category":"item",
"x":27,
"y":56,
"z":19
@@ -3936,7 +3936,7 @@
},
{
"secretName":"4/5/6 - Entrance 3",
- "category":"",
+ "category":"entrance",
"x":31,
"y":142,
"z":39
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 376e2bdf..d1a6e0bd 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -228,6 +228,8 @@
"text.autoconfig.skyblocker.option.locations.rift": "The Rift",
"text.autoconfig.skyblocker.option.locations.rift.mirrorverseWaypoints": "Enable Mirrorverse Waypoints",
+ "text.autoconfig.skyblocker.option.locations.rift.blobbercystGlow": "Blobbercyst Glow",
+ "text.autoconfig.skyblocker.option.locations.rift.blobbercystGlow.@Tooltip": "Applies the glowing effect to the Blobbercysts from the BACTE fight.",
"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",