aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/skyblocker/lang
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-08-20 13:22:34 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-08-20 13:22:34 +0200
commite228eac03fbe10ea3ffd1c2e1930f33318a98c70 (patch)
treedd62c5462f865e919160a8fbb01129cf608b9f1c /src/main/resources/assets/skyblocker/lang
parentbb2612feb2b86e94d23d02fbc3e66d5abeb6dd41 (diff)
parent6069d3cf7d2e96ca7ef1975a3dd04e2121a6e3c9 (diff)
downloadSkyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.tar.gz
Skyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.tar.bz2
Skyblocker-e228eac03fbe10ea3ffd1c2e1930f33318a98c70.zip
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud
Pull newest changes from upstream
Diffstat (limited to 'src/main/resources/assets/skyblocker/lang')
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index c87959a4..578917e2 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -206,6 +206,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Map Y",
"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.blazesolver.@Tooltip": "Boxes the correct blaze in green, also draws a line to and boxes the next blaze to kill in white.",
"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",
@@ -306,5 +307,13 @@
"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?)"
+ "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §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?)"
}