From 1209f95bc278f81de4143a619696048c655313e8 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 16 May 2015 02:51:56 +0200 Subject: [PATCH] update 5.08.13 Turbine items and achievements --- main/java/gregtech/GT_Mod.java | 37 +- main/java/gregtech/api/enums/OrePrefixes.java | 1 + main/java/gregtech/api/enums/TextureSet.java | 2 +- main/java/gregtech/api/enums/Textures.java | 2 +- .../api/items/GT_MetaGenerated_Tool.java | 11 +- .../metatileentity/BaseMetaTileEntity.java | 8 +- .../GT_MetaTileEntity_MultiBlockBase.java | 12 +- .../java/gregtech/api/util/GT_ModHandler.java | 80 +++ main/java/gregtech/common/GT_Proxy.java | 11 +- .../common/GT_Worldgen_GT_Ore_Layer.java | 10 +- .../items/GT_MetaGenerated_Item_02.java | 2 +- .../items/GT_MetaGenerated_Tool_01.java | 15 + .../GT_MetaTileEntity_BronzeBlastFurnace.java | 4 +- .../GT_MetaTileEntity_QuantumChest.java | 5 +- .../common/tools/GT_Tool_Chainsaw_LV.java | 11 +- .../common/tools/GT_Tool_Drill_HV.java | 7 + .../common/tools/GT_Tool_Drill_LV.java | 1 + .../common/tools/GT_Tool_HardHammer.java | 10 +- .../common/tools/GT_Tool_JackHammer.java | 7 + .../common/tools/GT_Tool_Pickaxe.java | 1 + .../common/tools/GT_Tool_Turbine.java | 25 + .../common/tools/GT_Tool_Turbine_Huge.java | 7 + .../common/tools/GT_Tool_Turbine_Large.java | 7 + .../common/tools/GT_Tool_Turbine_Normal.java | 7 + .../common/tools/GT_Tool_Turbine_Small.java | 7 + .../common/tools/GT_Tool_UniversalSpade.java | 6 +- .../loaders/misc/GT_Achievements.java | 469 ++++++++++++++++++ .../oreprocessing/ProcessingPlate2.java | 10 +- .../ProcessingToolHeadHammer.java | 21 +- .../postload/GT_CraftingRecipeLoader.java | 88 +++- .../postload/GT_MachineRecipeLoader.java | 9 +- .../postload/GT_ScrapboxDropLoader.java | 8 +- .../preload/GT_Loader_MetaTileEntities.java | 4 +- .../resources/assets/gregtech/lang/en_US.lang | 361 ++++++++++++++ .../textures/items/gt.metaitem.02/Thumbs.db | Bin 117760 -> 118784 bytes .../textures/items/iconsets/TURBINE.png | Bin 0 -> 1227 bytes .../items/iconsets/TURBINE_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/iconsets/Thumbs.db | Bin 36352 -> 36864 bytes .../materialicons/DIAMOND/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../DIAMOND/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/DIAMOND/Thumbs.db | Bin 62464 -> 65536 bytes .../materialicons/DIAMOND/turbineBlade.png | Bin 0 -> 1238 bytes .../DIAMOND/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/DULL/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../DULL/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/DULL/turbineBlade.png | Bin 0 -> 1238 bytes .../DULL/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/EMERALD/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../EMERALD/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/EMERALD/turbineBlade.png | Bin 0 -> 1238 bytes .../EMERALD/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FIERY/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../FIERY/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FIERY/turbineBlade.png | Bin 0 -> 1238 bytes .../FIERY/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FINE/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../FINE/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/FINE/turbineBlade.png | Bin 0 -> 1238 bytes .../FINE/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FLINT/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../FLINT/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FLINT/turbineBlade.png | Bin 0 -> 1238 bytes .../FLINT/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FLUID/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../FLUID/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/FLUID/turbineBlade.png | Bin 0 -> 1238 bytes .../FLUID/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../GEM_HORIZONTAL/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../GEM_HORIZONTAL/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../GEM_HORIZONTAL/turbineBlade.png | Bin 0 -> 1238 bytes .../GEM_HORIZONTAL/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../GEM_VERTICAL/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../GEM_VERTICAL/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../GEM_VERTICAL/turbineBlade.png | Bin 0 -> 1238 bytes .../GEM_VERTICAL/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/GLASS/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../GLASS/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/GLASS/turbineBlade.png | Bin 0 -> 1238 bytes .../GLASS/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/LAPIS/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../LAPIS/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/LAPIS/turbineBlade.png | Bin 0 -> 1238 bytes .../LAPIS/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/LEAF/Thumbs.db | Bin 0 -> 65536 bytes .../items/materialicons/LEAF/turbineBlade.png | Bin 0 -> 1238 bytes .../LEAF/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/LIGNITE/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../LIGNITE/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/LIGNITE/turbineBlade.png | Bin 0 -> 1238 bytes .../LIGNITE/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/MAGNETIC/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../MAGNETIC/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/MAGNETIC/turbineBlade.png | Bin 0 -> 1238 bytes .../MAGNETIC/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/METALLIC/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../METALLIC/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/METALLIC/turbineBlade.png | Bin 0 -> 1238 bytes .../METALLIC/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../NETHERSTAR/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../NETHERSTAR/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NETHERSTAR/turbineBlade.png | Bin 0 -> 1238 bytes .../NETHERSTAR/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/NONE/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../NONE/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/NONE/turbineBlade.png | Bin 0 -> 1238 bytes .../NONE/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/OPAL/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../OPAL/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/OPAL/turbineBlade.png | Bin 0 -> 1238 bytes .../OPAL/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/PAPER/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../PAPER/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/PAPER/turbineBlade.png | Bin 0 -> 1238 bytes .../PAPER/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/POWDER/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../POWDER/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/POWDER/turbineBlade.png | Bin 0 -> 1238 bytes .../POWDER/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/QUARTZ/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../QUARTZ/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/QUARTZ/turbineBlade.png | Bin 0 -> 1238 bytes .../QUARTZ/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/ROUGH/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../ROUGH/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/ROUGH/turbineBlade.png | Bin 0 -> 1238 bytes .../ROUGH/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/RUBY/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../RUBY/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/RUBY/turbineBlade.png | Bin 0 -> 1238 bytes .../RUBY/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/SAND/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../SAND/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/SAND/Thumbs.db | Bin 0 -> 61440 bytes .../items/materialicons/SAND/turbineBlade.png | Bin 0 -> 1238 bytes .../SAND/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/SHARDS/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../SHARDS/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/SHARDS/turbineBlade.png | Bin 0 -> 1238 bytes .../SHARDS/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/SHINY/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../SHINY/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/SHINY/turbineBlade.png | Bin 0 -> 1238 bytes .../SHINY/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes .../materialicons/WOOD/TURBINE_BLADE.png | Bin 0 -> 1238 bytes .../WOOD/TURBINE_BLADE_OVERLAY.png | Bin 0 -> 143 bytes .../items/materialicons/WOOD/turbineBlade.png | Bin 0 -> 1238 bytes .../WOOD/turbineBlade_OVERLAY.png | Bin 0 -> 143 bytes 147 files changed, 1196 insertions(+), 70 deletions(-) create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java create mode 100644 main/java/gregtech/loaders/misc/GT_Achievements.java create mode 100644 main/resources/assets/gregtech/lang/en_US.lang create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png create mode 100644 main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade_OVERLAY.png diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index e0b255a5..3b79b8ad 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -53,6 +53,7 @@ import gregtech.api.enums.*; /* 59: */ import gregtech.loaders.load.GT_FuelLoader; /* 60: */ import gregtech.loaders.load.GT_ItemIterator; /* 61: */ import gregtech.loaders.load.GT_SonictronLoader; +import gregtech.loaders.misc.GT_Achievements; /* 62: */ import gregtech.loaders.misc.GT_CoverLoader; /* 63: */ import gregtech.loaders.postload.GT_BlockResistanceLoader; /* 64: */ import gregtech.loaders.postload.GT_BookAndLootLoader; @@ -101,6 +102,7 @@ import gregtech.api.enums.*; /* 106: */ import net.minecraft.item.crafting.CraftingManager; /* 107: */ import net.minecraft.item.crafting.FurnaceRecipes; /* 108: */ import net.minecraft.item.crafting.IRecipe; +import net.minecraft.stats.Achievement; /* 109: */ import net.minecraft.util.WeightedRandomChestContent; /* 110: */ import net.minecraft.world.World; /* 111: */ import net.minecraft.world.biome.BiomeGenBase; @@ -125,6 +127,7 @@ import net.minecraftforge.common.ForgeVersion; /* 129: */ public static final int VERSION = 508; /* 130: */ public static final int REQUIRED_IC2 = 624; /* 131: 72 */ public static int MAX_IC2 = 2147483647; + public static GT_Achievements achievements; /* 132: */ /* 133: */ static /* 134: */ { @@ -303,6 +306,9 @@ import net.minecraftforge.common.ForgeVersion; /* 307:207 */ gregtechproxy.mNerfedWoodPlank = tMainConfig.get("general", "WoodNeedsSawForCrafting", true).getBoolean(true); /* 308:208 */ gregtechproxy.mNerfedVanillaTools = tMainConfig.get("general", "smallerVanillaToolDurability", true).getBoolean(true); /* 309:209 */ gregtechproxy.mSortToTheEnd = tMainConfig.get("general", "EnsureToBeLoadedLast", true).getBoolean(true); + gregtechproxy.mDisableIC2Cables = tMainConfig.get("general", "DisableIC2Cables", false).getBoolean(false); + gregtechproxy.mAchievements = tMainConfig.get("general", "EnableAchievements", true).getBoolean(true); + /* 310:211 */ if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) { /* 311:211 */ Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F); /* 312: */ } @@ -320,7 +326,7 @@ import net.minecraftforge.common.ForgeVersion; /* 324:225 */ tPrefix.mDefaultStackSize = ((byte)Math.min(64, Math.max(16, tMainConfig.get("features", "MaxOtherBlockStackSize", 64).getInt()))); /* 325: */ } /* 326: */ } -/* 327:229 */ GT_Config.troll = (Calendar.getInstance().get(2) + 1 == 4) && (Calendar.getInstance().get(5) >= 1) && (Calendar.getInstance().get(5) <= 2); +/* 327:229 */ //GT_Config.troll = (Calendar.getInstance().get(2) + 1 == 4) && (Calendar.getInstance().get(5) >= 1) && (Calendar.getInstance().get(5) <= 2); /* 328: */ /* 329:231 */ Materials.init(GregTech_API.sMaterialProperties); /* 330: */ @@ -753,6 +759,8 @@ import net.minecraftforge.common.ForgeVersion; /* 757: */ } /* 758: */ } /* 759: */ } + if(gregtechproxy.mAchievements){ + achievements = new GT_Achievements();} /* 760: */ Map.Entry tRecipe; /* 761:540 */ GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables."); /* 762:541 */ GregTech_API.sBeforeGTPreload = null; @@ -777,33 +785,6 @@ import net.minecraftforge.common.ForgeVersion; /* 781: */ } /* 782: */ } /* 783:565 */ gregtechproxy.onServerStarting(); -/* 784: */ -/* 785: */ -/* 786: */ -/* 787: */ -/* 788: */ -/* 789: */ -/* 790: */ -/* 791: */ -/* 792: */ -/* 793: */ -/* 794: */ -/* 795: */ -/* 796: */ -/* 797: */ -/* 798: */ -/* 799: */ -/* 800: */ -/* 801: */ -/* 802: */ -/* 803: */ -/* 804: */ -/* 805: */ -/* 806: */ -/* 807: */ -/* 808: */ -/* 809: */ -/* 810: */ /* 811:593 */ GT_Log.out.println("GT_Mod: Unificating outputs of all known Recipe Types."); /* 812:594 */ ArrayList tStacks = new ArrayList(10000); /* 813:595 */ GT_Log.out.println("GT_Mod: IC2 Machines"); diff --git a/main/java/gregtech/api/enums/OrePrefixes.java b/main/java/gregtech/api/enums/OrePrefixes.java index ad2231a6..06e1ae97 100644 --- a/main/java/gregtech/api/enums/OrePrefixes.java +++ b/main/java/gregtech/api/enums/OrePrefixes.java @@ -121,6 +121,7 @@ public enum OrePrefixes { toolHeadDrill ("Drill Tips" , "" , " Drill Tip" ,T,T,F,F,F,F,T,T,F,F, B[6] , M * 4 , 16, 40), // consisting out of 4 Ingots. toolHeadChainsaw ("Chainsaw Tips" , "" , " Chainsaw Tip" ,T,T,F,F,F,F,T,T,F,F, B[6] , M * 2 , 16, 41), // consisting out of 2 Ingots. toolHeadWrench ("Wrench Tips" , "" , " Wrench Tip" ,T,T,F,F,F,F,T,T,F,F, B[6] , M * 4 , 16, 42), // consisting out of 4 Ingots. + turbineBlade ("Turbine Blades" , "" , " Turbine Blade" ,T,T,F,F,F,F,T,T,F,F, B[6] , M * 6 , 64, 100), // consisting out of 6 Ingots. toolSword ("Swords" , "" , "" ,F,T,F,F,F,F,T,F,T,F, B[6] , M * 2 , 1, -1), // vanilly Sword toolPickaxe ("Pickaxes" , "" , "" ,F,T,F,F,F,F,T,F,T,F, B[6] , M * 3 , 1, -1), // vanilly Pickaxe toolShovel ("Shovels" , "" , "" ,F,T,F,F,F,F,T,F,T,F, B[6] , M * 1 , 1, -1), // vanilly Shovel diff --git a/main/java/gregtech/api/enums/TextureSet.java b/main/java/gregtech/api/enums/TextureSet.java index bae20e91..4a4bf616 100644 --- a/main/java/gregtech/api/enums/TextureSet.java +++ b/main/java/gregtech/api/enums/TextureSet.java @@ -152,7 +152,7 @@ public class TextureSet { mTextures[ 97] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/crateGtIngot"); mTextures[ 98] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/crateGtGem"); mTextures[ 99] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/crateGtPlate"); - mTextures[100] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); + mTextures[100] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/turbineBlade"); mTextures[101] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); mTextures[102] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); mTextures[103] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void"); diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index f7278f0d..f749a2d2 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -323,7 +323,7 @@ public class Textures { , HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING , POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV , DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8 - , ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8 + , ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, TURBINE ; public static final IIconContainer[] diff --git a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 4942ff2a..d4e13ad2 100644 --- a/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -13,6 +13,7 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gregtech.common.tools.GT_Tool_Turbine; import java.util.*; import java.util.Map.Entry; @@ -238,11 +239,19 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements IToolStats tStats = getToolStats(aStack); int tOffset = getElectricStats(aStack) != null ? 2 : 1; if (tStats != null) { + String name = aStack.getUnlocalizedName(); + if(name.equals("gt.metatool.01.170")||name.equals("gt.metatool.01.172")||name.equals("gt.metatool.01.174")||name.equals("gt.metatool.01.176")){ + aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Turbine Efficency: " + EnumChatFormatting.BLUE + (50.0F+(10.0F*getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY); + aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed*20) + EnumChatFormatting.GRAY+ "L/sec"); + + }else{ aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Attack Damage: " + EnumChatFormatting.BLUE + getToolCombatDamage(aStack) + EnumChatFormatting.GRAY); aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Mining Speed: " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) + EnumChatFormatting.GRAY); - } + }} } public static final Materials getPrimaryMaterial(ItemStack aStack) { diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index a7d92915..5a3dfd4e 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -2,6 +2,7 @@ package gregtech.api.metatileentity; import static gregtech.api.enums.GT_Values.NW; import static gregtech.api.enums.GT_Values.V; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; @@ -387,7 +388,9 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE || (getCoverIDAtSide((byte)4) == 0 && worldObj.getPrecipitationHeight(xCoord-1, zCoord ) - 1 < yCoord) || (getCoverIDAtSide((byte)5) == 0 && worldObj.getPrecipitationHeight(xCoord+1, zCoord ) - 1 < yCoord)) { if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) { - if (getRandomNumber(10)==0) doEnergyExplosion(); else setOnFire(); + if (getRandomNumber(10)==0) {doEnergyExplosion(); + GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); + }else setOnFire(); } if (!hasValidMetaTileEntity()) { mRunningThroughTick = false; @@ -395,6 +398,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE } if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) { doEnergyExplosion(); + GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); } } } @@ -683,7 +687,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) {if (!canAccessData()) return false; if (aCheckPrecicely || privateAccess() || mOwnerName.equals("")) if (mOwnerName.equals("")&&isServerSide()) setOwnerName(aPlayer.getDisplayName()); else if (privateAccess() && !aPlayer.getDisplayName().equals("Player") && !mOwnerName.equals("Player") && !mOwnerName.equals(aPlayer.getDisplayName())) return false; return true;} public boolean privateAccess() {if (!canAccessData()) return mLockUpgrade; return mLockUpgrade || mMetaTileEntity.ownerControl();} - public void doEnergyExplosion() {if (getUniversalEnergyCapacity() > 0 && getUniversalEnergyStored() >= getUniversalEnergyCapacity()/5) doExplosion(oOutput*(getUniversalEnergyStored() >= getUniversalEnergyCapacity()?4:getUniversalEnergyStored() >= getUniversalEnergyCapacity()/2?2:1));} + public void doEnergyExplosion() {if (getUniversalEnergyCapacity() > 0 && getUniversalEnergyStored() >= getUniversalEnergyCapacity()/5) {doExplosion(oOutput*(getUniversalEnergyStored() >= getUniversalEnergyCapacity()?4:getUniversalEnergyStored() >= getUniversalEnergyCapacity()/2?2:1)); GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "electricproblems");}} @Override public void doExplosion(long aAmount) { diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 4411c528..b93e4671 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -1,6 +1,7 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.V; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.gui.GT_Container_MultiMachine; @@ -179,10 +180,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (!polluteEnvironment(getPollutionPerTick(mInventory[1]))) { stopMachine(); } - if (mMaxProgresstime > 0 && ++mProgresstime>=mMaxProgresstime) { - if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); - if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);} + if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) {GT_Mod.instance.achievements.issueAchivementHatch(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack);addOutput(tStack);} + if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) {addOutput(tStack);}} else if(mOutputFluids!=null&&mOutputFluids.length>1){ addFluidOutputs(mOutputFluids);} mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); @@ -191,6 +191,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { mMaxProgresstime = 0; mEfficiencyIncrease = 0; if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); + if(mOutputFluids!=null&&mOutputFluids.length>0){ + System.out.println("fluids"+mOutputFluids.length); + GT_Mod.instance.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]); + if(mOutputFluids.length>1){GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "oilplant");} + mOutputFluids = null; + } } } } else { diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java index 6f44731c..91addfbd 100644 --- a/main/java/gregtech/api/util/GT_ModHandler.java +++ b/main/java/gregtech/api/util/GT_ModHandler.java @@ -16,6 +16,7 @@ import ic2.api.reactor.IReactorComponent; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.RecipeOutput; +import ic2.core.AdvRecipe; import java.util.*; import java.util.Map.Entry; @@ -1010,6 +1011,85 @@ public class GT_ModHandler { return rReturn; } +// public static int replaceRecipe(ItemStack aOldItem, ItemStack aNewItem){ +// int replaced =0; +// ArrayList tList = (ArrayList)CraftingManager.getInstance().getRecipeList(); +// System.out.println("tList.size "+tList.size()); +// for (int i = 0; i < tList.size(); i++){ +// System.out.println(tList.get(i).getClass()); +// if(tList.get(i) instanceof ShapedRecipes){ +// ShapedRecipes tRecipe = (ShapedRecipes)tList.get(i); +// System.out.println("found recipe!"); +// for( int g =0 ; g < tRecipe.recipeItems.length;g++){ +// if(GT_Utility.areStacksEqual(aOldItem, tRecipe.recipeItems[g], true)){ +// ItemStack[] tItems = tRecipe.recipeItems; +// for(int f = 0; f < tItems.length;f++){ +// if(GT_Utility.areStacksEqual(aOldItem, tItems[f], true)){ +// tItems[f]=aNewItem; +// } +// } +// ShapedRecipes nRecipe = new ShapedRecipes(tRecipe.recipeWidth,tRecipe.recipeHeight,tItems,tRecipe.getRecipeOutput()); +// tList.set(i, nRecipe); +// replaced++; +// } +// } +// } +// +// if(tList.get(i) instanceof AdvRecipe){ +// AdvRecipe tRecipe = (AdvRecipe)tList.get(i); +// System.out.println("found recipe!"); +// for( int g =0 ; g < tRecipe.input.length;g++){ +// if(GT_Utility.areStacksEqual(aOldItem, (ItemStack) tRecipe.input[g], true)){ +// ItemStack[] tItems = (ItemStack[]) tRecipe.input; +// for(int f = 0; f < tItems.length;f++){ +// if(GT_Utility.areStacksEqual(aOldItem, tItems[f], true)){ +// tItems[f]=aNewItem; +// } +// } +// System.out.println("converted Recipe"); +// AdvRecipe nRecipe = new AdvRecipe(tRecipe.getRecipeOutput(),tItems); +// tList.set(i, nRecipe); +// replaced++; +// } +// } +// } +//// if(tList.get(i) instanceof GT_Shaped_Recipe){ +//// GT_Shaped_Recipe tRecipe = (GT_Shaped_Recipe)tList.get(i); +//// System.out.println("found recipe!"); +//// for( int g =0 ; g < tRecipe.getInput().length;g++){ +//// if(GT_Utility.areStacksEqual(aOldItem, (ItemStack)tRecipe.getInput()[g], true)){ +//// ItemStack[] tItems = (ItemStack[]) tRecipe.getInput(); +//// for(int f = 0; f < tItems.length;f++){ +//// if(GT_Utility.areStacksEqual(aOldItem, tItems[f], true)){ +//// tItems[f]=aNewItem; +//// } +//// } +//// GT_Shaped_Recipe nRecipe = new GT_Shaped_Recipe(tItems,tRecipe.getRecipeOutput()); +//// tList.set(i, nRecipe); +//// replaced++; +//// } +//// } +//// } +// if(tList.get(i) instanceof ShapelessRecipes){ +// ShapelessRecipes tRecipe = (ShapelessRecipes)tList.get(i); +// System.out.println("found recipe!"); +// for( int g =0 ; g < tRecipe.recipeItems.size();g++){ +// if(GT_Utility.areStacksEqual(aOldItem, (ItemStack) tRecipe.recipeItems.get(g), true)){ +// List tItems = tRecipe.recipeItems; +// for(int f = 0; f < tItems.size();f++){ +// if(GT_Utility.areStacksEqual(aOldItem, (ItemStack) tItems.get(f), true)){ +// tItems.set(f,aNewItem); +// } +// } +// ShapelessRecipes nRecipe = new ShapelessRecipes(tRecipe.getRecipeOutput(),tItems); +// tList.set(i, nRecipe); +// replaced++; +// } +// } +// } +// }return replaced; +// } + public static boolean removeRecipeByOutput(ItemStack aOutput) { return removeRecipeByOutput(aOutput, T, F, F); } diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java index 6b9cbf96..e6dce1cd 100644 --- a/main/java/gregtech/common/GT_Proxy.java +++ b/main/java/gregtech/common/GT_Proxy.java @@ -149,6 +149,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean mHungerEffect = true; public boolean mOnline = true; public boolean mIgnoreTcon = true; + public boolean mDisableIC2Cables = false; + public boolean mAchievements = true; public int mSkeletonsShootGTArrows = 16; public int mMaxEqualEntitiesAtOneSpot = 3; public int mFlintChance = 30; @@ -610,6 +612,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 1L), tBits, new Object[] { "Xx", Character.valueOf('X'), OrePrefixes.foil.get(aMaterial) }); + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), tBits, new Object[] { "fPd", "SPS", " P ", + Character.valueOf('P'), aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plateDouble.get(aMaterial), + Character.valueOf('R'), OrePrefixes.ring.get(aMaterial), Character.valueOf('S'), OrePrefixes.screw.get(aMaterial) }); + + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), tBits, new Object[] { " A", " S ", "F ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), OreDictNames.craftingFeather, Character.valueOf('A'), OrePrefixes.toolHeadArrow.get(aMaterial) }); @@ -1310,11 +1317,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.RedAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 0)); GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.BlueAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 1)); GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Brass, new ItemStack(aEvent.Ore.getItem(), 1, 2)); - + if(!mDisableIC2Cables){ GT_Values.RA.addWiremillRecipe(GT_ModHandler.getIC2Item("copperCableItem", 3L), new ItemStack(aEvent.Ore.getItem(), 1, 8), 400, 1); GT_Values.RA.addWiremillRecipe(GT_ModHandler.getIC2Item("ironCableItem", 6L), - new ItemStack(aEvent.Ore.getItem(), 1, 9), 400, 2); + new ItemStack(aEvent.Ore.getItem(), 1, 9), 400, 2);} GT_Values.RA.addCutterRecipe(new ItemStack(aEvent.Ore.getItem(), 1, 3), new ItemStack(aEvent.Ore.getItem(), 16, 4), null, 400, 8); } diff --git a/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index 745575a0..44d8b330 100644 --- a/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -1,12 +1,16 @@ /* 1: */ package gregtech.common; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.util.GT_Config; /* 6: */ import gregtech.api.world.GT_Worldgen; /* 7: */ import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.loaders.misc.GT_Achievements; + /* 8: */ import java.util.ArrayList; /* 9: */ import java.util.Random; + /* 10: */ import net.minecraft.world.World; /* 11: */ import net.minecraft.world.chunk.IChunkProvider; /* 12: */ @@ -44,6 +48,10 @@ /* 44:32 */ this.mBetweenMeta = ((short)GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); /* 45:33 */ this.mSporadicMeta = ((short)GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); /* 46:34 */ if (this.mEnabled) { + GT_Achievements.registerOre(aPrimary,aMinY,aMaxY,aWeight,aOverworld,aNether,aEnd); +/* 46:34 */ GT_Achievements.registerOre(aSecondary,aMinY,aMaxY,aWeight,aOverworld,aNether,aEnd); +/* 46:34 */ GT_Achievements.registerOre(aBetween,aMinY,aMaxY,aWeight,aOverworld,aNether,aEnd); +/* 46:34 */ GT_Achievements.registerOre(aSporadic,aMinY,aMaxY,aWeight,aOverworld,aNether,aEnd); /* 47:34 */ sWeight += this.mWeight; /* 48: */ } /* 49: */ } diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 137ed5d0..3900fa02 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -44,7 +44,7 @@ /* 44: */ /* 45: */ public GT_MetaGenerated_Item_02() /* 46: */ { -/* 47: 36 */ super("metaitem.02", new OrePrefixes[] { OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, null, null, null, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt }); +/* 47: 36 */ super("metaitem.02", new OrePrefixes[] { OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade , null, null, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt}); /* 48: 37 */ INSTANCE = this; /* 49: */ /* 50: 39 */ int tLastID = 0; diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index 155625dd..f6ed7f41 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -43,6 +43,11 @@ import gregtech.api.enums.ConfigCategories; /* 42: */ import gregtech.common.tools.GT_Tool_SoftHammer; import gregtech.common.tools.GT_Tool_Soldering_Iron; /* 43: */ import gregtech.common.tools.GT_Tool_Sword; +import gregtech.common.tools.GT_Tool_Turbine; +import gregtech.common.tools.GT_Tool_Turbine_Huge; +import gregtech.common.tools.GT_Tool_Turbine_Large; +import gregtech.common.tools.GT_Tool_Turbine_Normal; +import gregtech.common.tools.GT_Tool_Turbine_Small; /* 44: */ import gregtech.common.tools.GT_Tool_UniversalSpade; /* 45: */ import gregtech.common.tools.GT_Tool_WireCutter; /* 46: */ import gregtech.common.tools.GT_Tool_Wrench; @@ -94,6 +99,11 @@ import gregtech.common.tools.GT_Tool_Soldering_Iron; /* 92: */ public static final short BUZZSAW = 140; /* 93: */ public static final short SCREWDRIVER_LV = 150; public static final short SOLDERING_IRON_LV = 160; + public static final short TURBINE_SMALL = 170; + public static final short TURBINE = 172; + public static final short TURBINE_LARGE = 174; + public static final short TURBINE_HUGE = 176; + public static final short TURBINE_BLADE = 178; /* 94: */ /* 95: */ public GT_MetaGenerated_Tool_01() /* 96: */ { @@ -137,6 +147,11 @@ import gregtech.common.tools.GT_Tool_Soldering_Iron; /* =4:57 */ addTool(140, "Buzzsaw (LV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), new Object[] { ToolDictNames.craftingToolSaw, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L) }); /* =5:58 */ GregTech_API.registerTool(addTool(150, "Screwdriver (LV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), new Object[] { ToolDictNames.craftingToolScrewdriver, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sScrewdriverList); /* =6: */ GregTech_API.registerTool(addTool(SOLDERING_IRON_LV, "Soldering Iron (LV)", "Fixes burned out Circuits. Needs soldering materials in inventory", new GT_Tool_Soldering_Iron(), new Object[] { ToolDictNames.craftingToolSolderingIron, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sSolderingToolList); + + addTool(TURBINE_SMALL, "Small Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Small(), new Object[] {}); + addTool(TURBINE, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal(), new Object[] {}); + addTool(TURBINE_LARGE, "Large Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Large(), new Object[] {}); + addTool(TURBINE_HUGE, "Huge Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Huge(), new Object[] {}); /* =7:60 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Flint, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), new ItemStack(Items.flint, 1), Character.valueOf('S'), OrePrefixes.stone }); /* =8:61 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Bronze, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Bronze), Character.valueOf('S'), OrePrefixes.stone }); diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index 5f66a7c5..b1391612 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tileentities.machines.multi; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; @@ -225,6 +226,7 @@ import gregtech.api.enums.Textures; /* 224: */ { /* 225:151 */ if (++this.mProgresstime >= this.mMaxProgresstime) /* 226: */ { + GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel"); /* 227:152 */ addOutputProducts(); /* 228:153 */ this.mOutputItem1 = null; /* 229:154 */ this.mOutputItem2 = null; diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index 3249ea45..9b0b1683 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -132,7 +132,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach this.mInventory[0] = null; } } - if (this.mInventory[1] == null) + if (this.mInventory[1] == null&&mItemStack!=null) { this.mInventory[1] = mItemStack.copy(); this.mInventory[1].stackSize = Math.min(mItemStack.getMaxStackSize(), this.mItemCount); @@ -188,12 +188,15 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mItemCount", this.mItemCount); + if(this.mItemStack!=null) aNBT.setTag("mItemStack", this.mItemStack.writeToNBT(new NBTTagCompound())); } @Override public void loadNBTData(NBTTagCompound aNBT) { + if(aNBT.hasKey("mItemCount")) this.mItemCount = aNBT.getInteger("mItemCount"); + if(aNBT.hasKey("mItemStack")) this.mItemStack = ItemStack.loadItemStackFromNBT((NBTTagCompound) aNBT.getTag("mItemStack")); } diff --git a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index 391177bd..66bed7d5 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; /* 5: */ import gregtech.api.enums.Textures.ItemIcons; @@ -10,6 +11,7 @@ import gregtech.api.enums.Textures; /* 8: */ import java.util.Map; /* 9: */ import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; /* 10: */ import net.minecraft.item.ItemStack; /* 11: */ import net.minecraft.util.ChatComponentText; /* 12: */ import net.minecraft.util.EnumChatFormatting; @@ -87,6 +89,13 @@ import gregtech.api.enums.Textures; /* 84: */ { /* 85:82 */ return true; /* 86: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "brrrr"); +/* 121: */ } + /* 87: */ /* 88: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 89: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index a71722a1..bdf696c0 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -5,6 +5,7 @@ import gregtech.api.enums.Textures; /* 4: */ import gregtech.api.enums.Textures.ItemIcons; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.common.GT_Proxy; +import net.minecraft.entity.player.EntityPlayer; /* 7: */ import net.minecraft.item.ItemStack; /* 8: */ /* 9: */ public class GT_Tool_Drill_HV @@ -49,6 +50,12 @@ import gregtech.api.enums.Textures; /* 48: */ { /* 49:48 */ return 4.0F; /* 50: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill"); +/* 121: */ } /* 51: */ /* 52: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 53: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 941b3c03..625f2059 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -122,6 +122,7 @@ import gregtech.api.enums.Textures; /* 119:118 */ super.onToolCrafted(aStack, aPlayer); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 121:120 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + GT_Mod.achievements.issueAchievement(aPlayer, "driltime"); /* 122: */ } /* 123: */ /* 124: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index 67cb45ff..eeb323f8 100644 --- a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.api.items.GT_MetaGenerated_Tool; @@ -20,6 +21,7 @@ /* 18: */ import net.minecraft.entity.monster.EntityIronGolem; /* 19: */ import net.minecraft.entity.player.EntityPlayer; /* 20: */ import net.minecraft.item.ItemStack; +import net.minecraft.stats.AchievementList; /* 21: */ import net.minecraft.util.ChatComponentText; /* 22: */ import net.minecraft.util.EnumChatFormatting; /* 23: */ import net.minecraft.util.IChatComponent; @@ -179,6 +181,12 @@ import net.minecraftforge.event.world.BlockEvent; /* 176: */ { /* 177:173 */ return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was squashed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); /* 178: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "tools"); +/* 121: */ } /* 179: */ } diff --git a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index 17f8c6be..cb50cfbd 100644 --- a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -101,6 +101,13 @@ import net.minecraftforge.event.world.BlockEvent; /* 97: */ } /* 98: 91 */ return rConversions; /* 99: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "hammertime"); +/* 121: */ } + /* 100: */ /* 101: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 102: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index e4bca9b7..d535fd4a 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -118,6 +118,7 @@ /* 118:117 */ super.onToolCrafted(aStack, aPlayer); /* 119:118 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + GT_Mod.achievements.issueAchievement(aPlayer, "flintpick"); /* 121: */ } /* 122: */ /* 123: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java new file mode 100644 index 00000000..bf790126 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java @@ -0,0 +1,25 @@ +package gregtech.common.tools; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.items.GT_MetaGenerated_Tool; +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; + +public abstract class GT_Tool_Turbine extends GT_Tool{ + public abstract float getBaseDamage(); + @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) {return false;} + @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? Textures.ItemIcons.TURBINE : null;} + @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;} + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) + { + return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + + aEntity.getCommandSenderName()+"s" + EnumChatFormatting.WHITE + " head into a turbine"); + } + public abstract float getSpeedMultiplier(); + public abstract float getMaxDurabilityMultiplier(); +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java new file mode 100644 index 00000000..0bf3b783 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 4.0F;} + @Override public float getMaxDurabilityMultiplier() {return 4.0F;} + @Override public float getBaseDamage() {return 3.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java new file mode 100644 index 00000000..57947aea --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Large extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 3.0F;} + @Override public float getMaxDurabilityMultiplier() {return 3.0F;} + @Override public float getBaseDamage() {return 5.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java new file mode 100644 index 00000000..8327a743 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 2.0F;} + @Override public float getMaxDurabilityMultiplier() {return 2.0F;} + @Override public float getBaseDamage() {return 2.5F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java new file mode 100644 index 00000000..fb93a2b2 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Small extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 1.0F;} + @Override public float getMaxDurabilityMultiplier() {return 1.0F;} + @Override public float getBaseDamage() {return 0.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java index 78c4fecb..43165412 100644 --- a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java +++ b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java @@ -1,11 +1,14 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.api.items.GT_MetaGenerated_Tool; /* 7: */ import gregtech.common.items.behaviors.Behaviour_Crowbar; + /* 8: */ import java.util.Map; + /* 9: */ import net.minecraft.block.Block; /* 10: */ import net.minecraft.block.material.Material; /* 11: */ import net.minecraft.entity.EntityLivingBase; @@ -124,6 +127,7 @@ /* 124: */ { /* 125:122 */ super.onToolCrafted(aStack, aPlayer); /* 126:123 */ aPlayer.triggerAchievement(AchievementList.buildSword); + GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); /* 127: */ } /* 128: */ /* 129: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java new file mode 100644 index 00000000..bdc340b2 --- /dev/null +++ b/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -0,0 +1,469 @@ +package gregtech.loaders.misc; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; +import gregtech.GT_Mod; +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gregtech.common.blocks.GT_Block_Casings1; +import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.items.GT_MetaGenerated_Item_01; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; +import net.minecraft.stats.StatBase; +import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fluids.FluidStack; + +public class GT_Achievements { + + public HashMap achievementList; +public int adjX = 5; +public int adjY = 9; + + public GT_Achievements() { + this.achievementList = new HashMap(); + for (int i = 0; i < oreList.size(); i++) { + if (GT_Values.D1 && this.achievementList.get(oreList.get(i).name()) == null) { + GT_Log.out.println("achievement." + oreList.get(i).name() + "=Find " + oreList.get(i).name() + " Ore"); + GT_Log.out.println("achievement." + oreList.get(i).name() + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: "+ (oreStats.get(i)[2]) + ", " + (oreStats.get(i)[3] == 1 ? "Overworld" : "") + "/" + (oreStats.get(i)[4] == 1 ? "Nether" : "") + "/"+ (oreStats.get(i)[5] == 1 ? "End" : "")); + } + registerOreAchievement(oreList.get(i)); + } + registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); + registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); + registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1, new Object[] {}), "crops", false); + registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1, new Object[] {}), "crops", false); + registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1, new Object[] {}), "crops", false); + registerAchievement("havestoil", -4, -4, ItemList.Crop_Drop_OilBerry.get(1, new Object[] {}), "crops", false); + registerAchievement("havestiron", -2, -3, ItemList.Crop_Drop_Ferru.get(1, new Object[] {}), "crops", false); + registerAchievement("havestgold", -2, -6, ItemList.Crop_Drop_Aurelia.get(1, new Object[] {}), "havestiron", false); + registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1, new Object[] {}), "havestiron", false); + registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[] {}), "havestgold", false); + + registerAchievement("tools", 0, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(12, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); + registerAchievement("driltime", 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(100, 1, Materials.BlueSteel, Materials.StainlessSteel, null),"tools", false); + registerAchievement("brrrr", 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(110, 1, Materials.BlueSteel, Materials.StainlessSteel, null),"driltime", false); + registerAchievement("highpowerdrill", 3, 5,GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(104, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "driltime", false); + registerAchievement("hammertime", 3, 7,GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(130, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "highpowerdrill", false); + registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1, new Object[] {}), "highpowerdrill", false); + + registerAchievement("unitool", -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(32, 1, Materials.Steel, Materials.Iron, null), "tools", false); + registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1, new Object[] {}), "unitool", false); + + registerAchievement("crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); + registerAchievement("cleandust", 0, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), "crushed", false); + registerAchievement("washing", -2, 6, GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), "crushed", false); + registerAchievement("spinit", -4, 6, GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), "crushed", false); + registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1, new Object[] {}), "spinit", false); + registerAchievement("newmetal", -4, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), "newfuel", false); + registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1, new Object[] {}), "newfuel", false); + + registerAchievement("bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false); + registerAchievement("simplyeco", 2, 2, ItemList.Machine_Bronze_Boiler_Solar.get(1, new Object[] {}), "bronze", false); + registerAchievement("firststeam", 2, -2, ItemList.Machine_Bronze_Boiler.get(1, new Object[] {}), "bronze", false); + registerAchievement("alloysmelter", 2, -4, ItemList.Machine_Bronze_AlloySmelter.get(1, new Object[] {}), "firststeam", false); + registerAchievement("macerator", 0, -2, ItemList.Machine_Bronze_Macerator.get(1, new Object[] {}), "firststeam", false); + registerAchievement("extract", 0, -4, ItemList.Machine_Bronze_Extractor.get(1, new Object[] {}), "alloysmelter", false); + + registerAchievement("smallparts", 0, -8, ItemList.Circuit_Primitive.get(1, new Object[] {}), "extract", false); + registerAchievement("bettercircuits", 0, -10, ItemList.Circuit_Good.get(1, new Object[] {}), "smallparts", false); + registerAchievement("stepforward", -2, -10, ItemList.Circuit_Advanced.get(1, new Object[] {}), "bettercircuits", false); + registerAchievement("energyflow", -4, -10, ItemList.Circuit_Master.get(1, new Object[] {}), "stepforward", false); + registerAchievement("orbs", -6, -10, ItemList.Energy_LapotronicOrb.get(1, new Object[] {}), "energyflow", false); + registerAchievement("thatspower", -8, -10, ItemList.Energy_LapotronicOrb2.get(1, new Object[] {}), "orbs", false); + registerAchievement("datasaving", -2, -12, ItemList.Tool_DataOrb.get(1, new Object[] {}), "stepforward", false); + registerAchievement("superbuffer", 0, -12, ItemList.Automation_SuperBuffer_LV.get(1, new Object[] {}), "datasaving", false); + registerAchievement("newstorage", -2, -14, ItemList.Quantum_Chest_HV.get(1, new Object[] {}), "superbuffer", false); + registerAchievement("whereistheocean", 2, -14, ItemList.Quantum_Tank_IV.get(1, new Object[] {}), "superbuffer", false); + registerAchievement("luck", 2, -6, ItemList.ZPM.get(1, new Object[] {}), "", false); + + registerAchievement("steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false); + registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1, new Object[] {}), "steel", false); + registerAchievement("extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1, new Object[] {}), "highpressure", false); + registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1, new Object[] {}), "steel", false); + registerAchievement("complexalloys", 6, 3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L), "cheapermac", false); + + registerAchievement("magneticiron", 4, -2, GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), "steel", false); + registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1, new Object[] {}), "magneticiron", false); + registerAchievement("pump", 2, -8, ItemList.Electric_Pump_LV.get(1, new Object[] {}), "lvmotor", false); + registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1, new Object[] {}), "pump", false); + registerAchievement("slurp", 2, -12, ItemList.Pump_HV.get(1, new Object[] {}), "closeit", false); + registerAchievement("transport", 4, -10, ItemList.Conveyor_Module_LV.get(1, new Object[] {}), "lvmotor", false); + registerAchievement("manipulation", 4, -12, ItemList.Cover_Controller.get(1, new Object[] {}), "transport", false); + registerAchievement("buffer", 4, -14, ItemList.Automation_ChestBuffer_LV.get(1, new Object[] {}), "manipulation", false); + registerAchievement("complexmachines", 6, -9, ItemList.Robot_Arm_LV.get(1, new Object[] {}), "lvmotor", false); + registerAchievement("avengers", 8, -11, ItemList.Machine_LV_Assembler.get(1, new Object[] {}), "complexmachines", false); + registerAchievement("filterregulate", 10, -11, ItemList.Component_Filter.get(1, new Object[] {}), "avengers", false); + + registerAchievement("steampower", 6, -6, ItemList.Generator_Steam_Turbine_LV.get(1, new Object[] {}), "lvmotor", false); + registerAchievement("batterys", 6, -4, ItemList.Battery_Buffer_2by2_MV.get(1, new Object[] {}), "steampower", false); + registerAchievement("badweather", 6, -8, ItemList.Casing_FireHazard.get(1, new Object[] {}), "steampower", false); + registerAchievement("electricproblems", 7, -7, ItemList.Casing_ExplosionHazard.get(1, new Object[] {}), "steampower", false); + registerAchievement("ebf", 8, -6, ItemList.Machine_Multi_BlastFurnace.get(1, new Object[] {}), "steampower", false); + registerAchievement("energyhatch", 12, -6, ItemList.Hatch_Energy_LV.get(1, new Object[] {}), "ebf", false); + + registerAchievement("aluminium", 8, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L), "steel", false); + registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1, new Object[] {}), "aluminium", false); + registerAchievement("oilplant", 8, 4, ItemList.Distillation_Tower.get(1, new Object[] {}), "highpowersmelt", false); + registerAchievement("factory", 8, 6, ItemList.Processing_Array.get(1, new Object[] {}), "oilplant", false); + registerAchievement("upgradeebf", 8, -2, ItemList.Hatch_Energy_MV.get(1, new Object[] {}), "aluminium", false); + registerAchievement("maintainance", 10, -2, ItemList.Hatch_Maintenance.get(1, new Object[] {}), "upgradeebf", false); + + registerAchievement("titan", 10, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "aluminium", false); + registerAchievement("magic", 10, 4, ItemList.MagicEnergyConverter_LV.get(1, new Object[] {}), "titan", false); + registerAchievement("highmage", 10, 6, ItemList.MagicEnergyAbsorber_HV.get(1, new Object[] {}), "magic", false); + registerAchievement("artificaldia", 11, 2, ItemList.IC2_Industrial_Diamond.get(1, new Object[] {}), "titan", false); + registerAchievement("muchsteam", 12, 1, ItemList.LargeTurbine.get(1, new Object[] {}), "titan", false); + registerAchievement("efficientsteam", 12, 3, ItemList.LargeTurbine.get(1, new Object[] {}), "muchsteam", false); + + registerAchievement("upgrade", 14, 0, ItemList.Casing_Coil_Kanthal.get(1, new Object[] {}), "titan", false); + registerAchievement("tungsten", 16, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L), "upgrade", false); + registerAchievement("hightech", 15, -1, ItemList.Field_Generator_LV.get(1, new Object[] {}), "tungsten", false); + registerAchievement("amplifier", 17, -3, ItemList.Machine_LV_Amplifab.get(1, new Object[] {}), "hightech", false); + registerAchievement("scanning", 13, -2, ItemList.Machine_HV_Scanner.get(1, new Object[] {}), "hightech", false); + registerAchievement("alienpower", 14, -4, ItemList.Generator_Naquadah_Mark_I.get(1, new Object[] {}), "hightech", false); + registerAchievement("universal", 15, -6, ItemList.Machine_LV_Massfab.get(1, new Object[] {}), "hightech", false); + registerAchievement("replication", 17, -6, ItemList.Machine_LV_Replicator.get(1, new Object[] {}), "universal", false); + + registerAchievement("upgrade2", 16, 6, ItemList.Casing_Coil_Nichrome.get(1, new Object[] {}), "tungsten", false); + registerAchievement("tungstensteel", 14, 6, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), "upgrade2", false); + registerAchievement("conducting", 12, 6, ItemList.Casing_Coil_Superconductor.get(1, new Object[] {}), "tungstensteel", false); + registerAchievement("fusion", 14, 8, ItemList.FusionComputer_LuV.get(1, new Object[] {}), "tungstensteel", false); + registerAchievement("higherefficency", 14, 10, ItemList.Generator_Plasma_IV.get(1, new Object[] {}), "fusion", false); + registerAchievement("advancing", 12, 8, ItemList.FusionComputer_ZPMV.get(1, new Object[] {}), "fusion", false); + registerAchievement("tothelimit", 12, 10, ItemList.Generator_Plasma_LuV.get(1, new Object[] {}), "advancing", false); + registerAchievement("denseaspossible", 10, 10, ItemList.FusionComputer_UV.get(1, new Object[] {}), "tothelimit", false); + registerAchievement("fullefficiency", 10, 12, ItemList.Generator_Plasma_ZPMV.get(1, new Object[] {}), "denseaspossible", false); + registerAchievement("whatnow", 8, 10, GT_OreDictUnificator.get(OrePrefixes.battery, Materials.Ultimate, 1L), "denseaspossible", false); + + AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray( + new Achievement[this.achievementList.size()]))); + MinecraftForge.EVENT_BUS.register(this); + FMLCommonHandler.instance().bus().register(this); + } + + public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { + Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY+y, icon, requirement); + if (special) { + achievement.setSpecial(); + } + achievement.registerStat(); + if (GT_Values.D2) { + GT_Log.out.println("achievement." + textId + "="); + GT_Log.out.println("achievement." + textId + ".desc="); + } + this.achievementList.put(textId, achievement); + return achievement; + } + + public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement, boolean special) { + Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY+y, icon, getAchievement(requirement)); + if (special) { + achievement.setSpecial(); + } + achievement.registerStat(); + if (GT_Values.D2) { + GT_Log.out.println("achievement." + textId + "="); + GT_Log.out.println("achievement." + textId + ".desc="); + } + this.achievementList.put(textId, achievement); + return achievement; + } + + public static List oreList = new ArrayList(); + public static List oreStats = new ArrayList(); + + public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { + if (aMaterial != Materials._NULL) { + oreList.add(aMaterial); + } + oreStats.add(new Integer[] { min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0 }); + } + + public static int oreReg = -1; + + public Achievement registerOreAchievement(Materials aMaterial) { + if (this.achievementList.get(aMaterial.name()) == null) { + oreReg++; + return registerAchievement(aMaterial.name(), -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, + aMaterial.mMetaItemSubID), AchievementList.openInventory, false); + } + return null; + } + + public void issueAchievement(EntityPlayer entityplayer, String textId) { + if(entityplayer==null){ + return; + } + if (this.achievementList.containsKey(textId)) { + entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId)); + } + } + + public Achievement getAchievement(String textId) { + if (this.achievementList.containsKey(textId)) { + return (Achievement) this.achievementList.get(textId); + } + return null; + } + + public void issueAchivementHatch(EntityPlayer player, ItemStack stack){ + if (player == null||stack==null) { + return; + } + ItemData data = GT_OreDictUnificator.getItemData(stack); + + if (data != null) { + if (data.mPrefix == OrePrefixes.ingot) { + if(data.mMaterial.mMaterial==Materials.Aluminium){ + issueAchievement(player, "aluminium"); + }else if(data.mMaterial.mMaterial==Materials.Titanium){ + issueAchievement(player, "titan"); + }else if(data.mMaterial.mMaterial==Materials.BlueSteel){ + issueAchievement(player, "complexalloys"); + }else if(data.mMaterial.mMaterial==Materials.Tungsten){ + issueAchievement(player, "tungsten"); + }else if(data.mMaterial.mMaterial==Materials.TungstenSteel){ + issueAchievement(player, "tungstensteel"); + } + + + }} + if(stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")){ + issueAchievement(player, "artificaldia"); + } + } + + public void issueAchivementHatchFluid(EntityPlayer player, FluidStack fluid){ + System.out.println("fluid!"); + if (player == null||fluid==null) { + return; + } + if(fluid.getFluid().getUnlocalizedName().equals("plasma.helium")){ + issueAchievement(player, "fusion"); + }else if(fluid.getFluid().getUnlocalizedName().equals("molten.europium")){ + issueAchievement(player, "advancing"); + }else if(fluid.getFluid().getUnlocalizedName().equals("molten.americum")){ + issueAchievement(player, "tothelimit"); + }else if(fluid.getFluid().getUnlocalizedName().equals("molten.neutronium")){ + issueAchievement(player, "denseaspossible"); + }else if(fluid.getFluid().getUnlocalizedName().equals("plasma.nitrogen")){ + issueAchievement(player, "higherefficency"); + } + } + + @SubscribeEvent + public void onCrafting(ItemCraftedEvent event) { + System.out.println("crafting"); + EntityPlayer player = event.player; + ItemStack stack = event.crafting; + if (player == null||stack==null) { + return; + } + System.out.println(stack.getUnlocalizedName()); + if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ + if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ + issueAchievement(player, "bronze"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ + issueAchievement(player, "bronze"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32700")){ + issueAchievement(player, "smallparts"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.23354")){ + issueAchievement(player, "magneticiron"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32600")){ + issueAchievement(player, "lvmotor"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32610")){ + issueAchievement(player, "pump"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32630")){ + issueAchievement(player, "transport"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32650")){ + issueAchievement(player, "complexmachines"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32670")){ + issueAchievement(player, "hightech"); + } + }else if(stack.getUnlocalizedName().equals("ic2.blockCrop")){ + issueAchievement(player, "crops"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.")){ + if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")){ + issueAchievement(player, "recycling"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ + issueAchievement(player, "repair"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.solar")){ + issueAchievement(player, "simplyeco"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.bronze")){ + issueAchievement(player, "firststeam"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.steel")){ + issueAchievement(player, "highpressure"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.macerator")){ + issueAchievement(player, "macerator"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter")){ + issueAchievement(player, "alloysmelter"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.extractor")){ + issueAchievement(player, "extract"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ + issueAchievement(player, "repair"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.superbuffer.tier.")){ + issueAchievement(player, "superbuffer"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.tank.tier.")){ + issueAchievement(player, "whereistheocean"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ + issueAchievement(player, "repair"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.chest.tier.")){ + issueAchievement(player, "newstorage"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.hammer.tier.")){ + issueAchievement(player, "cheapermac"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.")){ + issueAchievement(player, "buffer"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")){ + issueAchievement(player, "steampower"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.pump.tier.")){ + issueAchievement(player, "slurp"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.assembler.tier.")){ + issueAchievement(player, "avengers"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.blastfurnace")){ + issueAchievement(player, "ebf"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.batterybuffer.")){ + issueAchievement(player, "batterys"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.02")){ + issueAchievement(player, "upgradeebf"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.multifurnace")){ + issueAchievement(player, "highpowersmelt"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.01")){ + issueAchievement(player, "energyhatch"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")){ + issueAchievement(player, "factory"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")){ + issueAchievement(player, "magic"); + }else if(stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")){ + issueAchievement(player, "highmage"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")){ + issueAchievement(player, "amplifier"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")){ + issueAchievement(player, "universal"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")){ + issueAchievement(player, "alienpower"); + }else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.replicator.tier.")){ + issueAchievement(player, "replication"); + } + }else if(stack.getUnlocalizedName().equals("gt.Thoriumcell")){ + issueAchievement(player, "newfuel"); + }else if(stack.getUnlocalizedName().equals("gt.neutronreflector")){ + issueAchievement(player, "reflect"); + }else if(stack.getUnlocalizedName().equals("gt.blockcasings.13")){ + issueAchievement(player, "upgrade"); + }else if(stack.getUnlocalizedName().equals("gt.blockcasings.14")){ + issueAchievement(player, "upgrade2"); + }else if(stack.getUnlocalizedName().equals("gt.blockcasings.15")){ + issueAchievement(player, "conducting"); + } + + } + + @SubscribeEvent + public void onSmelting(ItemSmeltedEvent event) { + EntityPlayer player = event.player; + ItemStack stack = event.smelting; + if (player == null||stack==null) { + return; + } + if (stack.getItem() == Items.bread) { + event.player.triggerAchievement(AchievementList.makeBread); + } + } + + @SubscribeEvent + public void onItemPickup(EntityItemPickupEvent event) { + EntityPlayer player = event.entityPlayer; + ItemStack stack = event.item.getEntityItem(); + if (player == null||stack==null) { + return; + } + ItemData data = GT_OreDictUnificator.getItemData(stack); + if (data != null) { + if (data.mPrefix == OrePrefixes.dust) { + if(data.mMaterial.mMaterial == Materials.Lutetium){ + issueAchievement(player, "newmetal"); + } + issueAchievement(player, "cleandust"); + } else if (data.mPrefix == OrePrefixes.ore || data.mPrefix == OrePrefixes.oreBlackgranite || data.mPrefix == OrePrefixes.oreEndstone + || data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) { + for (int i = 0; i < data.getAllMaterialStacks().size(); i++) { + issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name()); + + }return; + }else if(data.mPrefix == OrePrefixes.crushed){ + issueAchievement(player, "crushed"); + }else if(data.mPrefix == OrePrefixes.crushedPurified){ + issueAchievement(player, "washing"); + }else if(data.mPrefix == OrePrefixes.crushedCentrifuged){ + issueAchievement(player, "spinit"); + } + } + System.out.println(stack.getUnlocalizedName()); + if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ + if(stack.getUnlocalizedName().equals("gt.metaitem.02.32500")){ + issueAchievement(player, "havestlead"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32501")){ + issueAchievement(player, "havestsilver"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32503")){ + issueAchievement(player, "havestiron"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32504")){ + issueAchievement(player, "havestgold"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32530")){ + issueAchievement(player, "havestcopper"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32540")){ + issueAchievement(player, "havesttin"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32510")){ + issueAchievement(player, "havestoil"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32511")){ + issueAchievement(player, "havestemeralds"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32706")){ + issueAchievement(player, "energyflow"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32702")){ + issueAchievement(player, "bettercircuits"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32707")){ + issueAchievement(player, "datasaving"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32597")){ + issueAchievement(player, "orbs"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32599")){ + issueAchievement(player, "thatspower"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32598")){ + issueAchievement(player, "luck"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32749")){ + issueAchievement(player, "closeit"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32730")){ + issueAchievement(player, "manipulation"); + }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32729")){ + issueAchievement(player, "filterregulate"); + } + }else if(stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")){ + issueAchievement(player, "stepforward"); + } + } +} diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java index 53c944d2..88f121b5 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java @@ -4,6 +4,7 @@ /* */ import gregtech.api.enums.GT_Values; /* */ import gregtech.api.enums.Materials; /* */ import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag; /* */ import gregtech.api.interfaces.internal.IGT_RecipeAdder; /* */ import gregtech.api.util.GT_ModHandler; /* */ import gregtech.api.util.GT_OreDictUnificator; @@ -22,7 +23,6 @@ /* 22 */ GT_ModHandler.removeRecipeByOutput(aStack); /* */ /* 24 */ GregTech_API.registerCover(aStack, new gregtech.api.objects.GT_RenderedTexture(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); -/* */ /* 26 */ if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { /* 27 */ GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(2L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int)Math.max(aMaterial.getMass() * 2L, 1L), 96); /* */ } @@ -33,10 +33,4 @@ /* 33 */ GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), gregtech.api.enums.ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), Materials.Glue.getFluid(10L), GT_Utility.copyAmount(1L, new Object[] { aStack }), 64, 8); /* */ } /* */ } -/* */ } - - -/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingPlate2.class - * Java compiler version: 6 (50.0) - * JD-Core Version: 0.7.1-SNAPSHOT-20140817 - */ \ No newline at end of file +/* */ } \ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java index 6a101dd0..5a89aed1 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java @@ -1,12 +1,15 @@ /* */ package gregtech.loaders.oreprocessing; /* */ /* */ import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; /* */ import gregtech.api.enums.Materials; /* */ import gregtech.api.enums.OrePrefixes; /* */ import gregtech.api.enums.SubTag; /* */ import gregtech.api.interfaces.IOreRecipeRegistrator; /* */ import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; /* */ import gregtech.api.util.GT_ModHandler.RecipeBits; /* */ import gregtech.common.items.GT_MetaGenerated_Tool_01; /* */ import net.minecraft.init.Blocks; @@ -36,13 +39,15 @@ import gregtech.api.enums.ItemList; /* 35 */ GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(34, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) }); /* 36 */ GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(36, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) }); /* */ GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(160, 1, aMaterial, Materials.Rubber, new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.Rubber),'S',OrePrefixes.stick.get(Materials.Iron),'L',ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]) }); -/* */ } +/* */ +// GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L,OrePrefixes.turbineBlade.get(aMaterial)), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "B", "B", "B", 'S', OrePrefixes.screw.get(aMaterial), 'B', OrePrefixes.plate.get(aMaterial) }); + + + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null), 160, 100); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null), 320, 400); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null), 640, 1600); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), 1280, 6400); +} /* */ } /* */ } -/* */ } - - -/* Location: F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingToolHeadHammer.class - * Java compiler version: 6 (50.0) - * JD-Core Version: 0.7.1-SNAPSHOT-20140817 - */ \ No newline at end of file +/* */ } \ No newline at end of file diff --git a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index a619e9c1..9b6e2091 100644 --- a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -20,8 +20,10 @@ import gregtech.common.GT_Proxy; import java.io.PrintStream; +import cpw.mods.fml.common.Loader; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class GT_CraftingRecipeLoader @@ -492,8 +494,90 @@ public class GT_CraftingRecipeLoader GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { OrePrefixes.dust.get(Materials.Potassium), OrePrefixes.cell.get(Materials.Nitrogen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen) }); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("carbonFiber", 1L)); - - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "EDE", "GGG", Character.valueOf('G'), new ItemStack(Blocks.glass, 1, 32767), Character.valueOf('D'), OrePrefixes.dust.get(Materials.Silver), Character.valueOf('E'), ItemList.IC2_Energium_Dust.get(1L, new Object[0]) }); + if(GT_Mod.gregtechproxy.mDisableIC2Cables){ + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("copperCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("goldCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("tinCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ironCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("detectorCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("splitterCableItem", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("electrolyzer", 1L)); + + if(Loader.isModLoaded("NotEnoughItems")){ + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("copperCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("goldCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("tinCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("ironCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("detectorCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("splitterCableItem", 1L)); + codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("electrolyzer", 1L)); + } + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("batBox", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("batBox", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "PCP","BBB","PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("mfeUnit", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("mfeUnit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CEC","EME","CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', OrePrefixes.battery.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("machine", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("lvTransformer", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("lvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "PCP","POP","PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin),'O', GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("mvTransformer", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("mvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper),'M', GT_ModHandler.getIC2Item("machine", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("hvTransformer", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("hvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","IMB"," C ",'C', OrePrefixes.cableGt01.get(Materials.Gold),'M', GT_ModHandler.getIC2Item("mvTransformer", 1L),'I', OrePrefixes.circuit.get(Materials.Basic),'B', OrePrefixes.battery.get(Materials.Advanced)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("evTransformer", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("evTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","IMB"," C ",'C', OrePrefixes.cableGt01.get(Materials.Aluminium),'M', GT_ModHandler.getIC2Item("hvTransformer", 1L),'I', OrePrefixes.circuit.get(Materials.Advanced),'B', OrePrefixes.battery.get(Materials.Master)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("cesuUnit", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("cesuUnit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PCP","BBB","PPP",'C', OrePrefixes.cableGt01.get(Materials.Copper),'P', OrePrefixes.plate.get(Materials.Bronze),'B', OrePrefixes.battery.get(Materials.Advanced)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("luminator", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("teleporter", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("teleporter", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"GFG","CMC","GDG",'C', OrePrefixes.cableGt01.get(Materials.Platinum),'G', OrePrefixes.circuit.get(Materials.Advanced),'D', OrePrefixes.gem.get(Materials.Diamond), 'M', GT_ModHandler.getIC2Item("machine", 1L), 'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("energyOMat", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("energyOMat", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"RBR","CMC",'C', OrePrefixes.cableGt01.get(Materials.Copper),'R', OrePrefixes.dust.get(Materials.Redstone),'B', OrePrefixes.battery.get(Materials.Basic), 'M', GT_ModHandler.getIC2Item("machine", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("advBattery", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("advBattery", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CTC","TST","TLT",'C', OrePrefixes.cableGt01.get(Materials.Copper),'S', OrePrefixes.dust.get(Materials.Sulfur),'L', OrePrefixes.dust.get(Materials.Lead), 'T', GT_ModHandler.getIC2Item("casingbronze", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("boatElectric", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("boatElectric", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","XWX","XXX",'C', OrePrefixes.cableGt01.get(Materials.Copper),'X', OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("cropnalyzer", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("cropnalyzer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CC ","RGR","RIR",'C', OrePrefixes.cableGt01.get(Materials.Copper),'R', OrePrefixes.dust.get(Materials.Redstone),'G', OrePrefixes.block.get(Materials.Glass), 'I', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("coil", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("coil", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","CXC","CCC",'C', OrePrefixes.wireGt01.get(Materials.Copper),'X', OrePrefixes.ingot.get(Materials.AnyIron)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("powerunit", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("powerunit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"BCA","BIM","BCA",'C', OrePrefixes.cableGt01.get(Materials.Copper),'B', OrePrefixes.battery.get(Materials.Basic),'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', OrePrefixes.circuit.get(Materials.Basic),'M', GT_ModHandler.getIC2Item("elemotor", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("powerunitsmall", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("powerunitsmall", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" CA","BIM"," CA",'C', OrePrefixes.cableGt01.get(Materials.Copper),'B', OrePrefixes.battery.get(Materials.Basic),'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', OrePrefixes.circuit.get(Materials.Basic),'M', GT_ModHandler.getIC2Item("elemotor", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("remote", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("remote", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","TLT"," F ",'C', OrePrefixes.cableGt01.get(Materials.Copper),'L', OrePrefixes.dust.get(Materials.Lapis),'T', GT_ModHandler.getIC2Item("casingtin", 1L),'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("odScanner", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("odScanner", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PGP","CBC","WWW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'G', OrePrefixes.dust.get(Materials.Glowstone),'B', OrePrefixes.battery.get(Materials.Advanced),'C', OrePrefixes.circuit.get(Materials.Advanced),'P', GT_ModHandler.getIC2Item("casinggold", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ovScanner", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ovScanner", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PDP","GCG","WSW",'W', OrePrefixes.cableGt01.get(Materials.Gold),'G', OrePrefixes.dust.get(Materials.Glowstone),'D', OrePrefixes.battery.get(Materials.Elite),'C', OrePrefixes.circuit.get(Materials.Advanced),'P', GT_ModHandler.getIC2Item("casinggold", 1L),'S', GT_ModHandler.getIC2Item("odScanner", 1L)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("solarHelmet", 1L)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("staticBoots", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("staticBoots", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"I I","IWI","CCC",'C', OrePrefixes.cableGt01.get(Materials.Copper),'I', OrePrefixes.ingot.get(Materials.Iron),'W', new ItemStack(Blocks.wool)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ecMeter", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ecMeter", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" G ","CIC","C C",'C', OrePrefixes.cableGt01.get(Materials.Copper),'G', OrePrefixes.dust.get(Materials.Glowstone),'I', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("obscurator", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("obscurator", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"RER","CAC","RRR",'C', OrePrefixes.cableGt01.get(Materials.Gold),'R', OrePrefixes.dust.get(Materials.Redstone),'E', OrePrefixes.battery.get(Materials.Advanced), 'A', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","WEW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'C', GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L), 'E', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("transformerUpgrade", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("transformerUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"GGG","WTW","GEG",'W', OrePrefixes.cableGt01.get(Materials.Gold),'T', GT_ModHandler.getIC2Item("mvTransformer", 1L),'E', OrePrefixes.circuit.get(Materials.Basic),'G', OrePrefixes.block.get(Materials.Glass)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PPP","WBW","PEP",'W', OrePrefixes.cableGt01.get(Materials.Copper),'E', OrePrefixes.circuit.get(Materials.Basic),'P', OrePrefixes.plank.get(Materials.Wood),'B', OrePrefixes.battery.get(Materials.Basic)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ejectorUpgrade", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PHP","WEW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'E', OrePrefixes.circuit.get(Materials.Basic),'P', new ItemStack(Blocks.piston),'H', new ItemStack(Blocks.hopper)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("suBattery", 1L)); + GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("suBattery", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"W","C","R",'W', OrePrefixes.cableGt01.get(Materials.Copper),'C', OrePrefixes.dust.get(Materials.HydratedCoal),'R', OrePrefixes.dust.get(Materials.Redstone)}); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)); + }else{GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "EDE", "GGG", Character.valueOf('G'), new ItemStack(Blocks.glass, 1, 32767), Character.valueOf('D'), OrePrefixes.dust.get(Materials.Silver), Character.valueOf('E'), ItemList.IC2_Energium_Dust.get(1L, new Object[0]) });} GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Energium_Dust.get(1L, new Object[0])); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.gregtechrecipes, "energycrystalruby", true)) { diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index e1a21303..d7241b92 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,5 +1,6 @@ package gregtech.loaders.postload; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.ConfigCategories.Recipes; @@ -46,7 +47,7 @@ public class GT_MachineRecipeLoader GT_Utility.removeSimpleIC2MachineRecipe(GT_Values.NI, ic2.api.recipe.Recipes.metalformerExtruding.getRecipes(), ItemList.Cell_Empty.get(3L, new Object[0])); GT_Utility.removeSimpleIC2MachineRecipe(ItemList.IC2_Energium_Dust.get(1L, new Object[0]), ic2.api.recipe.Recipes.compressor.getRecipes(), GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Items.gunpowder), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); - GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); + GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); } catch (Throwable e) {} GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(5L), 10000, 32, 2); @@ -838,12 +839,13 @@ public class GT_MachineRecipeLoader GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), ItemList.Shape_Mold_Credit.get(0L, new Object[0]), ItemList.Credit_Iron.get(4L, new Object[0]), 100, 16); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), ItemList.Shape_Mold_Credit.get(0L, new Object[0]), ItemList.Credit_Iron.get(4L, new Object[0]), 100, 16); + if(!GT_Mod.gregtechproxy.mDisableIC2Cables){ GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1L), GT_ModHandler.getIC2Item("copperCableItem", 3L), 100, 2); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L), GT_ModHandler.getIC2Item("copperCableItem", 3L), 100, 2); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L), GT_ModHandler.getIC2Item("tinCableItem", 4L), 150, 1); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_ModHandler.getIC2Item("ironCableItem", 6L), 200, 2); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_ModHandler.getIC2Item("ironCableItem", 6L), 200, 2); - GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getIC2Item("goldCableItem", 6L), 200, 1); + GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getIC2Item("goldCableItem", 6L), 200, 1);} GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 8L), GT_ModHandler.getIC2Item("carbonFiber", 1L), 400, 2); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Graphene, 1L), 400, 2); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { @@ -957,11 +959,12 @@ public class GT_MachineRecipeLoader GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new ItemStack(Blocks.torch, 6), 400, 1); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), ItemList.IC2_Resin.get(1L, new Object[0]), new ItemStack(Blocks.torch, 6), 400, 1); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8L), new ItemStack(Items.flint, 1), ItemList.IC2_Compressed_Coal_Ball.get(1L, new Object[0]), 400, 4); + if(!GT_Mod.gregtechproxy.mDisableIC2Cables){ GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("tinCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L), 100, 2); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("copperCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L), 100, 2); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("goldCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L), 200, 2); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("ironCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 3L), GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L), 300, 2); - + } GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.wooden_sword, 1), 100, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.stone_sword, 1), 100, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.iron_sword, 1), 100, 16); diff --git a/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java b/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java index 4d32ce30..b916886a 100644 --- a/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java +++ b/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java @@ -1,12 +1,15 @@ /* 1: */ package gregtech.loaders.postload; /* 2: */ -/* 3: */ import gregtech.api.enums.ItemList; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.enums.ItemList; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.enums.OrePrefixes; /* 6: */ import gregtech.api.util.GT_Log; /* 7: */ import gregtech.api.util.GT_ModHandler; /* 8: */ import gregtech.api.util.GT_OreDictUnificator; + /* 9: */ import java.io.PrintStream; + /* 10: */ import net.minecraft.init.Blocks; /* 11: */ import net.minecraft.init.Items; /* 12: */ import net.minecraft.item.ItemStack; @@ -57,8 +60,9 @@ /* 57:54 */ GT_ModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L, new Object[0])); /* 58:55 */ GT_ModHandler.addScrapboxDrop(0.4F, ItemList.Circuit_Board_Advanced.get(1L, new Object[0])); /* 59:56 */ GT_ModHandler.addScrapboxDrop(0.2F, ItemList.Circuit_Board_Elite.get(1L, new Object[0])); + if(!GT_Mod.gregtechproxy.mDisableIC2Cables){ /* 60:57 */ GT_ModHandler.addScrapboxDrop(2.0F, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); -/* 61:58 */ GT_ModHandler.addScrapboxDrop(0.4F, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); +/* 61:58 */ GT_ModHandler.addScrapboxDrop(0.4F, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L));} /* 62:59 */ GT_ModHandler.addScrapboxDrop(0.9F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)); /* 63:60 */ GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)); /* 64:61 */ GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index af525f8c..78264f62 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1046,12 +1046,12 @@ import net.minecraftforge.oredict.OreDictionary; /* 1024: 962 */ makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, gregtech.api.enums.GT_Values.V[0], true, false); /* 1025: */ /* 1026: 964 */ makeWires(Materials.Superconductor, 2020, 1L, 1L, 4L, gregtech.api.enums.GT_Values.V[9], false, true); -/* 1027: */ +/* 1027: */ if(!GT_Mod.gregtechproxy.mDisableIC2Cables){ /* 1028: 966 */ GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("copperCableItem", 2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.AnyCopper) }); /* 1029: 967 */ GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("goldCableItem", 4L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Gold) }); /* 1030: 968 */ GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ironCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.AnyIron) }); /* 1031: 969 */ GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("tinCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Tin) }); -/* 1032: */ +/* 1032: */ } /* 1033: */ /* 1034: */ /* 1035: 973 */ GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(Materials.Wood), new GT_MetaPipeEntity_Fluid(5101, "GT_Pipe_Wood_Small", "Small Wooden Fluid Pipe", 0.375F, Materials.Wood, 10, 350, false).getStackForm(1L)); diff --git a/main/resources/assets/gregtech/lang/en_US.lang b/main/resources/assets/gregtech/lang/en_US.lang new file mode 100644 index 00000000..2a9610b3 --- /dev/null +++ b/main/resources/assets/gregtech/lang/en_US.lang @@ -0,0 +1,361 @@ +achievement.Naquadah=Find Naquadah Ore +achievement.Naquadah.desc=Height: 10-60, Chance: 10, //End +achievement.NaquadahEnriched=Find NaquadahEnriched Ore +achievement.NaquadahEnriched.desc=Height: 10-60, Chance: 10, //End +achievement.Lignite=Find Lignite Ore +achievement.Lignite.desc=Height: 50-130, Chance: 160, Overworld// +achievement.Coal=Find Coal Ore +achievement.Coal.desc=Height: 50-130, Chance: 160, Overworld// +achievement.Magnetite=Find Magnetite Ore +achievement.Magnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.Iron=Find Iron Ore +achievement.Iron.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore +achievement.VanadiumMagnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.Gold=Find Gold Ore +achievement.Gold.desc=Height: 60-80, Chance: 160, Overworld// +achievement.BrownLimonite=Find BrownLimonite Ore +achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.YellowLimonite=Find YellowLimonite Ore +achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.BandedIron=Find BandedIron Ore +achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.Malachite=Find Malachite Ore +achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.Tin=Find Tin Ore +achievement.Tin.desc=Height: 40-120, Chance: 50, Overworld//End +achievement.Cassiterite=Find Cassiterite Ore +achievement.Cassiterite.desc=Height: 40-120, Chance: 50, Overworld//End +achievement.Tetrahedrite=Find Tetrahedrite Ore +achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.Copper=Find Copper Ore +achievement.Copper.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.Stibnite=Find Stibnite Ore +achievement.Stibnite.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.NetherQuartz=Find NetherQuartz Ore +achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether/ +achievement.Sulfur=Find Sulfur Ore +achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Pyrite=Find Pyrite Ore +achievement.Pyrite.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Sphalerite=Find Sphalerite Ore +achievement.Sphalerite.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Chalcopyrite=Find Chalcopyrite Ore +achievement.Chalcopyrite.desc=Height: 10-30, Chance: 80, Overworld/Nether/ +achievement.Bauxite=Find Bauxite Ore +achievement.Bauxite.desc=Height: 50-90, Chance: 80, Overworld// +achievement.Aluminium=Find Aluminium Ore +achievement.Aluminium.desc=Height: 50-90, Chance: 80, Overworld// +achievement.Ilmenite=Find Ilmenite Ore +achievement.Ilmenite.desc=Height: 50-90, Chance: 80, Overworld// +achievement.RockSalt=Find RockSalt Ore +achievement.RockSalt.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Salt=Find Salt Ore +achievement.Salt.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Lepidolite=Find Lepidolite Ore +achievement.Lepidolite.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Spodumene=Find Spodumene Ore +achievement.Spodumene.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Redstone=Find Redstone Ore +achievement.Redstone.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Ruby=Find Ruby Ore +achievement.Ruby.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Cinnabar=Find Cinnabar Ore +achievement.Cinnabar.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Soapstone=Find Soapstone Ore +achievement.Soapstone.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Talc=Find Talc Ore +achievement.Talc.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Glauconite=Find Glauconite Ore +achievement.Glauconite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Pentlandite=Find Pentlandite Ore +achievement.Pentlandite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Garnierite=Find Garnierite Ore +achievement.Garnierite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Nickel=Find Nickel Ore +achievement.Nickel.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Cobaltite=Find Cobaltite Ore +achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Cooperite=Find Cooperite Ore +achievement.Cooperite.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Palladium=Find Palladium Ore +achievement.Palladium.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Platinum=Find Platinum Ore +achievement.Platinum.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Iridium=Find Iridium Ore +achievement.Iridium.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Pitchblende=Find Pitchblende Ore +achievement.Pitchblende.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Uranium=Find Uranium Ore +achievement.Uranium.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Uraninite=Find Uraninite Ore +achievement.Uraninite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Plutonium=Find Plutonium Ore +achievement.Plutonium.desc=Height: 20-30, Chance: 10, Overworld// +achievement.Bastnasite=Find Bastnasite Ore +achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Monazite=Find Monazite Ore +achievement.Monazite.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Neodymium=Find Neodymium Ore +achievement.Neodymium.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Wulfenite=Find Wulfenite Ore +achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Molybdenite=Find Molybdenite Ore +achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Molybdenum=Find Molybdenum Ore +achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Powellite=Find Powellite Ore +achievement.Powellite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Scheelite=Find Scheelite Ore +achievement.Scheelite.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Tungstate=Find Tungstate Ore +achievement.Tungstate.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Lithium=Find Lithium Ore +achievement.Lithium.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Almandine=Find Almandine Ore +achievement.Almandine.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Pyrope=Find Pyrope Ore +achievement.Pyrope.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Sapphire=Find Sapphire Ore +achievement.Sapphire.desc=Height: 10-40, Chance: 60, Overworld// +achievement.GreenSapphire=Find GreenSapphire Ore +achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Grossular=Find Grossular Ore +achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Spessartine=Find Spessartine Ore +achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Pyrolusite=Find Pyrolusite Ore +achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Tantalite=Find Tantalite Ore +achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Quartzite=Find Quartzite Ore +achievement.Quartzite.desc=Height: 40-80, Chance: 60, Overworld// +achievement.Barite=Find Barite Ore +achievement.Barite.desc=Height: 40-80, Chance: 60, Overworld// +achievement.CertusQuartz=Find CertusQuartz Ore +achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Overworld// +achievement.Graphite=Find Graphite Ore +achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld// +achievement.Diamond=Find Diamond Ore +achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld// +achievement.Bentonite=Find Bentonite Ore +achievement.Bentonite.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Magnesite=Find Magnesite Ore +achievement.Magnesite.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Olivine=Find Olivine Ore +achievement.Olivine.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Apatite=Find Apatite Ore +achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Phosphorus=Find Phosphorus Ore +achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Phosphate=Find Phosphate Ore +achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Galena=Find Galena Ore +achievement.Galena.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Silver=Find Silver Ore +achievement.Silver.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Lead=Find Lead Ore +achievement.Lead.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Lazurite=Find Lazurite Ore +achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Sodalite=Find Sodalite Ore +achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Lapis=Find Lapis Ore +achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Calcite=Find Calcite Ore +achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Beryllium=Find Beryllium Ore +achievement.Beryllium.desc=Height: 5-30, Chance: 30, Overworld//End +achievement.Emerald=Find Emerald Ore +achievement.Emerald.desc=Height: 5-30, Chance: 30, Overworld//End +achievement.Thorium=Find Thorium Ore +achievement.Thorium.desc=Height: 5-30, Chance: 30, Overworld//End + +achievement.flintpick=First Tools +achievement.flintpick.desc=Craft a flint pick +achievement.crops=Farming +achievement.crops.desc=Craft Crops +achievement.havestlead=Harvest Lead +achievement.havestlead.desc=Get Plumbilia Leafs +achievement.havestcopper=Harvest Copper +achievement.havestcopper.desc=Get Coppon Fiber +achievement.havesttin=Harvest Tin +achievement.havesttin.desc=Get Tine Twig +achievement.havestoil=Harvest Oil +achievement.havestoil.desc=Get Oilberrys +achievement.havestiron=Harvest Iron +achievement.havestiron.desc=Get Ferru Leafs +achievement.havestgold=Harvest Gold +achievement.havestgold.desc=Get Aurelia Leafs +achievement.havestsilver=Harvest Silver +achievement.havestsilver.desc=Get Argentia Leafs +achievement.havestemeralds=Harvest Emeralds +achievement.havestemeralds.desc=Get Bobs yer uncle Berrys +achievement.tools=More Tools +achievement.tools.desc=Craft a Hammer +achievement.driltime=Drilltime! +achievement.driltime.desc=Craft a Drill(LV) +achievement.brrrr=Brrrr... +achievement.brrrr.desc=Craft a Chainsaw(LV) +achievement.highpowerdrill=High Power Drill +achievement.highpowerdrill.desc=Craft a Drill(HV) +achievement.hammertime=Hammertime +achievement.hammertime.desc=Craft a Jackhammer +achievement.repair=Repairs +achievement.repair.desc=Craft a Disassembler +achievement.unitool=Universal Tool +achievement.unitool.desc=Craft a Universal Spade +achievement.recycling=Recycling +achievement.recycling.desc=Craft a Arc Furnace +achievement.crushed=Crushed +achievement.crushed.desc=Crush Ores with a Hammer +achievement.cleandust=Clean +achievement.cleandust.desc=Clean a dust in a cauldron +achievement.washing=Washing +achievement.washing.desc=Get purified crushed ores +achievement.spinit=Spin it +achievement.spinit.desc=Get centrifuged ore +achievement.newfuel=New Fuel +achievement.newfuel.desc=Craft a Thorium Fuel Cell +achievement.newmetal=New Metal +achievement.newmetal.desc=Make Lutetium from Thorium Fuel Cells +achievement.reflect=Reflect +achievement.reflect.desc=Craft a Iridium Neutron Reflector +achievement.bronze=Bronze +achievement.bronze.desc=Craft bronze dust +achievement.simplyeco=Simply Eco +achievement.simplyeco.desc=Craft a Solar Boiler +achievement.firststeam=First Steam +achievement.firststeam.desc=Craft a Bronze Boiler +achievement.alloysmelter=Alloysmelter +achievement.alloysmelter.desc=Craft a Steam Alloysmelter +achievement.macerator=Macerator +achievement.macerator.desc=Craft a Steam Macerator +achievement.extract=Extract +achievement.extract.desc=Craft a Steam Extractor +achievement.smallparts=Small Parts +achievement.smallparts.desc=Craft NAND Chips +achievement.bettercircuits=Better Circuits +achievement.bettercircuits.desc=Get Good Circuits +achievement.stepforward=Step forward +achievement.stepforward.desc=Craft Advanced Circuits +achievement.energyflow=Energyflow +achievement.energyflow.desc=Get Energyflow Circuits +achievement.orbs=Orbs +achievement.orbs.desc=Get a Lapotronic Energy Orb +achievement.thatspower=That is Power +achievement.thatspower.desc=Get a Lapotronic Energy Orb Cluster +achievement.datasaving=Datasaving +achievement.datasaving.desc=Get a Dataorb +achievement.superbuffer=Superbuffer +achievement.superbuffer.desc=Craft a LV Superbuffer +achievement.newstorage=New Storage +achievement.newstorage.desc=Craft a Quantum Chest +achievement.whereistheocean=Where is the Ocean? +achievement.whereistheocean.desc=Build a Quantum Tank +achievement.luck=Real Luck +achievement.luck.desc=Find a Zero Point Module in a Jungle Temple +achievement.steel=Steel +achievement.steel.desc=Produce Steel in a Bronze Blast Furnace +achievement.highpressure=High Pressure +achievement.highpressure.desc=Craft a High Pressure Boiler +achievement.extremepressure=Extreme Pressure +achievement.extremepressure.desc=Start up a Large Boiler +achievement.cheapermac=Cheaper than a Macerator +achievement.cheapermac.desc=Craft a LV Forge Hammer +achievement.complexalloys=Complex Alloys +achievement.complexalloys.desc=Produce a Blue Steel Ingot +achievement.magneticiron=Magnetic Iron +achievement.magneticiron.desc=Craft a Magnetic Iron Rod with 4 Redstone +achievement.lvmotor=Low Voltage Motor +achievement.lvmotor.desc=Craft a Low Voltage Motor +achievement.pump=Pump +achievement.pump.desc=Craft a LV Pump +achievement.closeit=Close it! +achievement.closeit.desc=Get a Shutter Cover +achievement.slurp=Slurp +achievement.slurp.desc=Craft a Advanced Pump II +achievement.transport=Transport +achievement.transport.desc=Craft a LV Conveyor +achievement.manipulation=Manipulation +achievement.manipulation.desc=Get a Machine Controller +achievement.buffer=Buffer +achievement.buffer.desc=Craft a LV Chest Buffer +achievement.complexmachines=Complex Machines +achievement.complexmachines.desc=Craft a LV Robot Arm +achievement.avengers=Avengers Assemble +achievement.avengers.desc=Craft a LV Assembler +achievement.filterregulate=Filter and Regulate +achievement.filterregulate.desc=Get a Item Filter +achievement.steampower=Steampower +achievement.steampower.desc=Craft a Basic Steam Turbine +achievement.batterys=Batterys +achievement.batterys.desc=Craft a Battery Buffer +achievement.badweather=Bad Weather +achievement.badweather.desc=Forget to build a Roof above your Machines +achievement.electricproblems=Electric Problems +achievement.electricproblems.desc=Loose a Machine due to Overvoltage +achievement.ebf=Electric Blast Furnace +achievement.ebf.desc=Craft a Electric Blast Furnace +achievement.energyhatch=You need three of them +achievement.energyhatch.desc=Craft a LV Energy Hatch +achievement.aluminium=Aluminium +achievement.aluminium.desc=Produce a Aluminium Ingot +achievement.highpowersmelt=High Power Smelter +achievement.highpowersmelt.desc=Craft a Multi Furnace +achievement.oilplant=Oil Plant +achievement.oilplant.desc=Start up a Distillation Tower +achievement.factory=Factory +achievement.factory.desc=Craft a Processing Array +achievement.upgradeebf=Upgrade your EBF +achievement.upgradeebf.desc=Craft a MV Energy Hatch +achievement.maintainance=Maintainance +achievement.maintainance.desc=Fix all Maintainance Problems in a Machine +achievement.titan=Titanium +achievement.titan.desc=Produce a Titanium Ingot +achievement.magic=Magic? +achievement.magic.desc=Craft a LV Magic Energy Converter +achievement.highmage=High Mage +achievement.highmage.desc=Craft a HV Magic Energy Absorber +achievement.artificaldia=Artifical Diamond +achievement.artificaldia.desc=Produce a Industrial Diamond in a Implosion Compressor +achievement.muchsteam=So much Steam +achievement.muchsteam.desc=Start up a Large Turbine +achievement.efficientsteam=Efficient Steam +achievement.efficientsteam.desc=Use Superheated Steam in a Large Turbine +achievement.upgrade=Upgrade your Coils +achievement.upgrade.desc=Craft a Kanthal Heating Coil +achievement.tungsten=Tungsten +achievement.tungsten.desc=Cool down a Hot Tungsten Ingot +achievement.hightech=Hightech +achievement.hightech.desc=Craft a LV Field Generator +achievement.amplifier=Amplifier +achievement.amplifier.desc=Craft a AmpFab +achievement.scanning=Scanning +achievement.scanning.desc=Complete a Element Scan +achievement.alienpower=Alien Power +achievement.alienpower.desc=Craft a Naquadah Generator Mark I +achievement.universal=Universal +achievement.universal.desc=Craft a MassFab +achievement.replication=Replication +achievement.replication.desc=Crafta Replicator +achievement.upgrade2=Upgrade your Coils (again) +achievement.upgrade2.desc=Craft a Nichrome Heating Coil +achievement.tungstensteel=Tungstensteel +achievement.tungstensteel.desc=Cool down a Hot Tungstensteel Ingot +achievement.conducting=Conducting +achievement.conducting.desc=Craft a Superconductiong Coil +achievement.fusion=Fusion +achievement.fusion.desc=Produce Helium Plasma +achievement.higherefficency=Higher efficiency +achievement.higherefficency.desc=Produce Nitrogen Plasma +achievement.advancing=Advancing +achievement.advancing.desc=Produce Europium +achievement.tothelimit=Going for the Limit +achievement.tothelimit.desc=Produce Americium +achievement.denseaspossible=As Dense As Possible +achievement.denseaspossible.desc=Produce Neutronium +achievement.fullefficiency=Full Efficiency +achievement.fullefficiency.desc=Craft a Plasma Generator III +achievement.whatnow=What now? +achievement.whatnow.desc=Craft a Ultimate Battery \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db index f42eaf50414d380f89901e5f828804e562f17eae..cdc2a841f969cfd6ef9e71a5e2f5c73deecb83c3 100644 GIT binary patch delta 5839 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 H2{QUW>NM)b delta 5075 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 lLFX5VB|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eqQ$1ZALn`Lv_MhfGV8G*KY+JtmfX|x)QeV}xF0axM-_KBZ?U!iObB)>NOg^V7 z%^Ke_9+OzIOXr%HL2CzJlDa_3f*#%_jPry#N?fgOE#0z7uXk4YbP0l+XkKKu^D1 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db index 0cae027cf9ad09ae839da953c7f33696264258f1..734c40032f0fc029da828e8144dcaf1fba614d99 100644 GIT binary patch delta 3050 zcmZve4O~oFAIIlTlTO^Jp)jq`sJ!$#y-=a1S5v623KJF4i=Oh52D_w}m6wQ5oMd=r zwOA`Yv6JiNJ~kAKRmfw*-8H)wkC#%i_M&H5p8u_(>+^a3^Z9@7obUOc-}&Ej{-1Mh zkzQQ%wb)>5Wu;eFlHugW+kG zqj8sHij?46vAxs@Yt3Wvd5IUznd{Ba#%Jl%uXHYGqS<04A$tLFyuF;_nIx_dFQD1J zIRt49#0A`>3kqaxkFLFtawJ760gMzvtuz4*7XnUdk6LuU%|+!6XR+L>3tcF)`_kr{ zQPx;)&7hdn*u^Kf!hd3&%pltU<9JiuYv1}Tc7p{#2G#BNNT0GhdmGmDe<~Hppj!^! zo7w=1i~}%82)O}}FTY3$LaMbfy~PwEAbuEcu$fMnvr9s0C+~e8CpA)L3f-<<7=K96q#WKh+O z9WPH!JY~e}kZgQj>V>uT-MfuB`&g;S8^Xtee-zaYrO2TG+=P%Dsz)6a{k~kS80m#| z!x(hHYkKqZnEK6F?qHDZhfv1Ta_;XGN{nw!R}uRo;zX|8lk!0CLMQv^pw^q zTnQW|g;E=lM4(^Rt*%{{JogcnI~!!ndqhNvtAwQG&*&8Z85F(r&YE)@8y{fSIS2nB zRbuT(iWEcS5b%#Vb0barHcCjfqu~Ac7;_=zM(NSR-#v$QoF=AV-Dn2Q4y(_LicFPY zxr;%z1wwga3x2)0zF+!ifDD?}XVF9F)~m&sg@%8nHCYOf zLF!{grN@gq5N18Ir9>!nyMp&-p#7(Or=)t8(5vUkdFj#p?R9H6k8RkDb>6V4 zZH*I1oAZrW?rV@$!%*H*xK+2QKHLCLJr_)0CqyC^)uC@pAn5;l&2Y18U{rcumA@KP-xTo%&H7ubvUgH zV8ke>y1!WbBU4CgCVoz!X0yU2bDjEoyR-fnwncg#qA|s(=@F$%rQ*p!y zDW@_b#rW2ng=dT_v1UdHZ5Q&IK;q>$mQmGjHqr7he*$TD?V3NcrYwurghLL8X5Ecc z)VWq;Hew0l&*R<&m_(7mCh!q*lVE2MQ2$Rt)ut6t8&P1x*((b}|H#L36oT!dUL&^+ zL-uYv^w12;Co`z6CA&O)A3@OUWH^SUATmrKL~Ez&3FJP06teUz+l1vY40^JA&i42N z+pm9=Q(Vi7J##A25z8qCRdkj<)UCS}MYB{6(Ni38kf5hYvp4NHisTz=!DLt)Pmz`Y z0)>!^w@0@w96WsOT_V(P0)sZch*37@l^OU1XuIit1iIl7&`GPjifGM@c7pVU(c^>) zT8(KjOiyhhwBgv|673Q7-O0ZdM|5wod{!4yyy@CHskk7TmM>aD$Y{{u?c%DPjPMq_U=zc#R5cv4g z+Eh~_sYVp%KOr^5fe5GBc~An*Yx~$gv7PZVEl*8rGa1K1@n*Ps&=X~%q@O1DD zaJcd_x8;-A%gdj(BwG_70gN=S(@kVcU3 z<+vq1IcjrFx#lLJ`@f8_cy*x=bR@;TR zz^Ca4`=5@(?6T)b@rm+ss2~-P83IacSJ<1OT@80~-C8q0!@89Wvh%uLOqBn3J*`>g zPoOs26G4^6y`8i!A6n8_k1r-54{Nxylo%D%k<&oSL!gJb0+@wg)bT>9Ed<&hNQi*a zT%nOb`a!7mE=miA&l;FORoYp+B*asJTBLA%&y5HBVeS3U^Ld2n2wPW zikuD|umOS^Sxb>N07xO^)*4a7+x_$&gZb6&;-n)tydn6~@YKNQEfC9_H(b2qL~}&* zMN0VR4bKeGJox7YPhYtDy+!GGk9sJsH%BM{;y;v-&ukE>?Uv{j@qr<}qBIzuF7g4{ z9-j|_X`%oSQb_D@z1vu~|1&>7S1Qcv1EHz#8w;KW2UG^$LptIgBub}L7?lmq8~<&^ ze>i=(t}n`FdM2s<^6$RGck&Tn16IgIhFhuo;0vzzVxRq^^7+d?zZ_{Z+YwbC_8S%l}b@h;&_w(Y@9Ry7Txng*+5?e(_DDq2c+KUn;g zWx^LXE?0IGo+*^S*`c=gxtN=ODeIz=R6VB6J=;%RJ9Mb;pXrG?cTOlRs-D#?;ldH5M-Ktx8hJgW{43E8oUdsx6M13iH@QMeB$e zk?TZ?kaOQ=#dZ1hAMhkquNoejpGP@{J?@2fUB35C8xG delta 2567 zcmb7`e^^vi8ppXXqX)UbBxr*U3aB8zWcUq=APxcnF_&LULW*HQGx20qe82x591fY4Zm>!P*sO)pFlEGv%G9{@L?9=b7hx z-gCb1d(L^!d*}Jr+@EiExB7cfKOQU^YEczX(GaYf>0|ZFkaC&_C=WL`x3f#(IaMKi zqK*Q+N(DAmKJ=<%fm0j3sR!6fagO{8MV_;HN!{*2`iu$x{d`t@1ZYVneC9b$%>Mkl z0XH`I@ZzL8ik2tmDi#4p8@=78BPmc)iDux#5Iu0-rI4$O0?AuP_Fvy}dG&*B?}FCH zM!ugH6t zI*fiYL(fNVnJykD8y#Eo!+0Xl;^$)Z(-CvktI=N#{@{l?U2xW4L-rKhD8CZgGXSE$ zjhKA($D^*kR1M-38!;zJmj3&Rvp}3GkhUA@F9M)H5(m{S+AKO7h0~SdoR*;G#u`w}VIMBZvRwS2~-*PjMZ0p7uxgIsI=OW&N$BcZU)=;^f{lEmYMGzVndAjxVjb;`)(q?q z&mjpPv04vO5<@RU!y_)nWam{R50Xps?$%t4x%o9%QZY+X8IsUFSoM04*aBVROgo@ngjyyvU&DJe-_@{o&;mJCmuHp=Y5X$HiE}&{GkFDxp-O zBL#bR9r`x0wbdSk!5Kuvv7lw6rC%@R#Zo-3xD$qdJeSh&4bLtertJB_v3MjtC{^qt zC({W?rYR{`?hLD3N2abB7~4=V)(RHWsK(@UCVaGFj(hmyCwc9Y=&bwXt$#0!Ey2t( z*~senS979!Dr10MVbwIDs@%?mH)ZGauvki02&Cfm_eV}#{#z2ST^Z$0hohOn{_spH zop+a~q*CP|S=Bs$$5S8Zj_~3tyu0@*s)sY?ztUyTpYo?RQRHpuUp^s)=Q==qy4LXx zGNV*7%II9A%memPHb((@sR|3^8@mnrA}WSY^K6a3`@zzeTj~ywCv%TS+-p=X;w^Q! z)!b!er5*RBl*!MdtP`rud4Q1ufC8@S;Dhh@zAa%hz;FGv-^3=HXN}* zy`4V@^{pUoA9fUx9nSYt?~s-12PtA5zu7o7tWP5c2LTP^r0tpoyrg_D(C)(99P531 z|Lzn20dZFy9gnfiRK~}>z|esR9#=vMp}Ye*!k>4-z36~hN+`WJNVc@rzaApw_Slb{ z&)sv6@}?%?q+rEFHH%um!x9_=6`ne~xGXF;Ck#SE5dOVV|DVP)8z)0i(;ugAHkLI+ ooj6u|ymp%Mi*Q+M{50J+nrvLx| diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db index 8037ca62fe76c454d243d21ac0bd28822131ffad..71241310098a752343f9bb2660acb1bfd23ef56e 100644 GIT binary patch delta 5287 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 Nx)6L{{soTcFzC+ delta 3733 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 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..d91d05245d7866782132881bd15c12336d5ca9be GIT binary patch literal 65536 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 XnLPVH89%lCcP91ozt8;tTLb?GCGpQ^ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..0156664b08c475e1fad605dda3328560e17e0f3d GIT binary patch literal 61440 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 qKa9VBzvHi;fpM1%zy80e{~u)9Q2y%O{BE|;* literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png b/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png b/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a6bd742d68905cd0f1db42d07aa5385d79ae69 GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eq3p`yMLn`JZCmdj2xA0@W%V5#U-I<$)BgP1npyW^7@phjtw}h$=39^o zbAQf^+o6pQ?%QoFO|0i_s(*iGUFu|M!9VWLzptCsmvV5kcKfySj*s^5s!MrnlOlfC ra%ZWb(f@xpV^0UnsY%plj$>f>uc6N*FDRV{w41@x)z4*}Q$iB}(#Fc_ literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade_OVERLAY.png b/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001