4 files changed, 19 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 17357b0825..e0264866ea 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -16,9 +16,8 @@ import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.render.items.GT_GeneratedMaterial_Renderer;
-import gregtech.common.render.items.GaiaSpiritRenderer;
-import gregtech.common.render.items.TranscendentMetalRenderer;
+import gregtech.common.render.items.*;
+import gregtech.common.render.items.UniversiumRenderer;
 import gregtech.loaders.materialprocessing.ProcessingConfig;
 import gregtech.loaders.materialprocessing.ProcessingModSupport;
 import java.util.*;
@@ -910,6 +909,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     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 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(Tier.UMV);
 
     // spotless:on
 
@@ -1997,6 +1997,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Quartzite.mChemicalFormula = "SiO\u2082";
         CertusQuartz.mChemicalFormula = "SiO\u2082";
         SpaceTime.mChemicalFormula = "Reality itself distilled into physical form";
+        Universium.mChemicalFormula = "A tear into the space beyond space";
         Longasssuperconductornameforuvwire.mChemicalFormula = "Nq*\u2084(Ir\u2083Os)\u2083EuSm";
         Longasssuperconductornameforuhvwire.mChemicalFormula = "D\u2086(SpNt)\u2087Tn\u2085Am\u2086";
         SuperconductorUEVBase.mChemicalFormula = "D*\u2085If*\u2085(✦◆✦)(⚷⚙⚷ Ni4Ti6)";
@@ -2532,6 +2533,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static void initClient() {
         TranscendentMetal.renderer = new TranscendentMetalRenderer();
         MaterialsBotania.GaiaSpirit.renderer = new GaiaSpiritRenderer();
+        Infinity.renderer = new InfinityRenderer();
+        CosmicNeutronium.renderer = new CosmicNeutroniumRenderer();
+        Universium.renderer = new UniversiumRenderer();
     }
 
     private static void fillGeneratedMaterialsMap() {
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index ffe60675d6..cd78d3a560 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -3262,6 +3262,9 @@ public enum OrePrefixes {
         ingot.mNotGeneratedItems.add(Materials.WoodSealed);
         ingot.mNotGeneratedItems.add(Materials.Wood);
 
+        frame.mNotGeneratedItems.add(Materials.Universium);
+        frameGt.mNotGeneratedItems.add(Materials.Universium);
+
         plateDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter);
         plateTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter);
         plateQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter);
@@ -3353,6 +3356,7 @@ public enum OrePrefixes {
         nanite.mGeneratedItems.add(Materials.Silver);
         nanite.mGeneratedItems.add(Materials.TranscendentMetal);
         nanite.mGeneratedItems.add(Materials.Neutronium);
+        nanite.mGeneratedItems.add(Materials.Universium);
         nanite.mGeneratedItems.add(Materials.WhiteDwarfMatter);
         nanite.mGeneratedItems.add(Materials.BlackDwarfMatter);
         nanite.mGeneratedItems.add(Materials.Glowstone);
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 569e535e8c..13a2ac8490 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -2269,7 +2269,9 @@ public class Textures {
         POCKET_MULTITOOL_KNIFE,
         POCKET_MULTITOOL_SAW,
         POCKET_MULTITOOL_SCREWDRIVER,
-        POCKET_MULTITOOL_WIRECUTTER;
+        POCKET_MULTITOOL_WIRECUTTER,
+        HALO,
+        HALO_FUZZY;
         public static final IIconContainer[]
                 DURABILITY_BAR =
                         {
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 51efb8a9a7..f1cdde1d48 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -9,6 +9,7 @@ import static gregtech.api.enums.GT_Values.M;
 import static gregtech.api.enums.GT_Values.NW;
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.Materials.FLUID_MAP;
 import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
 
 import cofh.api.transport.IItemDuct;
@@ -1954,6 +1955,10 @@ public class GT_Utility {
         tNBT.setLong("mFluidDisplayHeat", aFluid.getFluid().getTemperature(aFluid));
         tNBT.setBoolean("mFluidState", aFluid.getFluid().isGaseous(aFluid));
         tNBT.setBoolean("mHideStackSize", aHideStackSize);
+        try {
+            tNBT.setString("mFluidMaterialName", FLUID_MAP.get(aFluid.getFluid()).mName);
+        } catch (Exception ignored) {
+        }
         rStack.setTagCompound(tNBT);
         return rStack;
     }