aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
AgeCommit message (Collapse)Author
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-25Assline recipes part3Technus
2017-06-25Assline recipes part2Technus
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-24Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic AcidJohannes Gäßler
2017-06-24Added a config option for easier EV+ CablesJohannes Gäßler
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-18Biomass Fermentation: Efficiency 80% -> 100%, Duration 640t -> 150tJohannes Gäßler
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-16Added recipes to obtain IC2 Biogas for use with the IC2 JetpackJohannes Gäßler
2017-06-16Fixed Salt Water Electrolyzation and Polydimethylsiloxane production.Johannes Gäßler
2017-06-15fix naquadah wafer recipe #1094Blood-Asp
2017-06-15Fix hiding of unused ores. #1062Blood-Asp
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-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-14Returned BioFuel to its previous state, added BioDiesel instead.Johannes Gäßler
There are artifacts for fluids called BioFuel, therefore the change.
2017-06-14Fixed Allyl Chloride recipe consuming a Fluid CellJohannes Gäßler
2017-06-14fix IC Classic compat #1090Blood-Asp
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-12change back the component heat exchanger damage valueBlood-Asp
2017-06-12Fixed Chloromethane and Chloroform recipes missing empty cell outputsJohannes Gäßler
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-09Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc.Johannes Gäßler
Made it so that GT_Values.NI and GT_Values.NF are consistently used when applicable. Nerfed Silicone Rubber so that you only get 3/7 as much as from a regular plastic. The idea is that Silicone Rubber is more versatile than PVC or SBR, but also more expensive. Changed the Distillation Tower description so that it aligns with the new behavior.
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-07Merge branch 'advminer2_improvements' of ↵Techlone
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07Rebalanced Fermented Biomass in face of the Methane Fuel Value changeJohannes Gäßler
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-06Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169Johannes Gäßler
2017-06-06Fix Nitric Acid name #1079Blood-Asp
2017-06-06Fix vents as covers. Ventcovers now speed up machines 1-3% #1065Blood-Asp
2017-06-05Added Rape Crop as a new source of Seed OilJohannes Gäßler
2017-06-05Thiccness changes doneTechnus
2017-06-05Adjust pipe thiccnesTechnus
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-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-05Made it so that rubber-related recipes accept more than one rubber typeJohannes Gäßler
LV, MV, HV recipes accept all rubbers. EV+ recipes accept only synthetic rubbers. Affected items: Pump, Conveyor Module, Plunger, Because it is not easily possible to have this functionality for the Assembly Line, the Assembly Line still accepts only one type of rubber for each recipe.