diff options
Diffstat (limited to 'src/main')
5 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 5dbf100667..e22cefe995 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -910,8 +910,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials WhiteDwarfMatter = new Materials(585, new TextureSet("WhiteDwarfMatter", true), 1.0F, 0, 2, 1|2|64|128, 255, 255, 255, 0, "WhiteDwarfMatter", "White Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); public static Materials BlackDwarfMatter = new Materials(586, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|64|128, 0, 0, 0, 255, "BlackDwarfMatter", "Black Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - public static Materials Time = new Materials(587, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "Time", "Molten Time", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); - public static Materials Space = new Materials(106, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "Space", "Molten Space", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); + public static Materials Time = new Materials(587, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "temporalFluid", "Tachyon Rich Temporal Fluid", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); + public static Materials Space = new Materials(106, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "spatialFluid", "Spatially Enlarged Fluid", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); public static Materials Universium = new Materials(139, new TextureSet("universium", true), 1.0F,4*2621440, 25, 1|2|64|128, 38, 49, 69, 255, "Universium" , "Universium", -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(TierEU.RECIPE_UMV); diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 7e102d5a2b..08a0c2de8c 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -761,7 +761,7 @@ public enum OrePrefixes { ingotTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); ingotQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); ingotQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - turbine.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + turbineBlade.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); dust.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); dustSmall.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); dustTiny.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 3f0f913dc4..0146f3a10e 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -151,7 +151,7 @@ public class GT_NaniteChain { getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("space", 720), }, + FluidRegistry.getFluidStack("spatialFluid", 720), }, new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) }, null, null, @@ -169,7 +169,7 @@ public class GT_NaniteChain { getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("time", 720), }, + FluidRegistry.getFluidStack("temporalFluid", 720), }, new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) }, null, null, diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png Binary files differindex 993092ff04..c040d90f63 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/429.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}}
\ No newline at end of file |
