diff options
| author | Technus <daniel112092@gmail.com> | 2017-01-05 17:59:04 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-01-05 17:59:04 +0100 |
| commit | 6cfe809d4b17d4f83aba47aebd549e13651b2546 (patch) | |
| tree | 141c6d7287326216de23345e7c18b2b4da674b0d /src/main/java/gregtech/api | |
| parent | 49d2982094654708456c9af36977cdfbb8226ad3 (diff) | |
| parent | 8dbbf23f489756c12a8ee3f9ba06fd9850484dc4 (diff) | |
| download | GT5-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')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_LanguageManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 23de2bdb62..9cd4594fcd 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -387,7 +387,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Creosote ( 712, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 128, 64, 0, 0, "Creosote" , 3, 8, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown ), Ethanol ( 706, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 128, 0, 0, "Ethanol" , 0, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple ), FishOil ( 711, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 196, 0, 0, "Fish Oil" , 3, 2, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.CORPUS, 2))), - Fuel ( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Diesel" , 0, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + Fuel ( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Diesel" , 0, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), Glue ( 726, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "Refined Glue" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.LIMUS, 2))), Gunpowder ( 800, TextureSet.SET_DULL , 1.0F, 0, 0, 1 , 128, 128, 128, 0, "Gunpowder" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 4))), FryingOilHot ( 727, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "Hot Frying Oil" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.IGNIS, 1))), 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)){ |