Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)

# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/enums/Materials.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
# src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
# src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
# src/main/java/gregtech/common/gui/GT_Container_Regulator.java
# src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java
# src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
# src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png

29 files changed, 0 insertions, 0 deletions

diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png
new file mode 100644
index 0000000000..6d2a21cf93
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png
new file mode 100644
index 0000000000..86ae8dd7e2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png
new file mode 100644
index 0000000000..3131758123
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png
new file mode 100644
index 0000000000..0a9d1f880d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png
new file mode 100644
index 0000000000..61f7255c52
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png
new file mode 100644
index 0000000000..5cba994104
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png
new file mode 100644
index 0000000000..80cd9711cd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png
index b0fddb350d..2f465760da 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png
index 66bf7f7869..fd3942cad6 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png
index 533601d7e8..ed27c58baf 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png
index ae1be08e15..ae3bcc1789 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png
index f6eeea2415..2ce8b2bca5 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png
index 32816cc999..024f812e55 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png
index a8e8f4b774..64076bd7d4 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png
index 143e0ebe7f..d9ca638485 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png
new file mode 100644
index 0000000000..5b01e1f1a2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png
new file mode 100644
index 0000000000..c8c2259ec7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png
new file mode 100644
index 0000000000..8278e8a66a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png
new file mode 100644
index 0000000000..4f8af6fbaa
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png
new file mode 100644
index 0000000000..2bcd2f7e98
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png
new file mode 100644
index 0000000000..68f76dba01
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png
new file mode 100644
index 0000000000..de3ce2451b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png
new file mode 100644
index 0000000000..a9f16893b2
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png
index d83a131004..a09eb16257 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png
index d83a131004..31e316ba9b 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png
index d83a131004..bfa4437a85 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png
index d83a131004..22af0f52b1 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png
index d83a131004..8281767ef1 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png
new file mode 100644
index 0000000000..dc7a207ee0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png