diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-10-10 19:15:52 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-10-10 19:15:52 +0200 |
| commit | c1cc4ea51f84281336e6ca23bdd01e281d5fb4a3 (patch) | |
| tree | 7082b35b68a915a18d1e1df171fae700bacd77e0 /src/main/resources/assets/skyblocker | |
| parent | 87983958dcebd98f73c6971a5ea82c80871a12af (diff) | |
| parent | a373db64a319c263b2b4c1d07084fa18bd12353b (diff) | |
| download | Skyblocker-c1cc4ea51f84281336e6ca23bdd01e281d5fb4a3.tar.gz Skyblocker-c1cc4ea51f84281336e6ca23bdd01e281d5fb4a3.tar.bz2 Skyblocker-c1cc4ea51f84281336e6ca23bdd01e281d5fb4a3.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams
# Conflicts:
# src/main/java/de/hysky/skyblocker/SkyblockerMod.java
# src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
Pull updates from upstream and NOT get a heart attack
Diffstat (limited to 'src/main/resources/assets/skyblocker')
| -rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 7 | ||||
| -rw-r--r-- | src/main/resources/assets/skyblocker/textures/gui/sprites/item_rarity_background.png | bin | 0 -> 198 bytes |
2 files changed, 6 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 76b6e768..f889595e 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -38,9 +38,11 @@ "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.itemCooldown": "Item Cooldown", + "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Enable Item Cooldown", "text.autoconfig.skyblocker.option.general.shortcuts": "Shortcuts", "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "Enable Shortcuts", - "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Only works on Hypixel. Edit shortcuts with \"/skyblocker shortcuts\". At least one of the following options must be enabled for this to take effect.", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Works anywhere, even in vanilla! Edit shortcuts with \"/skyblocker shortcuts\". At least one of the following options must be enabled for this to take effect.", "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "Enable Command Shortcuts", "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", @@ -76,6 +78,9 @@ "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.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!", diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/item_rarity_background.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/item_rarity_background.png Binary files differnew file mode 100644 index 00000000..fd8e8604 --- /dev/null +++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/item_rarity_background.png |
