diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-08-31 12:46:13 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-08-31 12:46:13 +0200 |
| commit | b13b96773901a0d6d83cedbd66e14ccfb3c95911 (patch) | |
| tree | a86dfcc12198fe81c8cfd0edc9ee0ba8adbafc6d /src | |
| parent | 9f030dcce750df9c5137e124a238f6de05e30af4 (diff) | |
| parent | 91cfac53ba75ca50b27dafe6448b9fbff96e671d (diff) | |
| download | GT5-Unofficial-b13b96773901a0d6d83cedbd66e14ccfb3c95911.tar.gz GT5-Unofficial-b13b96773901a0d6d83cedbd66e14ccfb3c95911.tar.bz2 GT5-Unofficial-b13b96773901a0d6d83cedbd66e14ccfb3c95911.zip | |
Merge branch 'experimental' into High_tier_circuits_dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 1daf1c7502..7a6b5bbe81 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -362,7 +362,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Elite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Elite" , "Elite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 6)));
public static Materials Master = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Master" , "Master" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 7)));
public static Materials Ultimate = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Ultimate" , "Ultimate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 8)));
- public static Materials Superconductor = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Superconductor" , "Superconductor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8)));
+ public static Materials Superconductor = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Superconductor" , "Superconductor UHV" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8)));
public static Materials Infinite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Infinite" , "Infinite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray );
/**
|