aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Expand)Author
2017-07-07cherry pickDream-Master
2017-07-06cherry pickDream-Master
2017-07-04Update IGT_RecipeAdder.javaAntifluxfield
2017-07-02reverse Recipe adder changesDream-Master
2017-07-02fix circuitsDream-Master
2017-07-02cherry pickDream-Master
2017-07-02cherry PickDream-Master
2017-07-02cherry pickJohannes Gäßler
2017-07-01cherry pickBlood-Asp
2017-06-29not need itDream-Master
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-22wrongly removed Casings 6Dream-Master
2017-06-22cherry 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-17Changes reverting part1Technus
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
2017-06-16Things cleanupTechnus
2017-06-16Merge branch 'unstable_BLOOD' into reMergeTechnus
2017-06-16Fix buffer and regulator RS signalsBlood-Asp
2017-06-15Hitboxes when holding soldering iron #1095Blood-Asp
2017-06-15Fix hitboxes resizing on holding soldering ironTechnus
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-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