diff options
| author | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-25 16:55:40 -0500 |
|---|---|---|
| committer | TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> | 2022-01-25 16:55:40 -0500 |
| commit | c4ae62f787c9ac3d62dc4ccbf609ea9815d7316e (patch) | |
| tree | 4b310baa7957f1fcd9cfd3e04804b59122c43799 /src/main/resources | |
| parent | aae93755805a66d6cd253963307d69978d4d86fc (diff) | |
| parent | 68845ac4718986e22f47fbd38a43d10116137889 (diff) | |
| download | Skyblocker-c4ae62f787c9ac3d62dc4ccbf609ea9815d7316e.tar.gz Skyblocker-c4ae62f787c9ac3d62dc4ccbf609ea9815d7316e.tar.bz2 Skyblocker-c4ae62f787c9ac3d62dc4ccbf609ea9815d7316e.zip | |
Merge branch '1.18.x'
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 10 | ||||
| -rw-r--r-- | src/main/resources/skyblocker.mixins.json | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 680787e8..0ad63665 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -9,6 +9,11 @@ "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API Key (WIP)", "text.autoconfig.skyblocker.option.general.bars": "Health, Mana, Defence & XP Bars", "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars", + "text.autoconfig.skyblocker.option.general.richPresence": "Discord Rich Presence", + "text.autoconfig.skyblocker.option.general.richPresence.info": "Skyblock Info", + "text.autoconfig.skyblocker.option.general.richPresence.enableRichPresence": "Enabled", + "text.autoconfig.skyblocker.option.general.richPresence.customMessage": "Custom Message", + "text.autoconfig.skyblocker.category.locations": "Locations", "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", @@ -32,5 +37,8 @@ "text.autoconfig.skyblocker.option.messages.hideAOTE": "Hide AOTE Messages", "text.autoconfig.skyblocker.option.messages.hideImplosion": "Hide Implosion Message", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Hide Molten Wave Message", - "text.autoconfig.skyblocker.option.messages.hideAds": "Hide Ads From Public Chat" + "text.autoconfig.skyblocker.option.messages.hideAds": "Hide Ads From Public Chat", + + "text.autoconfig.skyblocker.category.fishing": "Fishing", + "text.autoconfig.skyblocker.option.fishing.enableFishingDing": "Enable Fishing Ding" }
\ No newline at end of file diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index abc219fa..1c37565f 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -9,9 +9,10 @@ "ItemRendererMixin", "MinecraftClientMixin", "AccessorWorldRenderer", + "LeverBlockMixin", "GenericContainerScreenMixin", "GenericContainerScreenHandlerMixin", - "LeverBlockMixin" + "SoundManagerMixin" ], "injectors": { "defaultRequire": 1 |