diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-25 06:48:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 12:48:46 +0200 |
| commit | 683e0970aea98b5d59fb0de928d130cd8e44360e (patch) | |
| tree | 40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java/gregtech/api/enums | |
| parent | 00b6c43af283b0a7a33e039718a63826d635576e (diff) | |
| download | GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2 GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip | |
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/MaterialsGTNH.java | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 9b60b6846a..95463122f1 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -382,8 +382,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Nano = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Nano" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 11))); public static Materials Piko = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Piko" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 12))); - public static Materials Quantum = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Quantum" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TCAspects.ELECTRUM, 13))); - /** * Aliases for the old style of tiered circuits diff --git a/src/main/java/gregtech/api/enums/MaterialsGTNH.java b/src/main/java/gregtech/api/enums/MaterialsGTNH.java index 12a53f6b86..8a3b7f9660 100644 --- a/src/main/java/gregtech/api/enums/MaterialsGTNH.java +++ b/src/main/java/gregtech/api/enums/MaterialsGTNH.java @@ -199,29 +199,6 @@ public class MaterialsGTNH implements IMaterialHandler { 1, 1, Dyes.dyeYellow); - public static Materials Quantum = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "Quantum", - "Quantum", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeWhite); public static Materials Turquoise = new Materials( -1, TextureSet.SET_NONE, |