diff options
| author | Technus <daniel112092@gmail.com> | 2016-10-18 11:46:24 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-10-18 11:46:24 +0200 |
| commit | 6bde4703195dddab33f529af6fe87ec4a6cca5e8 (patch) | |
| tree | c775db21989763357757d3dc04fe843c8f08131e | |
| parent | df48c285797fc36851e22bb9ea9f2a6fe175ad18 (diff) | |
| parent | 476ac3314ec5d1a615d0bb22fe2489ce389b2e1e (diff) | |
| download | GT5-Unofficial-6bde4703195dddab33f529af6fe87ec4a6cca5e8.tar.gz GT5-Unofficial-6bde4703195dddab33f529af6fe87ec4a6cca5e8.tar.bz2 GT5-Unofficial-6bde4703195dddab33f529af6fe87ec4a6cca5e8.zip | |
Merge branch 'experimental' into Some_Blood_Asps
| -rw-r--r-- | libs/GTNewHorizonsCoreMod-1.7.10-1.2.21.jar (renamed from libs/GTNewHorizonsCoreMod-1.7.10-1.2.14.jar) | bin | 2872950 -> 2937298 bytes | |||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.2.14.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.2.21.jar Binary files differindex d2fd8c2866..d711057e94 100644 --- a/libs/GTNewHorizonsCoreMod-1.7.10-1.2.14.jar +++ b/libs/GTNewHorizonsCoreMod-1.7.10-1.2.21.jar diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 25b381d3ef..f481e168d0 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -349,8 +349,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Turquoise ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Turquoise" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), UUAmplifier ( 721, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 96, 0, 128, 0, "UU-Amplifier" , 0, 0, -1, 0, false, false, 10, 1, 1, Dyes.dyePink ), UUMatter ( 703, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 128, 0, 196, 0, "UU-Matter" , 0, 0, -1, 0, false, false, 10, 1, 1, Dyes.dyePink ), - Void ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 200, "Void" , 0, 0, -1, 0, false, true, 1, 1, 1, Dyes._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 1))), - Voidmetal ( 970, TextureSet.SET_METALLIC , 16.0F, 512, 4, 1|2 |64|128 , 28, 6, 57, 0, "Void Metal" , 5, 1500, -1, 0, false, false, 5, 2, 1, Dyes.dyeBlack , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 1), new TC_AspectStack(TC_Aspects.VACUOS, 1))), + Void ( 970, TextureSet.SET_METALLIC , 16.0F, 512, 4, 1|2 |64|128 , 28, 6, 57, 0, "Void" , 5, 1500, -1, 0, false, true, 5, 2, 1, Dyes.dyeBlack , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 1))), Vulcanite ( 489, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 132, 72, 0, "Vulcanite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Vyroxeres ( 951, TextureSet.SET_METALLIC , 9.0F, 768, 3, 1|2 |8 |64 , 85, 224, 1, 0, "Vyroxeres" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Wimalite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 8 , 255, 255, 255, 0, "Wimalite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ), |