aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
AgeCommit message (Expand)Author
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-23Add new Circuit PartsDream-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-17Cleaned up to ore processingTechnus
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-14cherry pickDream-Master
2017-06-14cherry pickTechlone
2017-06-13wood plank compressor recipe #1013Blood-Asp
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-06Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for m...Blood-Asp
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-01Fix comb processing recipes #1052Blood-Asp
2017-06-01Disable switching armor gui because of broken syncBlood-Asp
2017-06-01Catch login armor crashBlood-Asp
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-05-31Fix comb processing recipes #1052Blood-Asp
2017-05-31Disable switching armor gui because of broken syncBlood-Asp
2017-05-31Catch login armor crashBlood-Asp
2017-05-28fixed derpsDream-Master
2017-05-28removed empty shape plateDream-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-02make things more easy and realisticDream-Master
2017-05-01more advanced circuit Board changesDream-Master
2017-05-01Added back Etched wiresDream-Master
2017-05-01Optimize importsTechnus
2017-05-01Added Advanced Fiber Glass BoardDream-Master
2017-04-30integrated processor changesDream-Master
2017-04-30Epoxid Board changesDream-Master
2017-04-30rework circuits Basic and GoodDream-Master
2017-04-30Added new Boards and new fluidsDream-Master
2017-04-27BuildableTechnus
2017-04-27Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)Technus
2017-04-19Added a lot of (petro)chemistry stuff, expanded the APIJohannes Gäßler
2017-03-31catch most modular armor crashesBlood-Asp
2017-03-31Add assemblyrecipes for all circuits per oredictBlood-Asp
2017-03-22Fix spelling of wafersBlood-Asp
2017-03-16Fix for negative-coordinate vein generation, adjustments to recipes for stone...MauveCloud