aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-09-10fix thingsTechnus
2017-09-10fix infuserTechnus
2017-09-10fix thingsTechnus
2017-09-09Nerf microwave a bitTechnus
2017-09-09Merge branch 'nh-recipes' of https://github.com/Technus/TecTech into nh-recipesTechnus
2017-09-09Nerf microwave a bitTechnus
2017-09-09update recipes and add newest core mod versionDream-Master
2017-09-06Refactor m8Technus
2017-09-06Refactor m8Technus
2017-09-02Merge branch 'master' into bassAdditionsTechnus
2017-09-02Fix server side "render"Technus
2017-09-02Fix server side "render"Technus
2017-08-29Merge branch 'master' into bassAdditionsTechnus
2017-08-29Optimize check codeTechnus
2017-08-29Optimize check codeTechnus
2017-08-28Merge branch 'master' into bassAdditionsTechnus
# Conflicts: # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
2017-08-28Make the active texture of computer more distinguishibleTechnus
2017-08-28Use proper border color on texturesTechnus
2017-08-28small changes in multiblock coreTechnus
2017-08-28Some changesTechnus
2017-08-28Some more gui and mechanics changesTechnus
2017-08-28Texturing, gui reworkTechnus
2017-08-28Make the active texture of computer more distinguishibleTechnus
2017-08-28Use proper border color on texturesTechnus
2017-08-28small changes in multiblock coreTechnus
2017-08-28Some changesTechnus
2017-08-27Some more gui and mechanics changesTechnus
2017-08-27Texturing, gui reworkTechnus
2017-08-26bugfixesTechnus
2017-08-26bugfixesTechnus
2017-08-23Merge branch 'master' into nh-recipesTechnus
2017-08-23RefactorTechnus
2017-08-23some refactorTechnus
2017-08-23Merge branch 'master' into bassAdditionsTechnus
2017-08-23Minor commentary changeTechnus
2017-08-23Minor commentary changeTechnus
2017-08-23Refactor namesTechnus
2017-08-23Refactor namesTechnus
2017-08-22Change stringsTechnus
2017-08-22Change stringsTechnus
2017-08-22Some recipe changesTechnus
2017-08-22Make em researchableTechnus
2017-08-22Merge branch 'master' into nh-recipesTechnus
# Conflicts: # src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
2017-08-22More refactorTechnus
2017-08-22Small refactorTechnus
2017-08-22Revert "remove unused code"Technus
This reverts commit ca0c96cff22641b72da222d1fb72ca33c9b00ede.
2017-08-22Merge branch 'master' into bassAdditionsTechnus
2017-08-22remove unused codeTechnus
2017-08-22Merge branch 'nh-recipes' of https://github.com/Technus/TecTech into nh-recipesTechnus
2017-08-22remove unused codeTechnus