diff options
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 8d9dc49d0b..b73e6bd3a8 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -418,6 +418,7 @@ public enum ItemList implements IItemContainer { Electric_Pump_MAX, Tesseract, + EnergisedTesseract, Steam_Valve_LV, Steam_Valve_MV, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 49a2cd3fe6..19c3b5d931 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -882,7 +882,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) , 320.0F, 4*2621440, 25, 1|2|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))); - public static Materials TranscendentMetal = new Materials( 581, new TextureSet("transcendentmetal", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 50, 50, 50,255, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, false, true, 200, 1000, 1000, Dyes.dyeBlack , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes(); + public static Materials TranscendentMetal = new Materials( 581, new TextureSet("transcendentmetal", true) , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,255, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); static { MaterialsKevlar.init(); @@ -2008,7 +2008,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { FreshWater ); - TranscendentMetal.add(SubTag.NO_SMELTING); +// TranscendentMetal.add(SubTag.NO_SMELTING); Wood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); WoodSealed.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING, SubTag.NO_WORKING); Peanutwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); |