aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Expand)Author
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-15cherrypickBlood-Asp
2017-06-14pollution smogBlood-Asp
2017-06-14changed that backDream-Master
2017-06-14Merge branch 'Oil-Refinery-update' into experimentalDream-Master
2017-06-14Revert "Quick fixes"Dream-Master
2017-06-14cherry pickDream-Master
2017-06-14fix for timber changesBlood-Asp
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-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-13Reworking DataOrb and DataStickTechlone
2017-06-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-12At last one free face.Blood-Asp
2017-06-12Only open machine gui if front is free.Blood-Asp
2017-06-12Cables and pipes now change hitboxes dynamicly depending on connections or co...Blood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
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-08missing import classDream-Master
2017-06-07cherry pickTechlone
2017-06-07change cables backDream-Master
2017-06-07formattingTechlone
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-07Quick fixesBlood-Asp
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
2017-06-07Merge pull request #1076 from vlad20012/int-overflow-fixBlood-Asp
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-06Check general redstoneoutput for nullBlood-Asp
2017-06-06cherry pick: from TechloneDream-Master
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05cherry pickDream-Master
2017-06-05Missing in item pipeTechnus
2017-06-04More redstone changesBlood-Asp
2017-06-04Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-04fix integer overflowTechnus