aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-11-09 22:03:49 +0100
committerGitHub <noreply@github.com>2021-11-09 22:03:49 +0100
commitc8cd80d228166cf983812618d4c129df2fcef0cd (patch)
tree1cdb6bdb54819091a4bd259b3360daf6bac5e37f /src/main/java/gregtech/api
parent216aa922591168627b5e06cc8c198d7233aa57af (diff)
parent89ae9c98b8ace8bbd25d6fa2a0ade40e588aef38 (diff)
downloadGT5-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/api')
-rw-r--r--src/main/java/gregtech/api/util/GT_LanguageManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java
index e0c23fce8e..9faa7b11a6 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -16,6 +16,7 @@ import static gregtech.api.enums.GT_Values.E;
public class GT_LanguageManager {
public static final HashMap<String, String> TEMPMAP = new HashMap<String, String>(), BUFFERMAP = new HashMap<String, String>(), LANGMAP = new HashMap<String, String>();
public static Configuration sEnglishFile;
+ public static String sLanguage = "en_US";
public static boolean sUseEnglishFile = false;
public static boolean i18nPlaceholder = true;
@@ -31,7 +32,7 @@ public class GT_LanguageManager {
}
}
TEMPMAP.put(aKey.trim(), aEnglish);
- LanguageRegistry.instance().injectLanguage("en_US", TEMPMAP);
+ LanguageRegistry.instance().injectLanguage(sLanguage, TEMPMAP);
TEMPMAP.clear();
if(sUseEnglishFile && !aWriteIntoLangFile){
if (!LANGMAP.containsKey(aKey)) {