Merge remote-tracking branch 'jude123412/master' into dev

src/main/java/gregtech/loaders/materials/MaterialsInit1.java

@@ -901,10 +901,10 @@ public static void load() {
 
         Materials.InfinityCatalyst        = new Materials( 394, TextureSet.SET_SHINY             ,  64.0F,1310720,  10, 1|2    |8    |64|128      , 255, 255, 255,   0,   "InfinityCatalyst"        ,   "Infinity Catalyst"             ,     5,  500000,     10800,  10800,  true, false, 20,   1,   1, Dyes.dyeLightGray    ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Infinity                = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440,  17, 1|2|32|64|128      , 255, 255, 255,   0,   "Infinity"                ,   "Infinity"                      ,     5, 5000000,     10800,  10800,  true, false, 40,   1,   1, Dyes.dyeLightGray    ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
-        Materials.Bedrockium              = new MaterialBuilder(395,new TextureSet("bedrockium", true), "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
+        Materials.Bedrockium              = new MaterialBuilder(395, new TextureSet("bedrockium", true), "Bedrockium").addOreItems().addDustItems().addPlasma().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setMaterialList(new MaterialStack(Materials.SiliconDioxide, 26244), new MaterialStack(Materials.Diamond, 9)).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
         Materials.Trinium                 = new Materials( 868, TextureSet.SET_SHINY             , 128.0F,  51200,  8, 1|2    |8    |64|128      , 200, 200, 210,   0,   "Trinium"                 ,   "Trinium"                       ,     0,       0,      7200,   7200,  true, false,  4,   1,   1, Dyes.dyeLightGray    ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Ichorium                = new Materials( 978, TextureSet.SET_SHINY             ,  32.0F, 850000,  12, 1|2    |8 |32|64|128      , 211, 120,   6,   0,   "Ichorium"                ,   "Ichorium"                      ,     5,  250000,      9000,   9000,  true, false,  4,   1,   1, Dyes.dyeOrange       ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true);
-        Materials.CosmicNeutronium        = new Materials( 982, TextureSet.SET_SHINY             ,  96.0F, 163840,  12, 1|2    |8 |32|64|128      ,  50,  50,  50,   0,   "CosmicNeutronium"        ,   "Cosmic Neutronium"             ,     0,       0,      9900,   9900,  true, false,  4,   1,   1, Dyes.dyeBlack        ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
+        Materials.CosmicNeutronium        = new Materials( 982, new TextureSet("cosmicneutronium", true),  96.0F, 163840,  12, 1|2    |8 |32|64|128      ,  50,  50,  55,   0,   "CosmicNeutronium"        ,   "Cosmic Neutronium"             ,     0,       0,      9900,   9900,  true, false,  4,   1,   1, Dyes.dyeBlack        ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
 
         Materials.Pentacadmiummagnesiumhexaoxid                                   = new Materials( 987, TextureSet.SET_SHINY          ,   1.0F,      0,  3, 1|2                ,  85, 85,  85,   0,   "Pentacadmiummagnesiumhexaoxid"                                 ,   "Superconductor Base MV"       ,     0,       0,     2500,  2500,  true,  false,  1,   1,   1, Dyes.dyeGray       , 1, Arrays.asList(new MaterialStack(Cadmium, 5), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 6)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 3))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
         Materials.Titaniumonabariumdecacoppereikosaoxid                           = new Materials( 988, TextureSet.SET_METALLIC       ,   1.0F,      0,  3, 1|2                ,  51, 25,   0,   0,   "Titaniumonabariumdecacoppereikosaoxid"                         ,   "Superconductor Base HV"       ,     0,       0,     3300,  3300,  true,  false,  1,   1,   1, Dyes.dyeBrown      , 1, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Barium, 9),  new MaterialStack(Copper, 10), new MaterialStack(Oxygen, 20)), Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 6))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();

src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.cosmicneutronium.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.png.mcmeta

@@ -19,6 +19,42 @@
       6,
       7,
       8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      15,
+      16,
+      16,
+      17,
+      17,
+      17,
+      18,
+      18,
+      18,
+      19,
+      19,
+      19,
+      18,
+      18,
+      18,
+      17,
+      17,
+      17,
+      16,
+      16,
+      15,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
       7,
       6,
       5,

src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.cosmicneutronium.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/TURBINE_BLADE_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/bolt_OVERLAY.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/casingSmall_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/cell.png.mcmeta

@@ -0,0 +1,45 @@
+{
+    "animation": {
+      "frametime": 2,
+      "frames": [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        17,
+        18,
+        19,
+        18,
+        17,
+        16,
+        15,
+        14,
+        13,
+        12,
+        11,
+        10,
+        9,
+        8,
+        7,
+        6,
+        5,
+        4,
+        3,
+        2,
+        1
+      ]
+    }
+  }

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/crushedCentrifuged_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/crushedPurified_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/crushed_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/dustImpure_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/dustPure_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/dustSmall_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/dustTiny_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/dust_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/foil_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/gearGtSmall_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/gearGt_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/handleMallet_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/ingotHot_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/ingot_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/nanites.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/nugget_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/oreRaw_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateDense_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateDouble_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateQuadruple_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateQuintuple_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateSuperdense_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{ "animation": { "interpolate": false, "frametime": 1 } }

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plateTriple_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/plate_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/ring_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/rotor_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/round_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/screw_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/springSmall_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/spring_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/stickLong_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/stick_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadArrow_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadAxe_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadBuzzSaw_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadChainsaw_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadDrill_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadFile_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadHammer_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadHoe_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadMallet_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadPickaxe_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadPlow_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadSaw_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadScrewdriver_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadSense_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadShovel_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadSoldering_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadSword_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadUniversalSpade_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/toolHeadWrench_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/turbineBlade_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/void.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/cosmicneutronium/wireFine_OVERLAY.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}