aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials2.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-05 18:41:37 +0200
committerDream-Master <dream-master@gmx.net>2018-09-05 18:41:37 +0200
commit480848821f16989ed150bc98f749b6bf8db1faa6 (patch)
tree2270ae650eed6fbc9ac137f1ce407f438e92f574 /src/main/java/gregtech/api/enums/Materials2.java
parent1698e57f729efb52e2b98e865a9671f0b50a5b2e (diff)
parentcb158871441d64678d256b784c40278b0f730d5e (diff)
downloadGT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.gz
GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.bz2
GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.zip
Merge branch 'New_hightier_stuff_dev' into New_test_dev
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials2.java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials2.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials2.java b/src/main/java/gregtech/api/enums/Materials2.java
new file mode 100644
index 0000000000..1d343ff0f8
--- /dev/null
+++ b/src/main/java/gregtech/api/enums/Materials2.java
@@ -0,0 +1,14 @@
+package gregtech.api.enums;
+
+public class Materials2 {
+
+ public static Materials Signalum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Signalum" , "Signalum" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
+ public static Materials Lumium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Lumium" , "Lumium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
+ public static Materials EnrichedCopper = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "EnrichedCopper" , "Enriched Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
+ public static Materials DiamondCopper = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "DiamondCopper" , "Diamond Copper" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
+ public static Materials TarPitch = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "TarPitch" , "Tar Pitch" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
+
+ private static void initSubTags() {
+ SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper);
+ }
+} \ No newline at end of file