From 8078bca4b3c98cbf81f2473e15c124d0c7d3f676 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sun, 6 Dec 2015 22:37:25 +0100 Subject: [PATCH] Moved Sulfide ore processing from IHL to GT --- src/main/java/gregtech/api/enums/ItemList.java | 4 ++-- .../common/items/GT_MetaGenerated_Item_02.java | 3 +++ .../postload/GT_CraftingRecipeLoader.java | 3 +++ .../loaders/postload/GT_MachineRecipeLoader.java | 9 ++++++++- .../preload/GT_Loader_Item_Block_And_Fluid.java | 3 +++ .../textures/blocks/fluids/fluid.nitricacid.png | Bin 0 -> 4470 bytes .../blocks/fluids/fluid.nitricacid.png.mcmeta | 5 +++++ .../blocks/fluids/fluid.solution.bluevitriol.png | Bin 0 -> 5470 bytes .../fluids/fluid.solution.bluevitriol.png.mcmeta | 5 +++++ .../fluids/fluid.solution.nickelsulfate.png | Bin 0 -> 5605 bytes .../fluid.solution.nickelsulfate.png.mcmeta | 5 +++++ .../textures/items/gt.metaitem.02/536.png | Bin 0 -> 3064 bytes .../textures/items/gt.metaitem.02/537.png | Bin 0 -> 309 bytes 13 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/537.png diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 13553ff8..abf0dbb9 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -634,11 +634,11 @@ public enum ItemList implements IItemContainer { Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX, MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM, - Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah,; + Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, PlatinumGroupSludge, PlatinumGroupSludgeTiny,; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX}; - public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid; + public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sNitricAcid, sBlueVitriol, sNickelSulfate; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 343e3ebb..4f294dbd 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -299,6 +299,9 @@ public class GT_MetaGenerated_Item_02 ItemList.Crop_Drop_Osmium.set(addItem(tLastID = 534, "Quantaria Leaf", "Source of Osmium", new Object[]{})); ItemList.Crop_Drop_Naquadah.set(addItem(tLastID = 535, "Stargatium Leaf", "Source of Naquadah", new Object[]{})); + ItemList.PlatinumGroupSludge.set(addItem(tLastID = 536, "Platinum group metals sludge", "", new Object[]{})); + ItemList.PlatinumGroupSludgeTiny.set(addItem(tLastID = 537, "Tiny Pile Platinum group metals sludge", "", new Object[]{})); + ItemList.Crop_Drop_Chilly.set(addItem(tLastID = 550, "Chilly Pepper", "It is red and hot", new Object[]{"cropChilipepper", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[]{Potion.confusion.id, 200, 1, 40}), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); ItemList.Crop_Drop_Lemon.set(addItem(tLastID = 551, "Lemon", "Don't make Lemonade", new Object[]{"cropLemon", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); ItemList.Crop_Drop_Tomato.set(addItem(tLastID = 552, "Tomato", "Solid Ketchup", new Object[]{"cropTomato", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index e245aca6..2d09f857 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -408,6 +408,9 @@ public class GT_CraftingRecipeLoader GT_ModHandler.addCraftingRecipe(ItemList.IC2_Item_Casing_Lead.get(1L, new Object[0]), new Object[]{"h P", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Lead)}); GT_ModHandler.addCraftingRecipe(ItemList.IC2_Item_Casing_Steel.get(1L, new Object[0]), new Object[]{"h P", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.PlatinumGroupSludge.get(1, new Object[0]), new Object[]{"DDD","DDD","DDD", 'D', ItemList.PlatinumGroupSludgeTiny.get(1, new Object[0])}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.PlatinumGroupSludgeTiny.get(9, new Object[0]), new Object[]{ItemList.PlatinumGroupSludge.get(1, new Object[0])}); + GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 2), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"C", "S", Character.valueOf('C'), OrePrefixes.dust.get(Materials.Sulfur), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood)}); GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"C", "S", Character.valueOf('C'), OrePrefixes.dust.get(Materials.Phosphorus), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood)}); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 26b652ba..739533c0 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -313,6 +313,13 @@ public class GT_MachineRecipeLoader GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), null, ItemList.Component_Filter.get(1, new Object[0]), 16, 1600); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicon, 1), Materials.Glue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Graphene, 1), 480, 480); + GT_Values.RA.addCentrifugeRecipe(ItemList.Cell_Empty.get(5, new Object[0]), null, Materials.Air.getGas(10000), Materials.Nitrogen.getGas(3900), GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Oxygen,1), null, null, null, null, null, null, 1600, 8); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.cell,Materials.NitrogenDioxide,4), GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Oxygen,1), Materials.Water.getFluid(2000), new FluidStack(ItemList.sNitricAcid,4000), ItemList.Cell_Empty.get(5, new Object[0]), 950, 30); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.crushedPurified,Materials.Pentlandite,1), null, new FluidStack(ItemList.sNitricAcid,8000), new FluidStack(ItemList.sNickelSulfate,9000), ItemList.PlatinumGroupSludgeTiny.get(1, new Object[0]), 50, 30); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.crushedPurified,Materials.Chalcopyrite,1), null, new FluidStack(ItemList.sNitricAcid,8000), new FluidStack(ItemList.sBlueVitriol,9000), ItemList.PlatinumGroupSludgeTiny.get(1, new Object[0]), 50, 30); + GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Empty.get(5, new Object[0]), null, new FluidStack(ItemList.sBlueVitriol,9000), Materials.SulfuricAcid.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Copper,1), GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Oxygen,1), null, null, null, null, null, 900, 30); + GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Empty.get(5, new Object[0]), null, new FluidStack(ItemList.sNickelSulfate,9000), Materials.SulfuricAcid.getFluid(8000), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Nickel,1), GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Oxygen,1), null, null, null, null, null, 900, 30); + GT_Values.RA.addCentrifugeRecipe(ItemList.PlatinumGroupSludge.get(1, new Object[0]), null, null, null, GT_OreDictUnificator.get(OrePrefixes.dust,Materials.SiliconDioxide,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Gold,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Platinum,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Palladium,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Iridium,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Osmium,1), new int[]{10000,10000,10000,8000,6000,6000}, 900, 30); GT_Values.RA.addSlicerRecipe(ItemList.Food_Dough_Chocolate.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Raw_Cookie.get(4L, new Object[0]), 128, 4); GT_Values.RA.addSlicerRecipe(ItemList.Food_Baked_Bun.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Sliced_Bun.get(2L, new Object[0]), 128, 4); @@ -900,7 +907,7 @@ public class GT_MachineRecipeLoader GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_NaK_3.getWildcard(1L, new Object[0]), ItemList.Reactor_Coolant_NaK_3.get(1L, new Object[0]), 1800); GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_NaK_6.getWildcard(1L, new Object[0]), ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), 3600); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), 50); - GT_Values.RA.addVacuumFreezerRecipe(GT_ModHandler.getIC2Item("airCell", 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), 250); + GT_Values.RA.addVacuumFreezerRecipe(GT_ModHandler.getIC2Item("airCell", 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), 25); GT_Values.RA.addAlloySmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L), ItemList.TE_Hardened_Glass.get(2L, new Object[0]), 200, 16); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 4a7e9525..fc19a64d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -368,6 +368,9 @@ public class GT_Loader_Item_Block_And_Fluid ItemList.sOilExtraHeavy = GT_Mod.gregtechproxy.addFluid("liquid_extra_heavy_oil", "Very Heavy Oil", null, 1, 295); ItemList.sEpichlorhydrin = GT_Mod.gregtechproxy.addFluid("liquid_epichlorhydrin", "Epichlorhydrin", null, 1, 295); ItemList.sDrillingFluid = GT_Mod.gregtechproxy.addFluid("liquid_drillingfluid", "Drilling Fluid", null, 1, 295); + ItemList.sNitricAcid = GT_Mod.gregtechproxy.addFluid("nitricacid", "Nitric acid ", null, 1, 295); + ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); + ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); GT_Mod.gregtechproxy.addFluid("liquid_heavy_oil", "Heavy Oil", Materials.OilHeavy, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("liquid_medium_oil", "Raw Oil", Materials.OilMedium, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png new file mode 100644 index 0000000000000000000000000000000000000000..11c8d78df46e1a32b416261252871ff64bcf1dc0 GIT binary patch literal 4470 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png.mcmeta new file mode 100644 index 00000000..7e77c648 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.png new file mode 100644 index 0000000000000000000000000000000000000000..6bbed872961c0d73ebbe06f2dd0120ec40a3726b GIT binary patch literal 5470 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 M4TO5}?K@BY4|!!~8UO$Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png.mcmeta new file mode 100644 index 00000000..7e77c648 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png new file mode 100644 index 0000000000000000000000000000000000000000..872dbc43d358c44318e97ddcc89c8b8a756c1d72 GIT binary patch literal 3064 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/537.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/537.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc952df3543a5cf2d6a971082181c79ae2d7072 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`DE0AVpW|oqYl9Q8DR#sM5 zSJ&3oHZU+SF)^{Qu&}kYb#!#}_V$jBj*gFyPfkwG$jHdf&aSPkt*@{D|NlQwJ5W7P zF;FE?&D{=%JwPGRk{~~j4Va*KlCTg^w9(VWF+@U=^#EfQlc4~^ft#jWQv$Sq{n!7d zRW2dy>1ESkd3p{j=d*(knp+<8u5o;{^~LOcmS(N8^Do~me7;)zx6ky8<;NzAi3?rd z$|#vQ?|Jz;`4TS&mYE)rt{wYlo