aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-14Revert "Quick fixes"Dream-Master
This reverts commit 4a08587c07dd9c0f2a6bc783d7e8108a85438fd6.
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-14cherry pickTechlone
156bb2b06b942f35efa6719c856a9911b1f9f62e Tooltips changing
2017-06-14Merge pull request #1091 from draknyte1/unstableBlood-Asp
Made the Cleanroom optional.
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
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-13Merge pull request #1088 from Techlone/reworking_dataorbBlood-Asp
Reworking DataOrb and DataStick
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-13Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
2017-06-13Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into ↵Techlone
unstable
2017-06-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-12cherry pick:Dream-Master
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731
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 ↵Blood-Asp
covers
2017-06-12change back the component heat exchanger damage valueBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-10Merge pull request #1083 from Techlone/unstableBlood-Asp
More fixes for the world gen
2017-06-10fixed a few more recipesDream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
add Circuits to chemical reactor recipes
2017-06-10remove old Nitric acidDream-Master
2017-06-10 a few fixesTechlone
2017-06-09cherry pickJohannes Gäßler
74c41614a5e8a6cb49e62a225669a1e1d07bc87b
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-08fix wrong center chunk coordinatesTechlone
2017-06-08Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
2017-06-07cables are to expensivevlad20012
2017-06-07cherry pickTechlone
541144f4433044a6c0b9612e7cd7f94cf9440095 formating
2017-06-07change cables backDream-Master
2017-06-07experimental worldgen change fixBlood-Asp
2017-06-07formattingTechlone
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07Merge branch 'advminer2_improvements' of ↵Techlone
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
2017-06-07Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
2017-06-07Quick fixesBlood-Asp
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java