aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/skyblocker/lang/en_us.json
diff options
context:
space:
mode:
authorFix3dll <serhanduzce@gmail.com>2022-03-08 19:20:56 +0300
committerFix3dll <serhanduzce@gmail.com>2022-03-08 19:20:56 +0300
commit1ff679176faadb95da2c90e7b87b0c2b369bae87 (patch)
treebe89495260919b89544ddbb1af68d16ec609c699 /src/main/resources/assets/skyblocker/lang/en_us.json
parent9c67b6d30f14c852937387a5c727d2aff3cedbe8 (diff)
parentb380c52524bbdb7ea01fe42d5bab95f22e39a5a1 (diff)
downloadSkyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.gz
Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.tar.bz2
Skyblocker-1ff679176faadb95da2c90e7b87b0c2b369bae87.zip
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java # src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java # src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java # src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java # src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java # src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java # src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
Diffstat (limited to 'src/main/resources/assets/skyblocker/lang/en_us.json')
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json4
1 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 4ffba936..022c5a6c 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -61,5 +61,7 @@
"skyblocker.update.update_link": " §2§nClick here§r",
"skyblocker.update.update_message_end" : " §ato find out about latest features.",
"skyblocker.update.hover_text": "Open Modrinth",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification"
+ "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification",
+
+ "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!"
} \ No newline at end of file