aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
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-15cherrypickBlood-Asp
911a80752930d6207fc0b850f3ccf8b3da05b0a5 pollution smog
2017-06-14changed that backDream-Master
2017-06-14Merge branch 'Oil-Refinery-update' into experimentalDream-Master
2017-06-14Revert "Quick fixes"Dream-Master
This reverts commit 4a08587c07dd9c0f2a6bc783d7e8108a85438fd6.
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-10rename BioFuel to BioDieselDream-Master
add Circuits to chemical reactor recipes
2017-06-10remove old Nitric acidDream-Master
2017-06-10 a few fixesTechlone
2017-06-08remove hcl because already addedDream-Master
2017-06-08missing import classDream-Master
2017-06-07cherry pickTechlone
541144f4433044a6c0b9612e7cd7f94cf9440095 formating
2017-06-07change cables backDream-Master
2017-06-07add Oilcracker Gui with two visual input slotsDream-Master
2017-06-06buff Nitro Diesel and Ethanol to old valuesDream-Master
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-04fix integer overflowTechnus
2017-06-04Missing override addedTechnus
2017-06-04Cleanroom outputs in redstone its cleannes/efficiency.Blood-Asp
2017-06-03new fusin reactor textureDream-Master
2017-06-01Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-06-01Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-06-01Catch broken items on recipe moveBlood-Asp
2017-05-30Minor cleanupTechnus
2017-05-29Enable ALL components if dreamcraft loadedTechnus
2017-05-28Add Blaze BlockDream-Master
2017-05-28added new molds for Stick, round, long stick, ring, bolt, screwDream-Master
2017-05-22Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH
2017-05-22fix typoTechnus
2017-05-22some fixesDream-Master
2017-05-20Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-05-20Fixed Salt Water and Distillery circuit settings 1Dream-Master
Add Tube Wire Item for automate Tubes
2017-05-20derp fixDream-Master
2017-05-20Merge branch 'ChemistryUpdate' into mergeGTNHJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java src/main/java/gregtech/api/util/GT_Recipe.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/blocks/GT_Block_Casings2.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java 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-05-18Make the save/load the same as in bloodaspTechnus
2017-05-15Add low grav to proc array, - assuming that proc array is always considered ↵Technus
in a clean room, added circuit assembler to proc array
2017-05-13Fixed a bug that caused there to be two identical recipes for TiF4Johannes Gäßler
2017-05-13Added a new recipe map for the LCR, expanded the API to allow for customJohannes Gäßler
NEI stack positioning. Refactored the name of the Large Boiler Fake Fuels so they're in line with other names. Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-10Merge branch 'unstable' into mergeGTNHTechnus
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-05-09Idk, might be betterDaniel
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
2017-05-07another oil rewrite, even more BloodAsp likeTechnus
2017-05-06Expand low grav dimensionsTechnus
generated by cgit (git 2.46.0) at 2025-03-09 06:14:51 +0000