aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-25Merge pull request #1117 from Technus/revert-1115-asslineBlood-Asp
Revert "NEI GUI AssemblyLine"
2017-06-25Revert "NEI GUI AssemblyLine"Daniel
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-24Merge pull request #1115 from SLiMylya/asslineBlood-Asp
NEI GUI AssemblyLine
2017-06-24NEI GUI AssemblyLineSLiMylya
2017-06-23Fixed several Material formulasJohannes Gäßler
RedAlloy, TungstenCarbide now have the correct formula. Changed the formula of Lignite, it no longer contains Ash Fixed the algorithm for determining whether or not to put brackets around a partial Material.
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-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-17Fixed Imp. Compressor Dynamite amount possibly becoming zeroJohannes Gäßler
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-16Fix buffer and regulator RS signalsBlood-Asp
2017-06-15fix naquadah wafer recipe #1094Blood-Asp
2017-06-15Hitboxes when holding soldering iron #1095Blood-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-15Improve fog density calculationBlood-Asp
2017-06-14pollution smogBlood-Asp
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 a bug where an Assembler recipe would be added if the output isJohannes Gäßler
null
2017-06-14Fixed Allyl Chloride recipe consuming a Fluid CellJohannes Gäßler
2017-06-14fix IC Classic compat #1090Blood-Asp
2017-06-14Merge pull request #1091 from draknyte1/unstableBlood-Asp
Made the Cleanroom optional.
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14improve cleanroom tooltipBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-Asp
2017-06-13wood plank compressor recipe #1013Blood-Asp
2017-06-13missed one fileBlood-Asp
2017-06-13Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-13Port GT6 timber changesBlood-Asp
2017-06-13meh...Blood-Asp
2017-06-13Merge pull request #1088 from Techlone/reworking_dataorbBlood-Asp
Reworking DataOrb and DataStick
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-13Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
generated by cgit (git 2.46.0) at 2025-03-12 08:24:46 +0000