aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
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-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
2019-08-29Further sacrifices Bass
2019-08-28Minor refactors to please the godsBass
2019-08-27GENERICSTec
2019-08-27Merge branch 'master' into BassAddonsTec
# Conflicts: # src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java # src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java # src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
2019-08-27Push so i dont lose itTec
2019-08-27Lang Extra Extra?Bass
2019-08-27Reformatted a file that has been bugging meBass
2019-08-26I am bad at git EBass
2019-08-26Lang continued!Bass
2019-08-25Tesla Network Code StreamlineBass
2019-08-25More LangBass
2019-08-24Lang extrasBass
2019-08-23Additional Lang Bass
2019-08-23Experimental Lang StuffBass
2019-08-23Zeta ReadyBass
2019-08-23Capacitor Hatch RecipesBass
2019-08-23Tesla Cover RecipesBass
Along with a tiny Enum refactor
2019-08-23Capacitor RecipesBass
2019-08-23Recipes & RefactorsBass
Refactors to match GT5u Naming conventions Recipes for Tesla transceivers