aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
AgeCommit message (Collapse)Author
2017-08-04change the steam consumption from HP machines from 3x to 2xDream-Master
2017-08-04Fixed a bug with ghost Items left behind in the Large Chemical ReactorJohannes Gäßler
2017-08-03Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-08-03Rework texturing again.Technus
2017-08-03Added an option to findRecipe() to only return recipes with enough inputJohannes Gäßler
2017-08-02Multiblock Chemical Reactor now also automatically adds an Int. Circ.Johannes Gäßler
2017-08-02Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-08-02Expand to add proper texture paging support.Technus
2017-07-30Merge branch 'experimental' into experimental-testDream-Master
2017-07-30Texture overhaul,Technus
allows for more textures to be added for casing, with extra byte of data for paging. Just change the value of mTexturePage at the same time you change mMachineBlock.
2017-07-28cherry pickDream-Master
af36dd30991f55e6589c8024cc6c2580f949895d Fixed a bug where every Fluid was put out at the top of the EBF
2017-07-28Revert "Texture overhaul,"Technus
This reverts commit 3274784db6f35e858ee408e1e35aac3a2afe1213.
2017-07-28Texture overhaul,Technus
allows for more textures to be added for casing, with extra byte of data for paging. Just change the value of mTexturePage at the same time you change mMachineBlock.
2017-07-25Merge branch 'GTNHexperimental' into experimental-testDream-Master
2017-07-25Adapted GT5U Pyrolyse Oven changes for GTNHJohannes Gäßler
The Pyrolyse Oven accepts all Coils. Processing speed scales linearly with Coil tier.
2017-07-24cherry pickDream-Master
https://github.com/Blood-Asp/GT5-Unofficial/pull/1170 4995bc3a4e9a60987d121a09a91e856a9d97be82 beaa54eb4153e11935f6107d53272c88453e3e3d 8fa91db261def5087ff4dcf25de899de36457a98 f95d89a5e6b1ab6b3e7fab5e56f9b51e21ae78e3 f816fbbd97e8440b346e73f266ec4c452d518e77 a687bcd24ee1ff97ad6d86f84f1748e1cd0129a4 306160fb69b41376644d793803c67b85bc125af3 480f2f1413989cd155fa19310d5b6f8871c8ce6e a0c6ec45daf3203b32f0d31baef93217eb2feaf0
2017-07-22Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-07-22fix pyrolyze - dynamic recipe adding for logWood oredict, change texture IDTechnus
2017-07-20remove EV and IV Miner because to op and no one would use Ore Drill plantsDream-Master
2017-07-20Add more miner tiers EV and IVDream-Master
2017-07-20Add HV MinerDream-Master
2017-07-17Added the Large Chemical Reactor Controller inventory to the item inputJohannes Gäßler
2017-07-09Quick fix item distributerDream-Master
2017-07-09Possible fix of Super chest #1621Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1621
2017-07-06cherry pickDream-Master
424b356feeb02cb3735b928b4b16fdf54631bcae 835dd2daccc5894a40b75a2110911a8c3e1878b9 98e214b873840c97778bb5bf5377673f76fd457d 0334a19993931a421376ce3aad50191edff3814b 0375e11debad5b9c997a91da3d07f85e37dc0616 480132b25f85bb350b04e949174ebc9ade85f185 Added LV and MV miners. #1142
2017-07-02change Pyroluse Overn using now Cupronickel Coils tooDream-Master
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-07-01cherry pickDream-Master
026fcfcbbadc8c3163f13b64192fed6ea05343fc Clean reset of Datastick so remaining old data does not break assemblyline.
2017-06-29Add missing importTechnus
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-25spellingDream-Master
2017-06-25fix spellingDream-Master
2017-06-24cherry pickJohannes Gäßler
c0c498fb8cec35d35cc5fd2b8524cd5510082a9b Added Bricked BF config, fixed Primitive BF class hierarchy Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-22cherry pickJohannes Gäßler
14b9332d141ff652cf728ea16a7d44274f0e1bef Moved the Casings for the Large Chemical Reactor again. As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Blood-Asp
unstable
2017-06-17Extended logging for AssemblylineBlood-Asp
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Cleaned up to ore processingTechnus
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-16Added Interface classes for the BBF, increased slots to 3/3Johannes Gäßler
2017-06-16Things cleanupTechnus
2017-06-15Merge branch 'experimental' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/common/GT_Network.java # src/main/java/gregtech/common/GT_Proxy.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_EnergyOnly.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_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/common/tools/GT_Tool.java # src/main/java/gregtech/common/tools/GT_Tool_Axe.java # src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.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/MetaPipeEntity.java # src/main/java/gregtech/api/metatileentity/MetaTileEntity.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/objects/GT_UO_DimensionList.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_UndergroundOil.java # src/main/java/gregtech/common/GT_Worldgenerator.java # src/main/java/gregtech/common/blocks/GT_Block_Machines.java # src/main/java/gregtech/common/blocks/GT_Material_Casings.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_EnergyOnly.java # src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.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_RedstoneReceiverInternal.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/covers/GT_Cover_Vent.java # src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java # src/main/java/gregtech/common/gui/GT_Container_Filter.java # src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java # src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java # src/main/java/gregtech/common/items/behaviors/Behaviour_None.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.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_DistillationTower.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_OilDrill.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java # src/main/java/gregtech/loaders/load/GT_FuelLoader.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: 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/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
generated by cgit (git 2.46.0) at 2025-03-06 21:27:48 +0000