aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
AgeCommit message (Expand)Author
2017-07-25add galena to the Mercury increase TagDream-Master
2017-07-25Merge branch 'GTNHexperimental' into experimental-testDream-Master
2017-07-25Increase the output chance when washing crushed Silver Ore with Mercury 70% =...Dream-Master
2017-07-24change ids from 614-620 because of the Ash changes ids were already used.Dream-Master
2017-07-24cherry pickDream-Master
2017-07-24added sub tags to Infinity, Infinity catalyst and cosmic neutroniumDream-Master
2017-07-24Added more material parts to Infinity and Infinity Catalyst. Add Cosmic Neutr...Dream-Master
2017-07-23Cherry PickJohannes Gäßler
2017-07-21Revert "remove gt obsidian"Dream-Master
2017-07-21remove gt obsidianDream-Master
2017-07-20remove EV and IV Miner because to op and no one would use Ore Drill plantsDream-Master
2017-07-20Add more miner tiers EV and IVDream-Master
2017-07-20Add HV MinerDream-Master
2017-07-16Fixed a bug where Brick, and Fireclay had the wrong texture sets.Dream-Master
2017-07-16Ash rebalance #1159Johannes Gäßler
2017-07-16fix derpDream-Master
2017-07-09Carbon ingots #1632Dream-Master
2017-07-09cherry pickDream-Master
2017-07-08Light fuel produces to much energy #1634Dream-Master
2017-07-06cherry pickDream-Master
2017-07-02cherry pickDream-Master
2017-07-02cherry pickJohannes Gäßler
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