aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Expand)Author
2017-07-02cherry PickDream-Master
2017-07-02cherry pickJohannes Gäßler
2017-07-01cherry pickDream-Master
2017-07-01cherry pickBlood-Asp
2017-06-29Add missing importTechnus
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-25spellingDream-Master
2017-06-25fix spellingDream-Master
2017-06-25Revert "Fixed recipes robot arm and Sensors using wrong circuits"Dream-Master
2017-06-25Fixed recipes robot arm and Sensors using wrong circuitsDream-Master
2017-06-24cherry pickJohannes Gäßler
2017-06-24cherry pickJohannes Gäßler
2017-06-23Add new Circuit PartsDream-Master
2017-06-22cherry pickJohannes Gäßler
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into BrickedBla...Dream-Master
2017-06-19Minor change, full revert.Technus
2017-06-18Revert worldgen changes.Technus
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 branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into u...Blood-Asp
2017-06-17Extended logging for AssemblylineBlood-Asp
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
2017-06-17Cleaned up to ore processingTechnus
2017-06-17Changes reverting part1Technus
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-16Added Interface classes for the BBF, increased slots to 3/3Johannes Gäßler
2017-06-16Things cleanupTechnus
2017-06-16Merge branch 'unstable_BLOOD' into reMergeTechnus
2017-06-15Fix hiding of unused ores. #1062Blood-Asp
2017-06-15Fix to runnable stateTechnus
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-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
2017-06-15Improve fog density calculationBlood-Asp
2017-06-15cherrypickBlood-Asp
2017-06-15Improve fog density calculationBlood-Asp
2017-06-14pollution smogBlood-Asp
2017-06-14cherry pickDream-Master
2017-06-14cherry pickDraknyte1
2017-06-14cherry pickBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14Merge branch 'Oil-Refinery-update' into experimentalDream-Master
2017-06-14Revert "Quick fixes"Dream-Master
2017-06-14cherry pickDream-Master
2017-06-14cherry pickTechlone
2017-06-14Made the Cleanroom optional.Draknyte1