aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-07-26 00:57:33 +0100
committerGitHub <noreply@github.com>2022-07-26 06:57:33 +0700
commit853c0f248a9b62de4346b82e47eb4fd1a8a682d2 (patch)
tree901f7477391d4a5a8bacc4e0bd0bcffa2b68df69 /src/main/java/gregtech/api/enums
parenta1dcf3cfdbd3cf0ea345e94b73d723395d473ab3 (diff)
downloadGT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.tar.gz
GT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.tar.bz2
GT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.zip
New material + item + texture changes. (#1161)
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 275a6bdd7b..b5898618f3 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -415,6 +415,8 @@ public enum ItemList implements IItemContainer {
Electric_Pump_OpV,
Electric_Pump_MAX,
+ Tesseract,
+
Steam_Valve_LV,
Steam_Valve_MV,
Steam_Valve_HV,
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index f5197ef502..6dd851e94b 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -881,7 +881,8 @@ 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 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, 0, false, true, 200, 1000, 1000, Dyes.dyeBlack , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
static {
MaterialsKevlar.init();