aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-06-15Cherry PickDream-Master
2017-06-15cherry pickDream-Master
2017-06-15Improve fog density calculationBlood-Asp
2017-06-15cherrypickBlood-Asp
2017-06-14fixed derpDream-Master
2017-06-14cherry pickDream-Master
2017-06-14cherry pickDream-Master
2017-06-14bump versionDream-Master
2017-06-14changed that backDream-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-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-12cherry pick:Dream-Master
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-10fixed a few more recipesDream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
2017-06-10remove old Nitric acidDream-Master
2017-06-10 a few fixesTechlone
2017-06-09cherry pickJohannes Gäßler
2017-06-08remove hcl because already addedDream-Master
2017-06-08missing import classDream-Master
2017-06-08remove the recipe because already in the codeDream-Master
2017-06-07cables are to expensivevlad20012
2017-06-07cherry pickTechlone
2017-06-07change cables backDream-Master
2017-06-07bump versionDream-Master
2017-06-07cherry pick:Johannes Gäßler
2017-06-07add Oilcracker Gui with two visual input slotsDream-Master
2017-06-06Added 6 Input slots to AssemblerDream-Master
2017-06-06buff Nitro Diesel and Ethanol to old valuesDream-Master
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master
2017-06-06Merge branch 'OreDrills' into experimentalDream-Master
2017-06-06bump versionDream-Master
2017-06-06cherry pick: from TechloneDream-Master
2017-06-05fix typoDream-Master
2017-06-05try this idDream-Master
2017-06-05because this id was used by the core mod.Dream-Master
2017-06-05cherry pickDream-Master
2017-06-05cherry pick:Johannes Gäßler
2017-06-05Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5Johannes Gäßler
2017-06-05Adjust Thiccnes for things from bloodasp branchTechnus
2017-06-04Merge branch 'mergeGTNH' into experimentalTechnus
2017-06-04bump versionDream-Master
2017-06-04Merge branch 'mergeGTNH' into experimentalDream-Master