aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2022-05-19Fix oredictmiozune
2022-05-09Fix ScanStorage not workMuXiu1997
2022-04-23laser mode for debug genGlodBlock
2022-04-16a missing EYang Xizhi
2022-04-12Add infinity coils.GTNH-Colen
2022-04-08add config fot tesal tower visual effectGlodBlock
2022-03-20fix oredict for infinity drillYang Xizhi
i hope it will be the last time to fix the oredict thing ,,,
2022-02-25change back to 15Martin Robertz
2022-02-25change control circuit settingsMartin Robertz
2022-02-25use max control circuit rangeMartin Robertz
2022-02-25fix hint using circuit 0Martin Robertz
Change recipes using Circuit 0 in their recipes #9818 Change recipes using Circuit 0 in their recipes GT-New-Horizons-Modpack#9818
2022-02-21Remove unused importGTNH-Colen
2022-02-21MK4 Recipes, stargate adjustment and UMV circuit fix.GTNH-Colen
2022-02-09Merge branch 'master' into upstreamMartin Robertz
2022-02-09Merge pull request #39 from GTNewHorizons/xSMD-2Martin Robertz
X smd 2
2022-02-09use xsmd components in researches (just temp)Martin Robertz
2022-02-08Merge remote-tracking branch 'Technus/master' into upstreamMartin Robertz
# Conflicts: # dependencies.gradle
2022-02-08Fix saving null strings to NBT, optimize importsTec
2022-02-08Fix textures in itemsTec
2022-02-08Small changesTec
2022-02-07Merge remote-tracking branch 'Technus/master' into upstreamMartin Robertz
2022-02-06Some super scriptingTec
2022-02-06More locale workTec
2022-02-06Update TT_UtilityTec
2022-02-05Initial Orbvital afffinity implTec
2022-02-03Don't override GT5U's GT_RectHandlerYannickMG
2022-02-02Merge branch 'develop' into OrbitalAffinityTec
# Conflicts: # src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
2022-02-02Bump GT5 version, fix 484L ASMD overflow and add bio/wetware xSMD support.GTNH-Colen
2022-02-02Bump GT5 version, fix 484L ASMD overflow.GTNH-Colen
2022-02-01Sort things out in the load orderTec
2022-01-31Fix structuresTec
2022-01-31Cleanup structuresTec
2022-01-31Make font not use UTF-8 literalTec
2022-01-31Merge branch 'NHmaster'Tec
# Conflicts: # build.gradle
2022-01-31Merge branch 'GTMEGA/nh-upstream'Tec
2022-01-31Merge branch 'Yote'Tec
# Conflicts: # build.gradle.kts # dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar # gradle.properties # real.gradle.properties # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java # src/main/java/com/github/technus/tectech/loader/MainLoader.java # src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java # src/main/java/com/github/technus/tectech/proxy/ClientProxy.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.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_crafting.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.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_quantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.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_EM_transformer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.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_MetaTileEntity_MultiblockBase_EM.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
2022-01-31Merge branch 'GTNH/Upstream'Tec
# Conflicts: # build.gradle.kts # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java # src/main/java/com/github/technus/tectech/loader/MainLoader.java # src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java # src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java # src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java # src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.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/em_collider/GT_MetaTileEntity_EM_collider.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
2022-01-31Make the TT_RecipeAdder accept AssemblyLine recipes with 16 inputsglowredman
2022-01-30Merge branch 'GTMEGA/master'Tec
# Conflicts: # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java # src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java # src/main/java/com/github/technus/tectech/loader/MainLoader.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.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/em_collider/GT_MetaTileEntity_EM_collider.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
2022-01-30Merge branch 'GTNH/Upstream'Tec
# Conflicts: # build.gradle.kts
2022-01-29Cleanup Atoms Localization, and FontRendererTec
(cherry picked from commit 95614e658c1e5e00b002fd9f4e33fce49f1394fd)
2022-01-29Cleanup Atoms Localization, and FontRendererTec
2022-01-29Cleanup Atoms Localization, and FontRendererTec
(cherry picked from commit ac8311109c91731598466dbd9068f8c995b1d760)
2022-01-29Cleanup Atoms Localization, and FontRendererTec
(cherry picked from commit 7adcaf6d9b4a8628711a01ce2467f13582cea7d5)
2022-01-29Separate EM to new tabTec
(cherry picked from commit caff4351909ce59637348c6be94271cf1d1c0a9c)
2022-01-29Fix autocompletion for EM commandsTec
(cherry picked from commit e37d21d8141e82eee9d87d4bb137c44977db8625)
2022-01-29cherry pickTec
Rework API, add locale
2022-01-29Minor fixesTec
(cherry picked from commit 62021d238a0c38401b50211d59e72e169399f444)
2022-01-29Cleanup some LocaleTec
(cherry picked from commit 975bf105794ac48b1415d4e78946449fbb68bcaf)
2022-01-29Cleanup serialization of EMTec
(cherry picked from commit 44c86af58ecb24de8ba66fa6cf8fa81324a32a28)
generated by cgit (git 2.46.0) at 2025-03-10 23:30:48 +0000