diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-06-23 19:14:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 20:14:16 +0200 |
| commit | 1d129ae2ed65758a1870402237f46e292ed88934 (patch) | |
| tree | f5e3769cd3af8e3db149e3c7a53e6425cf7f28bb /src/main/java | |
| parent | 651e09009bdea734414ee4617ee45f27446d4667 (diff) | |
| download | GT5-Unofficial-1d129ae2ed65758a1870402237f46e292ed88934.tar.gz GT5-Unofficial-1d129ae2ed65758a1870402237f46e292ed88934.tar.bz2 GT5-Unofficial-1d129ae2ed65758a1870402237f46e292ed88934.zip | |
Spacetime temp fix (#1089)
* Update textures
* Add credits to readme
* Fix spacetime temp.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.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 4b36ce74ee..ae2ac7a35d 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -859,7 +859,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); - public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 1.0F, 0, 2, 1|2|16|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 14, 0, false, true, 2, 1, 1, Dyes._NULL , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); + public static Materials SpaceTime = new Materials( 588, new TextureSet("spacetime", true) , 1.0F, 0, 2, 1|2|16|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))); /** diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index dc8ca19220..915fe650a7 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1853,7 +1853,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { // textures go to blocks/fluids and place the .png. File should be called fluid.molten.{unlocalised_name}.png. All lower case. String fluidTexture = aMaterial.mIconSet.is_custom ? ("molten." + aMaterial.mName.toLowerCase()) : "molten.autogenerated"; return addFluid("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH), fluidTexture, "Molten " + aMaterial.mDefaultLocalName, aMaterial, - aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 144); + aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint, GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), ItemList.Cell_Empty.get(1L), 144); } // ------------------------------------------------------------------------------------------------------------ |