aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorTacoMonkey <75862693+TacoMonkey11@users.noreply.github.com>2022-01-28 15:52:39 -0500
committerTacoMonkey <75862693+TacoMonkey11@users.noreply.github.com>2022-01-28 15:52:39 -0500
commit1289ea7a73078a2dba920a8daa72d734f0ec8309 (patch)
tree3ec38896bee1fa8141aa59e6daa9f301fbe98c09 /src/main/resources
parented0a43ee63fb6a92ec1b81e99ddc0f3aa2625dce (diff)
parentab002c93fd718875e1d9173dedfd89eeabcaa630 (diff)
downloadSkyblocker-1289ea7a73078a2dba920a8daa72d734f0ec8309.tar.gz
Skyblocker-1289ea7a73078a2dba920a8daa72d734f0ec8309.tar.bz2
Skyblocker-1289ea7a73078a2dba920a8daa72d734f0ec8309.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
-rw-r--r--src/main/resources/fabric.mod.json2
2 files changed, 3 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 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",