aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2020-04-14Merge branch 'master' of https://github.com/Technus/TecTechTec
2020-04-14Refactor to internal texture arrays.Tec
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-08Fix blocksTec
2020-04-07Merge branch 'master' into BassAddonsTec
# Conflicts: # build.properties
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-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-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-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
2019-11-29Merge remote-tracking branch 'origin/master' into BassAddonsUnknown
2019-11-28Fix some recipes with molten materialsСпартак
2019-11-14Actually fixed crash on Tesla tower removalBass
2019-11-14Revert "Fixed crash on Tesla tower removal"Bass
This reverts commit 01088f97ac790a062308e193de1732f8775abc63.
2019-11-14Fixed crash on Tesla tower removalBass
nested the onRemoval() due to an occasional java.lang.NullPointerException: Ticking memory connection
2019-11-14Lang functional completionBass
Almost every string should now be present in the lang file, anyone is welcome to contribute additional lang support for other locales.
2019-11-12Lang work Bass
2019-11-10Removing debug codeBass
2019-11-09Lang even harderBass
2019-11-09Slight lang reformatBass
2019-11-01fixed fix for research station researchTechnus
2019-10-25Add missing side onlyTec
2019-10-25Add missing server side disablesTec
2019-10-01Depreacte broken api, refactor field namesTec
2019-10-01Fix retardationTec
2019-10-01Merge branch 'decayGen' into BassAddonsTec
# Conflicts: # src/main/java/com/github/technus/tectech/thing/CustomItemList.java
2019-10-01Fix ParamTxtTec
2019-09-14okbuddyBass
2019-09-01Even even more Lang + right click fixBass
2019-09-01Lang even moreBass
2019-09-01Decay Generator Housekeeping proceedureBass
2019-08-31Lang continuedBass
2019-08-30Unethical Housekeeping ProcedureBass
Forgive me father, for I have sinned.
2019-08-29more langBass
2019-08-29Last one before bedBass
2019-08-29Lang streamlineBass
2019-08-29RefleccBass
2019-08-29This is only a testBass
2019-08-29ABass
2019-08-29EBass
generated by cgit (git 2.46.0) at 2025-03-10 00:31:31 +0000