aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-01-05 17:59:04 +0100
committerTechnus <daniel112092@gmail.com>2017-01-05 17:59:04 +0100
commit6cfe809d4b17d4f83aba47aebd549e13651b2546 (patch)
tree141c6d7287326216de23345e7c18b2b4da674b0d /src/main/java/gregtech/api/util
parent49d2982094654708456c9af36977cdfbb8226ad3 (diff)
parent8dbbf23f489756c12a8ee3f9ba06fd9850484dc4 (diff)
downloadGT5-Unofficial-6cfe809d4b17d4f83aba47aebd549e13651b2546.tar.gz
GT5-Unofficial-6cfe809d4b17d4f83aba47aebd549e13651b2546.tar.bz2
GT5-Unofficial-6cfe809d4b17d4f83aba47aebd549e13651b2546.zip
Merge branch 'experimental' into eM
# Conflicts: # libs/GTNewHorizonsCoreMod-1.7.10-1.3.02.jar
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_LanguageManager.java2
1 files changed, 1 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 36b543b183..561d47edf7 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -22,7 +22,7 @@ public class GT_LanguageManager {
return addStringLocalization(aKey, aEnglish, true);
}
- public static String addStringLocalization(String aKey, String aEnglish, boolean aWriteIntoLangFile) {
+ public static synchronized String addStringLocalization(String aKey, String aEnglish, boolean aWriteIntoLangFile) {
if (aKey == null) return E;
if (aWriteIntoLangFile){ aEnglish = writeToLangFile(aKey, aEnglish);
if(!LANGMAP.containsKey(aKey)){