aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2016-09-16Reduce Marble/Basalt harvest level and setOreBlock fixesMuramasa
2016-09-16Fix it againMuramasa
2016-09-16One more conflictMuramasa
2016-09-16Fix conflictsMuramasa
2016-09-15Fix Tools and lag on reading tooltipBlood-Asp
2016-09-15Update Part 1Muramasa
2016-09-15Add Magneticraft compatBlood-Asp
and remove Thaumcraft changes because of bugs/no improvements And add config to arc smelt not annealed/wought.
2016-09-13Merge branch 'refs/heads/Blood-Asp/experimental' into BugfixesMuramasa
2016-09-13Merge pull request #631 from Muramasa-/LoadTimesMuramasa-
Various Load Time Improvements
2016-09-13Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial ↵Blood-Asp
into experimental
2016-09-13Gave away new bock ids.Blood-Asp
2016-09-08Scanner done.Technus
2016-09-08scanner doneTechnus
2016-09-08ScannerTechnus
2016-09-08Scanner spacebars O:Technus
2016-09-08Scanner workTechnus
2016-09-07Scanner 2Technus
2016-09-07More work on scannerTechnus
2016-09-07Scanner 1Technus
2016-09-07Ading textures - if possible cherry pick into mainTechnus
2016-09-04Revert "Update GT_RecipeAdder.java"Technus
This reverts commit 4c4c26043fd8b9175388db053ad6367a1b79d74b.
2016-09-04Update GT_RecipeAdder.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Steam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Steam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03remove empty classDream-Master
2016-09-03Update GT_MetaTileEntity_LargeTurbine.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Plasma.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_Gas.javaDaniel
2016-09-03Update GT_MetaTileEntity_LargeTurbine_HPSteam.javaDaniel
2016-09-03remove pollution tooDream-Master
2016-09-03Pollution removeDream-Master
2016-09-02Change Long Rods to RodsMartin Robertz
Change Energy Values a bit.
2016-09-02Change Long Rods to rodsMartin Robertz
2016-09-02Merge pull request #15 from GTNewHorizons/Fusion-MORE-STUFFMartin Robertz
Update GT_MachineRecipeLoader.java
2016-09-01Naquadah Reactor fixes Part 2Dream-Master
2016-09-01Update GT_MachineRecipeLoader.javaDaniel