aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
AgeCommit message (Expand)Author
2017-06-29Fixed 2 formulas #1122Dream-Master
2017-06-29Cleanup materials whitespace.Technus
2017-06-27cherry pickJohannes Gäßler
2017-06-24cherry pickJohannes Gäßler
2017-06-23Add new Circuit PartsDream-Master
2017-06-23hopfully fixedDream-Master
2017-06-23Cherry PickJohannes Gäßler
2017-06-20Circuit Assembler progression #1541Dream-Master
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into BrickedBla...Dream-Master
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
2017-06-16Things cleanupTechnus
2017-06-15Fix to buildable stateTechnus
2017-06-15Merge branch 'experimental' into reMergeTechnus
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
2017-06-15change materials back to old burn vauluesDream-Master
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
2017-06-15cherry pickDream-Master
2017-06-14cherry pickDream-Master
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
2017-06-10remove old Nitric acidDream-Master
2017-06-10 a few fixesTechlone
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
2017-06-08remove hcl because already addedDream-Master
2017-06-07change cables backDream-Master
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
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
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation -...Techlone
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
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-20Fixed Salt Water and Distillery circuit settings 1Dream-Master
2017-05-20Merge branch 'ChemistryUpdate' into mergeGTNHJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
2017-05-06Revert Dream's doings, re enable materialsTechnus
2017-05-06remove this material dependenciesDream-Master
2017-05-05remove enable or disable solar panel recipes because always enable. Move reci...Dream-Master