diff options
author | Martin Robertz <dream-master@gmx.net> | 2021-11-09 22:03:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-09 22:03:49 +0100 |
commit | c8cd80d228166cf983812618d4c129df2fcef0cd (patch) | |
tree | 1cdb6bdb54819091a4bd259b3360daf6bac5e37f /src/main/java/gregtech/GT_Mod.java | |
parent | 216aa922591168627b5e06cc8c198d7233aa57af (diff) | |
parent | 89ae9c98b8ace8bbd25d6fa2a0ade40e588aef38 (diff) | |
download | GT5-Unofficial-c8cd80d228166cf983812618d4c129df2fcef0cd.tar.gz GT5-Unofficial-c8cd80d228166cf983812618d4c129df2fcef0cd.tar.bz2 GT5-Unofficial-c8cd80d228166cf983812618d4c129df2fcef0cd.zip |
Merge branch 'experimental' into No-Hand-Mixing
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
-rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 777cea09e5..8980483f47 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -450,6 +450,9 @@ public class GT_Mod implements IGT_Mod { GT_Log.out.println("GT_Mod: Generating Lang-File"); GT_LanguageManager.sEnglishFile = new Configuration(new File(aEvent.getModConfigurationDirectory().getParentFile(), "GregTech.lang")); GT_LanguageManager.sEnglishFile.load(); + if (GT_LanguageManager.sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false).getBoolean(false)) { + GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile.get("EnableLangFile", "Language", "en_US").getString(); + } Materials.getMaterialsMap().values().parallelStream().filter(Objects::nonNull).forEach(aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization("Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName)); |