From 4d8e146384a6d7f11b3126ffc8e43451e993c506 Mon Sep 17 00:00:00 2001 From: KonaeAkira Date: Fri, 28 Jan 2022 16:01:18 +0100 Subject: Merge upstream --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 ++ src/main/resources/fabric.mod.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index cda4bcaf..dbdc3c1a 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -9,6 +9,8 @@ "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.quicknav": "Quicknav", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav", "text.autoconfig.skyblocker.option.general.richPresence": "Discord Rich Presence", "text.autoconfig.skyblocker.option.general.richPresence.info": "Skyblock Info", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8ef1482d..fa04da47 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Skyblocker", "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43", "TacoMonkey"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", -- cgit