diff options
| author | Dream-Master <dream-master@gmx.net> | 2016-07-26 18:25:35 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-26 18:25:35 +0200 |
| commit | 2efe1b9f513a30cfcb9e417b4f6017fb2acd2071 (patch) | |
| tree | 5f840a641ff947dd21bc73e9270c71009e69ecbb /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01 | |
| parent | c014ae4afc980b33d92e589f52151b8afbd6b3ad (diff) | |
| parent | eec5b2faa7e70d5de1be718f949d28feddcbc037 (diff) | |
| download | GT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.tar.gz GT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.tar.bz2 GT5-Unofficial-2efe1b9f513a30cfcb9e417b4f6017fb2acd2071.zip | |
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
Conflicts:
.gitignore
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/OrePrefixes.java
src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
src/main/java/gregtech/api/util/GT_BaseCrop.java
src/main/java/gregtech/api/util/GT_Recipe.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_Worldgen_GT_Ore_SmallPieces.java
src/main/java/gregtech/common/GT_Worldgen_Stone.java
src/main/java/gregtech/common/GT_Worldgenerator.java
src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
src/main/java/gregtech/common/blocks/GT_Block_Machines.java
src/main/java/gregtech/common/blocks/GT_Block_Ores.java
src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
src/main/java/gregtech/common/covers/GT_Cover_Arm.java
src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
src/main/java/gregtech/common/covers/GT_Cover_Drain.java
src/main/java/gregtech/common/covers/GT_Cover_EUMeter.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/covers/GT_Cover_Pump.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
src/main/java/gregtech/common/gui/GT_Container_Filter.java
src/main/java/gregtech/common/items/GT_FluidDisplayItem.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_Tool_01.java
src/main/java/gregtech/common/items/GT_SensorCard_Item.java
src/main/java/gregtech/common/items/ItemComb.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.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_GasTurbine.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_Disassembler.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.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_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_LargeBoiler_Bronze.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.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_PyrolyseOven.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
src/main/java/gregtech/common/tools/GT_Tool.java
src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Sense.java
src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.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/postload/GT_CraftingRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
src/main/java/gregtech/loaders/postload/GT_Worldgenloader.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_OreDictionary.java
src/main/resources/assets/gregtech/lang/en_US.lang
src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/items/gt.metaitem.01')
25 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/606.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/606.png Binary files differnew file mode 100644 index 0000000000..4f4f28cc2d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/606.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/607.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/607.png Binary files differnew file mode 100644 index 0000000000..a25aa6e830 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/607.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/608.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/608.png Binary files differnew file mode 100644 index 0000000000..033ccff7f9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/608.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png Binary files differnew file mode 100644 index 0000000000..9ce37bb503 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/620.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png Binary files differnew file mode 100644 index 0000000000..56f1a8c3ba --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/621.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png Binary files differnew file mode 100644 index 0000000000..8398ad90ba --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/622.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/635.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/635.png Binary files differnew file mode 100644 index 0000000000..5afa99fc21 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/635.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/636.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/636.png Binary files differnew file mode 100644 index 0000000000..75db5ddc9b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/636.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/637.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/637.png Binary files differnew file mode 100644 index 0000000000..e9aea87de1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/637.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/638.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/638.png Binary files differnew file mode 100644 index 0000000000..c25b394982 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/638.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png Binary files differnew file mode 100644 index 0000000000..47bc25bede --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/645.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png Binary files differnew file mode 100644 index 0000000000..45fe69fc68 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/646.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png Binary files differnew file mode 100644 index 0000000000..617ddf2a34 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/647.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png Binary files differnew file mode 100644 index 0000000000..3284b14a29 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/655.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png Binary files differnew file mode 100644 index 0000000000..88438bc12b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/656.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png Binary files differnew file mode 100644 index 0000000000..1fcb002fdc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/657.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/675.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/675.png Binary files differnew file mode 100644 index 0000000000..089b12b566 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/675.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/676.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/676.png Binary files differnew file mode 100644 index 0000000000..76d8b107eb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/676.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/677.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/677.png Binary files differnew file mode 100644 index 0000000000..51bddaf04b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/677.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png Binary files differnew file mode 100644 index 0000000000..476b7f1fb9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/685.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png Binary files differnew file mode 100644 index 0000000000..862a7854b5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/686.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png Binary files differnew file mode 100644 index 0000000000..9515966053 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/687.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png Binary files differnew file mode 100644 index 0000000000..88fde9e8cd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png Binary files differnew file mode 100644 index 0000000000..c1f809fc7a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png Binary files differnew file mode 100644 index 0000000000..855732e3ed --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png |
