aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-24bump dependencies to build on jenkinsDream-MasterXXL
2019-05-21Cleanup some strings and add creative data hatchTec
2019-04-23Change recipe of Biomainframe (#15)Спартак
The recipe became more logic.
2019-03-19Added recipes for Energy hatches 4A-64A IV/LUV/ZPMDream-Master
2019-03-15Cherrypick fixBass
2019-03-11fix bit render to stringTec
2019-03-11fix advanced parametrizerTec
2019-03-11remove use of old apiTec
2019-03-11just check if validTec
2019-03-11just check if validTec
2019-03-11Merge branch 'betterParametrizers' into BassAddonsTec
2019-03-11fix small overlookTec
2019-03-11fix small overlookTec
2019-03-11Merge branch 'betterParametrizers' into BassAddonsTec
# Conflicts: # build.properties # src/main/java/com/github/technus/tectech/Util.java # src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
2019-03-11fix disTec
2019-03-11Yay for multi amp tesla towers!basdxz
fuck I broke hysteresis again
2019-03-11Fix Computer Rack Crash BugBass
2019-03-11Nevermind merging bROKE SHITBass
2019-03-11remove castTec
2019-03-11tweak guiTec
2019-03-11tweak guiTec
2019-03-10hmm sakeTec
2019-03-10doneTec
2019-03-10Merge branch 'betterParametrizers' of https://github.com/Technus/TecTech ↵Tec
into betterParametrizers
2019-03-10storing workTec
2019-03-10Fix typobasdxz
2019-03-09Capacitor Hatch Workbasdxz
Capacitor hatches should now know about what capacitors exist
2019-03-08Tesla Capacitor Item Redonebasdxz
Tesla capacitors now use meta ids with different unlocalized names unlike before
2019-03-08Merge remote-tracking branch 'origin/master' into bassAdditionsbasdxz
2019-03-07Really Ultimate Battery recipes is lack #4204Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/4204 bump version for new release
2019-03-03Merge pull request #14 from bartimaeusnek/stargatefixMartin Robertz
stargate fix
2019-03-03stargate fixbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2019-02-23fix gradle againDream-Master
2019-02-23fix gradle againDream-Master
2019-02-23now it should workDream-Master
fix gradle again
2019-02-23update gt versionDream-Master
2019-02-23update gt versionDream-Master
2019-02-23update gt versionDream-Master
2019-02-23fix gradleDream-Master
2019-02-23fix forge gradleDream-Master
2019-02-23fix forge gradleDream-Master
2019-02-19Most likely the param api will look like this.Tec
2019-02-18Storing workTec
2019-02-18Tesla CapacitorsBass
Adding me some Tesla capacitors, additionally cleaned the Tesla covers to not require a bunch of trash.
2019-02-18Tesla Casings (They now exist?)Bass
(But I have no idea how texture setting even WORKS XD)
2019-02-18Tesla CasingsBass
Today in Bass learns Java: Tec watches in horror as Bass decides to allocate himself casing ids 200-299 without asking permission while still procrastinating doing any sort of custom texture work!
2019-02-18Merge remote-tracking branch 'origin/bassAdditions' into bassAdditionsBass
2019-02-18Tesla Tesla TeslaBass
You guessed it, more tesla work xd
2019-02-17Merge remote-tracking branch 'origin/bassAdditions' into bassAdditionsBass
2019-02-17Revert "Merge remote-tracking branch 'origin/betterParametrizers' into ↵Bass
bassAdditions" This reverts commit 5706ba13565c496c119e6ce07913da3f1e809ff3.