From 14ae461281b5887c5bcff60b3e897839ca61c68e Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 30 Apr 2017 11:25:45 +0200 Subject: [PATCH] rework circuits Basic and Good --- .../java/gregtech/api/enums/ItemList.java | 2 +- .../items/GT_MetaGenerated_Item_01.java | 2 +- .../items/GT_MetaGenerated_Item_03.java | 6 ++++-- .../oreprocessing/ProcessingCircuit.java | 2 +- .../postload/GT_MachineRecipeLoader.java | 18 ++++++++++-------- .../items/gt.metaitem.03/{8.png => 100.png} | Bin 3597 -> 3354 bytes .../items/gt.metaitem.03/{7.png => 101.png} | Bin 3827 -> 3346 bytes .../textures/items/gt.metaitem.03/102.png | Bin 0 -> 3153 bytes 8 files changed, 17 insertions(+), 13 deletions(-) rename src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/{8.png => 100.png} (76%) rename src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/{7.png => 101.png} (71%) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index bc0ef99f..6e0a5c20 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -652,7 +652,7 @@ public enum ItemList implements IItemContainer { ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4, Hatch_AutoMaintenance, - Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Phenolic, Circuit_Board_Phenolic_Good, Circuit_Board_Electronic, Circuit_Board_Epoxy, Circuit_Board_Fiberglass, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, + Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Coated_Basic, Circuit_Board_Phenolic, Circuit_Board_Phenolic_Good, Circuit_Board_Phenolic_Electronic, Circuit_Board_Epoxy, Circuit_Board_Fiberglass, Circuit_Board_Multifiberglass, Circuit_Board_Wetware, Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Vacuum_Tube, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, Circuit_Silicon_Ingot, Circuit_Silicon_Ingot2, Circuit_Silicon_Ingot3, Circuit_Silicon_Wafer, Circuit_Silicon_Wafer2, Circuit_Silicon_Wafer3, Circuit_Wafer_ILC, Circuit_Chip_ILC, Circuit_Wafer_Ram, Circuit_Chip_Ram, Circuit_Wafer_NAND, Circuit_Chip_NAND, Circuit_Wafer_NOR, Circuit_Chip_NOR, Circuit_Wafer_CPU, Circuit_Chip_CPU, Circuit_Wafer_SoC, Circuit_Chip_SoC, Circuit_Wafer_SoC2, Circuit_Chip_SoC2, Circuit_Wafer_PIC, Circuit_Chip_PIC, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d09f8b8b..64259ae2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -673,7 +673,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage and Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()})); GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataStick.get(1L, new Object[0])}); - ItemList.Circuit_Board_Basic.set(addItem(tLastID = 710, "Coated Circuit Board", "A basic Board", new Object[0])); ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1,new Object[0])); + ItemList.Circuit_Board_Basic.set(addItem(tLastID = 710, "Coated Circuit Board", "Wooden Board", new Object[0])); ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1,new Object[0])); ItemList.Circuit_Board_Advanced.set(addItem(tLastID = 711, "Epoxy Circuit Board", "An advanced Board", new Object[0])); ItemList.Circuit_Board_Epoxy.set(ItemList.Circuit_Board_Advanced.get(1,new Object[0])); ItemList.Circuit_Board_Elite.set(addItem(tLastID = 712, "Multilayer Fiberglass Circuit Board", "A elite Board", new Object[0])); ItemList.Circuit_Board_Multifiberglass.set(ItemList.Circuit_Board_Elite.get(1,new Object[0])); ItemList.Circuit_Parts_Crystal_Chip_Elite.set(addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits", new Object[0])); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index d48b7cdf..33882333 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -40,8 +40,6 @@ public class GT_MetaGenerated_Item_03 // ItemList.Circuit_Board_Fiberglass.set(addItem(tLastID = 4, "Fiberglass Circuit Board", "An advanced Board", o)); // ItemList.Circuit_Board_Multifiberglass.set(addItem(tLastID = 5, "Multilayer Fiberglass Circuit Board", "A elite Board", o)); ItemList.Circuit_Board_Wetware.set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); - ItemList.Circuit_Board_Phenolic_Good.set(addItem(tLastID = 7, "Good Phenolic Circuit Board", "A good Circuit Board", o)); - ItemList.Circuit_Board_Electronic.set(addItem(tLastID = 8, "Electronic Circuit Board", "A electronic Circuit Board", o)); /** @@ -172,6 +170,10 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Wetwaresupercomputer.set(addItem(tLastID = 94, "Wetware Supercomputer", "Super Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION})); ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "Infinite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION})); ItemList.Circuit_Ultimate.set(ItemList.Circuit_Crystalcomputer.get(1L, new Object[0])); + + ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Good.set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Electronic.set(addItem(tLastID = 102, "Electronic Circuit Board", "A electronic Circuit Board", o)); } public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index c0609777..63b4c504 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -30,7 +30,7 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi break; case "Basic": GT_ModHandler.removeRecipeByOutput(aStack); - GT_ModHandler.addCraftingRecipe(aStack, new Object[]{"RIR","VBV","CCC",'R',ItemList.Circuit_Parts_Resistor.get(1,new Object[0]),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', ItemList.Circuit_Parts_Vacuum_Tube.get(1,new Object[0]),'B',ItemList.Circuit_Board_Coated.get(1,new Object[0]),'I',ItemList.IC2_Item_Casing_Steel.get(1,new Object[0])}); + GT_ModHandler.addCraftingRecipe(aStack, new Object[]{"RIR","VBV","CCC",'R',ItemList.Circuit_Parts_Resistor.get(1,new Object[0]),'C',GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1),'V', ItemList.Circuit_Parts_Vacuum_Tube.get(1,new Object[0]),'B',ItemList.Circuit_Board_Coated_Basic.get(1,new Object[0]),'I',ItemList.IC2_Item_Casing_Steel.get(1,new Object[0])}); GT_ModHandler.addShapelessCraftingRecipe(GT_ModHandler.getIC2Item("electronicCircuit", 1L), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L, new Object[0])}); break; case "Advanced": diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 15cea226..20335cc1 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -471,9 +471,11 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addSlicerRecipe(ItemList.Food_Baked_Baguette.get(1L, new Object[0]), ItemList.Shape_Slicer_Flat.get(0L, new Object[0]), ItemList.Food_Sliced_Baguette.get(2L, new Object[0]), 128, 4); //TODO CHECK Circuit Recipes!!! Object[] o = new Object[0]; - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated.get(3, o), new Object[]{"RRR","PPP","WWW",'P',GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1),'R',ItemList.IC2_Resin.get(1, o), 'W', OrePrefixes.wireFine.get(Materials.Copper)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Phenolic.get(8, o), new Object[]{"PRP", "PPP", "PPP", 'P', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1), 'R', GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1)}); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 8), Materials.Glue.getFluid(288), ItemList.Circuit_Board_Phenolic.get(8, o), 320, 30); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated.get(3, o), new Object[]{"RRR","PPP","RRR",'P',GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1),'R',ItemList.IC2_Resin.get(1, o)}); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated_Basic.get(1, o), new Object[]{"FFF", "FCF", "FFF", 'C', ItemList.Circuit_Board_Coated.get(3, o), 'F', GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 1)}); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8), ItemList.Circuit_Integrated.getWithDamage(0L, 1L, o), Materials.Glue.getFluid(288), ItemList.Circuit_Board_Phenolic.get(8, o), 320, 30); + GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Phenolic.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4), new FluidStack(ItemList.sIron3Chloride, 100), null, ItemList.Circuit_Board_Phenolic_Good.get(1, o), 600, 30); + GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Phenolic_Electronic.get(1, o), new Object[]{"TDT", "RCR", "TDT", 'C', ItemList.Circuit_Board_Phenolic_Good.get(3, o), 'R', ItemList.Circuit_Parts_Resistor.get(1,o), 'D', ItemList.Circuit_Parts_Diode.get(1,o), 'T', ItemList.Circuit_Parts_Vacuum_Tube.get(1,o)}); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Epoxid, 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1), Materials.SulfuricAcid.getFluid(125), null, ItemList.Circuit_Board_Epoxy.get(1, o), 500, 10); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), Materials.Electrum.getMolten(16), null, ItemList.Circuit_Board_Fiberglass.get(16, o), null, 80, 480, 2600); GT_Values.RA.addChemicalRecipe(ItemList.Circuit_Board_Fiberglass.get(1, o), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 16), Materials.SulfuricAcid.getFluid(250), null, ItemList.Circuit_Board_Multifiberglass.get(1, o), 100, 480); @@ -555,10 +557,10 @@ public class GT_MachineRecipeLoader implements Runnable { int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; //TODO CHECK Circuit soldering //Integraded Circuits - GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_Resistor.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); - GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); - GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Basic.get(3,o),ItemList.Circuit_Parts_Resistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); - GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic.get(1,o),ItemList.Circuit_Basic.get(3,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Electronic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_Resistor.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Electronic.get(1,o),ItemList.Circuit_Chip_ILC.get(1,o),ItemList.Circuit_Parts_ResistorSMD.get(2,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Basic.get(1,o), 200, 8); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Electronic.get(1,o),ItemList.Circuit_Basic.get(3,o),ItemList.Circuit_Parts_Resistor.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); + GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Electronic.get(1,o),ItemList.Circuit_Basic.get(3,o),ItemList.Circuit_Parts_ResistorSMD.get(4,o),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 8)},tMat.getMolten(144L * tMultiplier / 2L), ItemList.Circuit_Integrated_Good.get(1,o), 400, 16); //Advanced circuit GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Integrated_Good.get(2,new Object[0]),ItemList.Circuit_Chip_ILC.get(3,new Object[0]),ItemList.Circuit_Chip_Ram.get(1,new Object[0]),ItemList.Circuit_Parts_Transistor.get(4,new Object[0]),GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 16)},tMat.getMolten(144L * tMultiplier / 2L), GT_ModHandler.getIC2Item("advancedCircuit", 1L), 800, 28); @@ -1107,7 +1109,7 @@ public class GT_MachineRecipeLoader implements Runnable { //GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectricalSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DarkSteel, 1L), GT_Values.NI, 4000, 120, 2000); //GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 3L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), Materials.Helium.getGas(1000), null, GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Osmiridium, 4L), null, 500, 1920, 2900); //GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmiridium, 1L), Materials.Argon.getGas(1000), null, GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahAlloy, 2L), null, 500, 30720, Materials.NaquadahAlloy.mBlastFurnaceTemp); - GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gallium, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Arsenic, 1L), null, null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.GalliumArsenide, 2L), null, 600, 120, Materials.GalliumArsenide.mBlastFurnaceTemp); + GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Arsenic, 1L), null, null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.GalliumArsenide, 2L), null, 600, 120, Materials.GalliumArsenide.mBlastFurnaceTemp); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png similarity index 76% rename from src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png rename to src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png index 504315351ea522f9d2865ed5c6455f34d30d8e3e..5930084b4c0a3a4f748660f75d1da9d94800f676 100644 GIT binary patch delta 615 zcmV-t0+{`c9GV)izY2c>MM*?KRCwC#SD}s+K@hF?9^b$vXHaO6SP~M>V(-EiAdm>e zDiRVbiqn80L6LyLaSDUM+y@Z&gEK6ms=9k-dpA3KlU+k6o9*7MOuedl^{NNU<TCE&NqhJIKq5*xojV0)kgft_K`Ot`N#ZEMaQz9~e z82~_$(#ClgK>nZ3DI+l*z~%EtgY&1W9~FRTgbd({-GzSD`a?#cYq$9RZDIx>{}4_@ z!U&rET`iTTU50;fPHG+wI0-#+0^JfIYOeUsE|>)Xvl9xz(CwDO1EK7%4?rGuOTZqx z0Ys)4`#xExcR>ixR&5x9m7TB?fZH!V4$f~DcS_V0P4NBL?!)T`o^}kCaBMeO2}xBV zf(B`g4ycr%a%Gk-K#7J@sdc|w+UVVO1`?{Kbwh2@Mh<^>&MjsE+8fc?$RCt`M(iVUB+(Ku1`?cQnGPV^35^7kX3dN*@~oN(ptfKE zvP&0a4XIy{Q=rtk3>*2w)!Y*>a-RH|3}AeR8_)A~iuv{Z>F7e@S-Q3oZo7)}%oJu4 zqOD&rTH>;{=l%dR`riVXtc3f1F~R?r(?bLJHvl+~NKKD-o~Zx;002ovPDHLkV1gl# BA_4#a delta 860 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 KMNUMnLSTXi6(9Ei diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png new file mode 100644 index 0000000000000000000000000000000000000000..34411f69867e2b7666d763f6a9adf8102ce33900 GIT binary patch literal 3153 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 literal 0 HcmV?d00001