aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-24 13:41:53 +0200
committerDream-Master <dream-master@gmx.net>2017-07-24 13:41:53 +0200
commit5a72939c8934819113815ebafd449f81d69ffd65 (patch)
tree4149ed28880d04629bbcba2f1598f42709b28fbd /src/main/java/gregtech/api/enums
parent5bc961959e93aff58f87234591050507a7b9dd1f (diff)
downloadGT5-Unofficial-5a72939c8934819113815ebafd449f81d69ffd65.tar.gz
GT5-Unofficial-5a72939c8934819113815ebafd449f81d69ffd65.tar.bz2
GT5-Unofficial-5a72939c8934819113815ebafd449f81d69ffd65.zip
Added more material parts to Infinity and Infinity Catalyst. Add Cosmic Neutronium from Avaritia to the material list
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 26ab2dda95..5a027599ce 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -770,11 +770,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
* Op materials (draconic evolution above)
*/
//TODO: add other op materials? maybe some new ores or new only fusion made op materials from op materials??? like neutronium bedrockium alloy etc.
- public static Materials InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 7, 1 |8 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeLightGray );
- public static Materials Infinity = new Materials( 397, TextureSet.SET_SHINY , 128.0F,2621440, 8, 1 |8 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeWhite );
+ public static Materials InfinityCatalyst = new Materials( 394, TextureSet.SET_SHINY , 64.0F,1310720, 7, 1|2 |8 , 255, 255, 255, 0, "InfinityCatalyst" , "Infinity Catalyst" , 5, 500000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeLightGray );
+ public static Materials Infinity = new Materials( 397, TextureSet.SET_SHINY , 128.0F,2621440, 8, 1|2 |8 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeWhite );
public static Materials Bedrockium = new Materials( 395, TextureSet.SET_DULL , 8.0F, 327680, 6, 1 |8 , 50, 50, 50, 0, "Bedrockium" , "Bedrockium" , 0, 0, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeBlack );
public static Materials Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 128, 8, 1|2 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 27200, true, false, 4, 1, 1, Dyes.dyeLightGray );
public static Materials Ichorium = new Materials( 978, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, -1, 0, false, false, 4, 1, 1, Dyes.dyeOrange );
+ public static Materials CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 1.0F, 0, 8, 1|2 |8 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeBlack );
/**
* Materials which are renamed automatically