last try

3 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index d3c6a64a2f..b06fbe27f0 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -42,11 +42,6 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
     public static Materials SolutionBlueVitriol     = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "SolutionBlueVitriol"     ,   "Blue Vitriol Solution"         ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
     public static Materials SolutionNickelSulfate   = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 0                         , 255, 255, 255,   0,   "SolutionNickelSulfate"   ,   "Nickel Sulfate Solution"       ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
 
-    //GT++ materials
-    public static Materials Curium                = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Curium"            ,    "Curium"                  ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cm   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));
-    public static Materials Californium           = new Materials( -1, TextureSet.SET_SHINY       ,   1.0F,      0,  0, 0                , 255,255, 255,   0,   "Californium"       ,    "Californium"             ,     0,       0,     -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cf   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));
-    public static Materials Flerovium             = new Materials( 984, TextureSet.SET_SHINY      ,   1.0F,      0,  0, 1|2  |8      |64|128                , 255,255, 255,   0,   "Flerovium "        ,    "Flerovium "              ,     0,       0,     -1,    -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Fl   , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));
-
     private static void initSubTags() {
         SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper);
         SubTag.NO_SMASHING.addTo(TarPitch);
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index eb9b87b7f8..fa22ac1815 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -126,6 +126,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Yttrium                 = new Materials(  45, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 220, 250, 220,   0,   "Yttrium"                 ,   "Yttrium"                       ,    0,       0,       1799, 1799,  true, false,   4,   1,   1, Dyes._NULL          , Element.Y         , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));

     public static Materials Zinc                    = new Materials(  36, TextureSet.SET_METALLIC          ,   1.0F,      0,  1, 1|2  |8   |32             , 250, 240, 240,   0,   "Zinc"                    ,   "Zinc"                          ,    0,       0,        692,    0, false, false,   2,   1,   1, Dyes.dyeWhite       , Element.Zn        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.SANO, 1)));

 

+    //GT++ materials

+    public static Materials Curium                  = new Materials( -1, TextureSet.SET_SHINY              ,   1.0F,      0,  0, 0                         , 255,255, 255,   0,   "Curium"                   ,    "Curium"                       ,     0,       0,        -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cm         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));

+    public static Materials Californium             = new Materials( -1, TextureSet.SET_SHINY              ,   1.0F,      0,  0, 0                         , 255,255, 255,   0,   "Californium"              ,    "Californium"                  ,     0,       0,        -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Cf         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));

+    public static Materials Flerovium               = new Materials( 984, TextureSet.SET_SHINY             ,   1.0F,      0,  0, 1|2  |8      |64|128      , 255,255, 255,   0,   "Flerovium "               ,    "Flerovium "                   ,     0,       0,        -1,  -1,  false,  false,  1 ,  1,   1, Dyes.dyeWhite      , Element.Fl         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2)));

+

     /**

      * The "Random Material" ones.

      */

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 5a0a63b91e..b0ce523e43 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -1401,9 +1401,9 @@ public class GT_MachineRecipeLoader implements Runnable {
         //GT_Values.RA.addFusionReactorRecipe(Materials.Neutronium.getMolten(144), Materials.Neutronium.getMolten(144), Materials.Neutronium.getPlasma(72), 64, 130000, 640000000);//FT3+ - yes it is a bit troll XD
 
         //MK4
-        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), GTNH_ExtraMaterials.Curium.getFluid(144), 96, 98304, 500000000);
-        GT_Values.RA.addFusionReactorRecipe(GTNH_ExtraMaterials.Curium.getMolten(144), Materials.Helium.getPlasma(1000), GTNH_ExtraMaterials.Californium.getFluid(144), 128, 196608, 750000000);
-        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getMolten(1000), GTNH_ExtraMaterials.Flerovium.getFluid(144), 160, 196608, 1000000000);
+        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), Materials.Curium.getFluid(144), 96, 98304, 500000000);
+        GT_Values.RA.addFusionReactorRecipe(Materials.Curium.getMolten(144), Materials.Helium.getPlasma(1000), Materials.Californium.getFluid(144), 128, 196608, 750000000);
+        GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getMolten(1000), Materials.Flerovium.getFluid(144), 160, 196608, 1000000000);