aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-20Refactor to provider and add another helper method for compatiblilityTec
2020-04-19Idk why but okTec
2020-04-19Merge branch 'BassAddons' of https://github.com/Technus/TecTech into BassAddonsTec
2020-04-19Merge branch 'master' of https://github.com/Technus/TecTechTec
2020-04-19Fix pipes, implement ExtendedFacing, bump versionTec
2020-04-19update gt dependencieDreamMasterXXL
2020-04-19Fix gradle run client?Tec
2020-04-19Merge branch 'master' of https://github.com/Technus/TecTechTec
2020-04-19Null check this stuffTec
2020-04-19Null check this stuffTec
2020-04-19Should load more reliably...Tec
2020-04-19update GTTec
2020-04-19Attempt to upgrade gradle to 4.8.1Tec
2020-04-14Merge branch 'master' into BassAddonsBass
2020-04-14Bump versionBass
IV-ZPM High Amp Hatch Recipes Internal Texture Arrays Refactor Fixed BloodAsp Compatibility
2020-04-14Merge branch 'BassAddons'Tec
2020-04-14Update GT dependencyTec
2020-04-14Merge branch 'master' of https://github.com/Technus/TecTechTec
2020-04-14Refactor to internal texture arrays.Tec
2020-04-14Merge remote-tracking branch 'origin/master' into BassAddonsBass
2020-04-08Add recipe for IV-ZPM high amp energy hatches #25Dream-Master
https://github.com/Technus/TecTech/issues/25
2020-04-08Add recipe for IV-ZPM high amp energy hatches #25Dream-Master
https://github.com/Technus/TecTech/issues/25
2020-04-08Add recipe for IV-ZPM high amp energy hatches #25Dream-Master
https://github.com/Technus/TecTech/issues/25
2020-04-08Update avrTec
2020-04-08Fix blocksTec
2020-04-07Merge branch 'BassAddons'Tec
2020-04-07Merge branch 'master' into BassAddonsTec
# Conflicts: # build.properties
2020-04-07update gt for jenkins buildDream-Master
(cherry picked from commit f988d3bc726794e919b31bd2396432b2ceb2a9d3)
2020-04-07update gt for jenkins buildDream-Master
2020-04-07Add recipe for IV-ZPM high amp energy hatches #25 (#26)Martin Robertz
* Add recipe for IV-ZPM high amp energy hatches #25 https://github.com/Technus/TecTech/issues/25 * bump version and gt dependencie to let jenkins build
2020-04-07Add recipe for IV-ZPM high amp energy hatches #25 (#26)Martin Robertz
* Add recipe for IV-ZPM high amp energy hatches #25 https://github.com/Technus/TecTech/issues/25 * bump version and gt dependencie to let jenkins build
2020-03-27Block nerf (#24)Martin Robertz
* put Irontank mod to the withelist of BlockNerf * bump gt dependencie
2020-02-29bump versionDream-Master
2020-02-29Merge remote-tracking branch 'origin/BassAddons' into BassAddonsBass
2020-02-29Update GT5u VersionBass
2020-02-29Update GT5u VersionBass
2020-02-29Merge remote-tracking branch 'origin/BassAddons' into BassAddonsBass
2020-02-29Optical Connector FixBass
Quick issue patch for Kiwi233 Fixes Optical master connector and Optical slave connector having GUIs on right click
2019-12-28Update zh_CN.lang (#23)Kiwi
2019-12-27Update build.propertiesDaniel
2019-12-27Update build.propertiesDaniel
2019-12-27added deobfs jar (#22)bartimaeusnek
2019-12-10Ultimate battery( and really ultimate) recipes aren't consistent with ↵Dream-Master
previous batterys recipes. #5162 https://github.com/GTNewHorizons/NewHorizons/issues/5162 (cherry picked from commit 32b65532b12ad3418e7ac29c5c3c6da254dd1f4e)
2019-12-10Ultimate battery( and really ultimate) recipes aren't consistent with ↵Dream-Master
previous batterys recipes. #5162 https://github.com/GTNewHorizons/NewHorizons/issues/5162
2019-12-06Add BuildCraft as a libraryBass
2019-12-04Merge remote-tracking branch 'origin/BassAddons' into BassAddonsBass
2019-12-04tiny tesla fixBass
2019-12-04Merge branch 'master' into BassAddonsTec
2019-12-04Merge branch 'master' of https://github.com/Technus/TecTechTec
# Conflicts: # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
2019-12-04Just in case add null checcTec