GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge upstream, update languages module

Browse source
This commit is contained in:
onebeastchris 2024-07-01 19:21:45 +02:00
parent f680a72efd
commit 5ee0d41aab
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View file

@ -209,9 +209,7 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
logger.info(GeyserLocale.getLocaleStringLog("geyser.core.load", NAME, VERSION)); logger.info(GeyserLocale.getLocaleStringLog("geyser.core.load", NAME, VERSION));
logger.info(""); logger.info("");
if (IS_DEV) { if (IS_DEV) {
// TODO cloud use language string logger.info(GeyserLocale.getLocaleStringLog("geyser.core.dev_build", "https://discord.gg/geysermc"));
//logger.info(GeyserLocale.getLocaleStringLog("geyser.core.dev_build", "https://discord.gg/geysermc"));
logger.info("You are running a development build of Geyser! Please report any bugs you find on our Discord server: %s".formatted("https://discord.gg/geysermc"));
logger.info(""); logger.info("");
} }
logger.info("******************************************"); logger.info("******************************************");

2
core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
View file

@ -73,7 +73,7 @@ public class VersionCommand extends GeyserCommand {
GeyserImpl.NAME, GeyserImpl.VERSION, javaVersions, bedrockVersions)); GeyserImpl.NAME, GeyserImpl.VERSION, javaVersions, bedrockVersions));
// Disable update checking in dev mode and for players in Geyser Standalone // Disable update checking in dev mode and for players in Geyser Standalone
if (!GeyserImpl.getInstance().isProductionEnvironment() || (!sender.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) { if (!GeyserImpl.getInstance().isProductionEnvironment() || (!source.isConsole() && geyser.getPlatformType() == PlatformType.STANDALONE)) {
return; return;
} }

2
core/src/main/resources/languages

@ -1 +1 @@
Subproject commit 5267df408359e5f84ecca3835e465a559fd9acb8 Subproject commit 60b20023a92f084aba895ab0336e70fa7fb311fb