aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines
AgeCommit message (Collapse)Author
2016-09-21Work on tiersTechnus
2016-09-21Scanner spacebars O:Technus
2016-09-21Last bit of work on scannerTechnus
2016-09-21Scanner initial changeTechnus
2016-09-21Minor changes - fixed derp in string generationTechnus
2016-09-21Fix Proc even more!Technus
2016-09-21Adjusting multiblocks for bettter tieringTechnus
2016-09-21no messageTechnus
2016-09-21EVEN MORE WORK^2Technus
2016-09-21EVEN MORE WORKTechnus
2016-09-08ScannerTechnus
2016-09-08Scanner spacebars O:Technus
2016-09-08Scanner workTechnus
2016-09-07Scanner 2Technus
2016-09-07Scanner 1Technus
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Steam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03Pollution removeDream-Master
2016-08-25Tiered Teleporter to Fusion Tier 3Dream-Master
Added reverse recipe for Super Conductor Blocks
2016-08-24May or may not fix #565 (LeaGris)Léa Gris
2016-08-23#573 Turbines now explode when producing more EU than dynamo can handleBlood-Asp
2016-08-22Delete saved recipe on machine change(Blood Asp)Dream-Master
2016-08-22Fix Assembly line work without energy(Muramasa)Dream-Master
Assembly line dont work on Z coordinates.(Muramasa)
2016-08-21remove importDream-Master
2016-08-21Should fix #666Dream-Master
Teleporter need Neutronium Block
2016-08-20Fix #666Dream-Master
GT Teleporter be Interdimentional with Block of Neutronium
2016-07-27Merge remote-tracking branch 'upstream/SmoothTransition' into experimentalDream-Master
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
2016-07-27Added code for Pyrolyse Oven to smoothly replace deprecated coils.OneEyeMaker
2016-07-27Added code for Oil Cracker to smoothly replace deprecated coils.OneEyeMaker
2016-07-27Added code for Multi Smelter to smoothly replace deprecated coils.OneEyeMaker
2016-07-27Added code for Electric Blast Furnace to smoothly replace deprecated coils.OneEyeMaker
2016-07-26Merge remote-tracking branch 'upstream/NewFeatures' into new-featuresDream-Master
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
2016-07-26Merge branch 'experimental' into NewFeaturesOneEyeMaker
2016-07-26Separated multiblock overlay and gui texturesMuramasa
2016-07-25Method simplificationMuramasa
Simplified some methods. Fixed incorrect honey requirement for scanning forestry species. Tweaked a tooltips.
2016-07-254aaafe53f5048e89e347dc899c625aaf772156a1OneEyeMaker
2016-07-25f98e51a82f646fa34172ce079a4b432ef3affffdOneEyeMaker
2016-07-25ea5305f7dfbb06b7285ee50a7406e2d67b666147OneEyeMaker
2016-07-258bf5b61dea476ce950ed523293658780217b203fOneEyeMaker
2016-07-25ce1e6917e056c0a1300caefc175b10c68126832aOneEyeMaker
2016-07-25ea5305f7dfbb06b7285ee50a7406e2d67b666147OneEyeMaker
2016-07-258bf5b61dea476ce950ed523293658780217b203fOneEyeMaker