aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload
AgeCommit message (Collapse)Author
2017-06-24cherry pickJohannes Gäßler
51574479e928a91d724d85ff9e38d2de65fe6fd4 Made the Large Chemical Reactor cheaper, added more Cell Materials Large Chemical Reactor Circuits: Elite -> Advanced Inert Machine Casing: Clean Stainless Steel Casing -> Solid Steel Casing Fluid Cells can now also be made from Steel and Polytetrafluoroethylene Fixed the name of Plastic and PTFE Fluid Pipes.
2017-06-24cherry pickJohannes Gäßler
4b77ca671312ae6a5f2e5c726397ec98622dd36c Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic Acid
2017-06-24recipes fixes (Sensor, Emitter)Dream-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-23Sensor and Emitter recipe changesDream-Master
2017-06-22cherry pickJohannes Gäßler
285c6637dd93b54d1bb31c19b1497c554afd7772 Fixed NitrationMixture FluidStacks, Glyceryl recipe stocheometry
2017-06-21concrete goes to core mod recipesDream-Master
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-18lower it a bit because methane have a burn value from 104k and biogas from 40kDream-Master
2017-06-18cherry pickJohannes Gäßler
368557ca5e60c0a4d636b80a08c0c606150fff2c Biomass Fermentation: Efficiency 80% -> 100%, Duration 640t -> 150t
2017-06-18remove unused wrong recipeDream-Master
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17ChangesTechnus
2017-06-17Put assline Circuits to the Core ModDream-Master
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 pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Huge Pipes need a Shaped recipes to make it even like GT++ #1507Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1507
2017-06-17Added recipes to obtain IC2 Biogas for use with the IC2 JetpackDream-Master
cherry pick 87db8ee099925c8bb8b5cf6a0a5db4895d0bda25
2017-06-17cherry pickDream-Master
2d8378052b6aad2450b9362c1744e8720cd4707b Fixed Salt Water Electrolyzation and Polydimethylsiloxane production.
2017-06-17fixed wafer 3 recipeDream-Master
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-15fix naquadah wafer recipe #1094Blood-Asp
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-15remove this recipe because overlayDream-Master
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
2017-06-15Cherry PickDream-Master
c3f2b2b49dc3911a377fd062908d4df78bd3e58d Made it so that Pyrolyse Oven recipes are consistent Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood Vinegar, or Wood Tar to OreProcessing to ensure that all log types can be used.
2017-06-15cherry pickDream-Master
7f408ff581b25fdee81e87c61e124c48f25ee78e Returned BioFuel to its previous state, added BioDiesel instead. There are artifacts for fluids called BioFuel, therefore the change.
2017-06-15Made it so that Pyrolyse Oven recipes are consistentJohannes Gäßler
Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood Vinegar, or Wood Tar to OreProcessing to ensure that all log types can be used.
2017-06-14cherry pickDream-Master
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731 Fixed Allyl Chloride recipe consuming a Fluid Cell
2017-06-14Fixed Allyl Chloride recipe consuming a Fluid CellJohannes Gäßler
2017-06-14fix IC Classic compat #1090Blood-Asp
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-12cherry pick:Dream-Master
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731
2017-06-12Fixed Chloromethane and Chloroform recipes missing empty cell outputsJohannes Gäßler
2017-06-10fixed a few more recipesDream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
add Circuits to chemical reactor recipes
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-10 a few fixesTechlone
2017-06-09cherry pickJohannes Gäßler
74c41614a5e8a6cb49e62a225669a1e1d07bc87b
2017-06-08remove hcl because already addedDream-Master
2017-06-08remove the recipe because already in the codeDream-Master
2017-06-07cherry pick:Johannes Gäßler
785322f5c76511f8db6e95860c4651b8ebea34a9 Rebalanced Fermented Biomass in face of the Methane Fuel Value change Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master
2017-06-06cherry pick: from TechloneDream-Master
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db
2017-06-05cherry pickDream-Master
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96
2017-06-05fix OsmiridiumCasing recipe in AssemblerTechlone
fix ODP changing state when the tip meets itself fix cleaning of oreBlockPositions when a mining column was broken
2017-06-01fix #1041Blood-Asp