diff options
| author | Technus <daniel112092@gmail.com> | 2017-04-27 19:42:17 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-04-27 19:42:17 +0200 |
| commit | 00abad266ce21165f6a5d0aebafa40a3a64f5e7a (patch) | |
| tree | c9da4bb3aeed17a0dda64874585af9ca5db1948e /src/main/java/gregtech/api/objects/GT_ItemStack.java | |
| parent | 244ef3810efd241766601327a28ea3053d1b2744 (diff) | |
| parent | e7d8d5ecbeae51a26971f490595f2cf752f2b285 (diff) | |
| download | GT5-Unofficial-00abad266ce21165f6a5d0aebafa40a3a64f5e7a.tar.gz GT5-Unofficial-00abad266ce21165f6a5d0aebafa40a3a64f5e7a.tar.bz2 GT5-Unofficial-00abad266ce21165f6a5d0aebafa40a3a64f5e7a.zip | |
Merge branch 'unstable' into mergeGTNH
# Conflicts:
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.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/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.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_GasTurbine.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
# src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
# src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
Diffstat (limited to 'src/main/java/gregtech/api/objects/GT_ItemStack.java')
0 files changed, 0 insertions, 0 deletions