aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
AgeCommit message (Collapse)Author
2017-08-19Merge remote-tracking branch 'origin/unstable' intoJohannes Gäßler
CircuitChemistryUpdateFollowup Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-11implements #1061Muramasa-
2017-08-07Replaced Tin with Wrought Iron as Item Pipe MaterialJohannes Gäßler
2017-07-31Changed Vacuum Freezer Circuits: Elite -> Data/ExtremeJohannes Gäßler
2017-07-24Added Item Pipes made from Tin, Nickel, Cobalt, AluminiumJohannes Gäßler
2017-07-08Fix Item Distributor recipesAntifluxfield
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-06Added LV and MV miners.Dimach
2017-07-03Fix the names of Data Access HatchesAntifluxfield
2017-07-01Added ItemDistributor crafting recipes, reordered ItemDistributor fieldsJohannes Gäßler
2017-06-30Update GT_Loader_MetaTileEntities.javaAntifluxfield
2017-06-30Update GT_Loader_MetaTileEntities.javaAntifluxfield
2017-06-30Add a low-tier Data AccessAntifluxfield
2017-06-30Adding Data Access HatchAntifluxfield
2017-06-26Fixed Dual Fuel Rod names, Tungstencarbide, removed some EBF Ash outputsJohannes Gäßler
2017-06-26Merge branch 'unstable_blood' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/MaterialBuilder.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'OilRefining' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-25Added simple ItemDistributor implementation, changed MoveOneItemStackJohannes Gäßler
2017-06-24Created a non-functional first draft of the Item DistributorJohannes Gäßler
2017-06-24Made the Large Chemical Reactor cheaper, added more Cell MaterialsJohannes Gäßler
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-23Added Bricked BF config, fixed Primitive BF class hierarchyJohannes Gäßler
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-22Fixed NitrationMixture FluidStacks, Glyceryl recipe stocheometryJohannes Gäßler
2017-06-22Moved the Casings for the Large Chemical Reactor again.Johannes Gäßler
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-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18Merge branch 'ChemistryUpdate' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
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-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
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-15Fixed a bug where Distilleries didn't have a solid output slot.Johannes Gäßler
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-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID 15 Refactored the non-electric Blast Furnaces: The Bronze Blast Furnace and the Bricked Blast Furnace extend a superclass to ensure consistent behavior. Subclasses only differ in texture, description, and Casing Block.
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-06Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169Johannes Gäßler
2017-06-05Thiccness changes doneTechnus
2017-06-05Adjust pipe thiccnesTechnus
2017-06-05Implemented Bio Diesel, Glyceryl Trinitrate, adjusted alcohol fuel valueJohannes Gäßler
Bio Diesel can be produced from Seed Oil or Fish Oil. Bio Diesel Production yields Glyceryl as a byproduct, which can be used for Dynamite production. Alcohols have their fuel value reduced by 20000 per Oxygen atom Increased the potency of Dynamite in the Implosion Compresser so that dynamite recipes actually show up. In return Dynamite now needs more Glyceryl Trinitrate: 150 -> 500
2017-06-04Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200Johannes Gäßler
2017-06-03Added two changes accidentally not added to the previous commit.Johannes Gäßler
2017-06-01Added methods for adding Distillery recipes with a solid output.Johannes Gäßler
Universal Distillation recipes now utilize the solid output. Fixed the chemical formula for Tetranitromethane and fluid name for NitroDiesel
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
Four tiers of Ore Drilling Plant I - radius is 3 chunks MV+ (default) II - radius is 4 chunks HV+ III - radius is 6 chunks EV+ IV - radius is 9 chunks IV+ New behavior: - pick pipes after mining finish - extract ore block before moving down
2017-05-30The MV Chemical Reactor no longer needs plastic.Johannes Gäßler
Plastic has been rebalanced as a Material that strictly only becaomes available with MV. To avoid circular dependencies MV Chemical Reactors no longer strictly needs plastic.
2017-05-30Fixed a bug where the Chemical Reactor still only had one output slot inJohannes Gäßler
it's machine inventory, causing the second output to be voided.
2017-05-25Fixed IC2 steam compatibility for crackingJohannes Gäßler
2017-05-24Expanded Materials class for cracked Fluids, changed cracking recipesJohannes Gäßler
Fluid cracking can be done with either Steam or Hydrogen and at 3 different severities for a total of six different recipes. Cracking severity is controlled with a programmed circuit. Removed the previously used liquids for cracked light fuel/heavy fuel Changed the Distillation Tower recipes so they can utilize up to 11 fluid outputs
2017-05-12Added crafting recipes for the LCHJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-08Reverted an erroneous name change for nitration mixtureJohannes Gäßler