aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-08buildscript and depsbombcar
2022-02-08Merge remote-tracking branch 'Technus/master' into upstreamMartin Robertz
# Conflicts: # dependencies.gradle
2022-02-08Merge branch 'develop'Tec
2022-02-08Fix saving null strings to NBT, optimize importsTec
2022-02-08Merge branch 'develop'Tec
2022-02-08Fix textures in itemsTec
2022-02-08Merge branch 'release/5.0.3'Tec
2022-02-08Small changesTec
2022-02-07Change GT++ versionTec
2022-02-07remove dependenciesTec
2022-02-07Merge branch 'master' into developTec
2022-02-07Change GT++ versionTec
(cherry picked from commit 5bd1be82b8a4004f0d26cc41d4f1f1c10c2ef7a1)
2022-02-07Add world edit cuiTec
(cherry picked from commit 719fdf6f550c0ab9c69eedefed55aefbf5a07187) (cherry picked from commit 26559493eb8460c5d32f577d7d7fa9733155c631)
2022-02-07Revert "Cleanup master dependencies"Tec
This reverts commit 527bac2a9c75b0aa57eaf7540e4b046bab68d913. (cherry picked from commit ef47ffd57dc4697aee7f5db7ac4c65c5e0780efb)
2022-02-07Merge tag '5.0.2' into developTec
2022-02-07Merge branch 'develop'Tec
2022-02-07Change GT++ versionTec
2022-02-07Add world edit cuiTec
(cherry picked from commit 719fdf6f550c0ab9c69eedefed55aefbf5a07187)
2022-02-07Revert "Cleanup master dependencies"Tec
This reverts commit 527bac2a9c75b0aa57eaf7540e4b046bab68d913.
2022-02-06Licensebombcar
2022-02-06restore our buildscrpitsbombcar
2022-02-07remove avr code submoduleMartin Robertz
2022-02-07ignore bat filesMartin Robertz
2022-02-07Merge remote-tracking branch 'Technus/master' into upstreamMartin Robertz
2022-02-06Merge branch 'feature/Locale' into developTec
2022-02-06Some super scriptingTec
2022-02-06More locale workTec
2022-02-06Merge tag '5.0.1' into developTec
2022-02-06Merge branch 'release/5.0.1'Tec
2022-02-06Update TT_UtilityTec
2022-02-05Merge branch 'release/5.0.0'Tec
# Conflicts: # dependencies.gradle
2022-02-05Merge branch 'feature/OrbitalAffinity' into developTec
2022-02-05Initial Orbvital afffinity implTec
2022-02-04Merge pull request #37 from GTNewHorizons/nei-rect-handler-cleanupMartin Robertz
Don't override GT5U's GT_RectHandler
2022-02-03Don't override GT5U's GT_RectHandlerYannickMG
2022-02-02Merge branch 'OrbitalAffinity' into feature/OrbitalAffinityTec
2022-02-02no messageTec
2022-02-02Merge branch 'master' into developTec
# Conflicts: # dependencies.gradle
2022-02-02Merge branch 'develop' into OrbitalAffinityTec
# Conflicts: # src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
2022-02-02Cleanup master dependenciesTec
2022-02-02Add world edit cuiTec
2022-02-01Sort things out in the load orderTec
2022-02-01Make the gaem boot with all the nice stuffTec
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
generated by cgit (git 2.46.0) at 2025-03-11 02:48:10 +0000