aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Expand)Author
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-15remove this recipe because overlayDream-Master
2017-06-15Vacuum freezer should be hv age able to crafting. Lower the circuits to advan...Dream-Master
2017-06-15change materials back to old burn vauluesDream-Master
2017-06-15Cherry PickDream-Master
2017-06-15cherry pickDream-Master
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-14fixed derpDream-Master
2017-06-14cherry pickDream-Master
2017-06-14cherry pickDream-Master
2017-06-14fix IC Classic compat #1090Blood-Asp
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-14Made the Cleanroom optional.Draknyte1
2017-06-14improve cleanroom tooltipBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-Asp
2017-06-13wood plank compressor recipe #1013Blood-Asp
2017-06-13missed one fileBlood-Asp
2017-06-13Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-13Port GT6 timber changesBlood-Asp
2017-06-13meh...Blood-Asp
2017-06-13Tooltips changingTechlone
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-12cherry pick:Dream-Master
2017-06-12At last one free face.Blood-Asp
2017-06-12Only open machine gui if front is free.Blood-Asp
2017-06-12Cables and pipes now change hitboxes dynamicly depending on connections or co...Blood-Asp
2017-06-12change back the component heat exchanger damage valueBlood-Asp
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