From 978d0ff2e3b5c2caae4fba3922ffdf8d128906cd Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 4 Oct 2018 18:40:34 -0400 Subject: [PATCH] =?UTF-8?q?Fall=20colours=20=F0=9F=8E=83=F0=9F=8E=83?= =?UTF-8?q?=F0=9F=8E=83=F0=9F=8E=83=F0=9F=8E=83=F0=9F=8E=83=F0=9F=8E=83?= =?UTF-8?q?=F0=9F=8E=83=F0=9F=8E=83=F0=9F=8E=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minecraftforge/fml/client/gui/LoadingErrorScreen.java | 1 + src/main/resources/assets/forge/lang/en_us.json | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/client/gui/LoadingErrorScreen.java b/src/main/java/net/minecraftforge/fml/client/gui/LoadingErrorScreen.java index 9519c7697..467bcc56a 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/LoadingErrorScreen.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/LoadingErrorScreen.java @@ -72,6 +72,7 @@ public class LoadingErrorScreen extends GuiErrorScreen { this.addButton(new GuiButtonClickConsumer(11, this.width / 2 + 5, this.height - 38, this.width / 2 - 55, 20, ForgeI18n.parseMessage("fml.button.open.file", logFile.getFileName()), this::openLogFile)); this.errorList = new LoadingErrorList(this, this.loadingFailedException.getErrors()); + this.children.add(this.errorList); } @Override diff --git a/src/main/resources/assets/forge/lang/en_us.json b/src/main/resources/assets/forge/lang/en_us.json index b8acadcff..83b9d96cb 100644 --- a/src/main/resources/assets/forge/lang/en_us.json +++ b/src/main/resources/assets/forge/lang/en_us.json @@ -19,15 +19,17 @@ "fml.button.open.file": "Open {0}", "fml.button.open.mods.folder": "Open Mods Folder", "fml.loadingerrorscreen.header": "Error loading mods\n{0,choice,1#1 error has|1<{0} errors have} occured during loading", + "fml.language.missingversion": "Mod File {5} needs language provider {3}:{4,vr} to load\n\u00a77We have found {6,i18n,fml.messages.artifactversion}", "fml.modloading.failedtoloadmodclass":"{0,modinfo,name} has class loading errors\n\u00a77{2,exc,msg}", "fml.modloading.failedtoloadmod":"{0,modinfo,name} ({0,modinfo,id}) has failed to load correctly\n\u00a77{2,exc,msg}", "fml.modloading.errorduringevent":"{0,modinfo,name} ({0,modinfo,id}) encountered an error during the {1,lower} event phase\n\u00a77{2,exc,msg}", "fml.modloading.failedtoloadforge": "Failed to load forge", - "fml.modloading.missingdependency": "Mod {4} has missing dependency {3}\n\u00a77Want {5,vr}, have {6,i18n,fml.messages.artifactversion}", - "fml.language.missingversion": "Mod File {5} needs language provider {3}:{4,vr}\n\u00a77Found {6,i18n,fml.messages.artifactversion}", + "fml.modloading.missingdependency": "Mod \u00a7e{4}\u00a7r requires \u00a76{3}\u00a7r \u00a7o{5,vr}\u00a7r\n\u00a77Currently, \u00a76{3}\u00a7r\u00a77 is \u00a7o{6,i18n,fml.messages.artifactversion.ornotinstalled}", + "fml.messages.artifactversion.ornotinstalled":"{0,ornull,fml.messages.artifactversion.notinstalled}", "fml.messages.artifactversion":"{0,ornull,fml.messages.artifactversion.none}", "fml.messages.artifactversion.none":"none", + "fml.messages.artifactversion.notinstalled":"\u00a7nnot installed", "fml.messages.version.restriction.any":"any", "fml.messages.version.restriction.lower.inclusive":"{0} or above", "fml.messages.version.restriction.lower.exclusive":"above {0}",