aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2022-01-31Merge pull request #33 from GTNewHorizons/long-asslineboubou19
Long Assline
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-29Merge remote-tracking branch 'origin/master'Tec
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)
2022-01-29Cleanup EM api, encapsulateTec
(cherry picked from commit 27946d59f2f7c272f2f91ec393a35f5d26f5293e)
2022-01-29cherry pickTec
Cleanup EM maps
2022-01-29cherry pickTec
This should make the EM anomaly and projectile as it was
2022-01-29Cleanup and update EM turret projectileTec
(cherry picked from commit de8bf3e68e9e4d7cee485d0d6951a4e4ccb5859d)
2022-01-29Add aspect EM containers to creative tabTec
(cherry picked from commit bb064e24a37791838c49f5db2537acfe3cfbc36f)
2022-01-29Fix JunctionsTec
(cherry picked from commit ebd719987402bb4a60bf01a10f5b8e1480184f69)
2022-01-29Merge pull request #28 from GTNewHorizons/fix/assline-hashMartin Robertz
Fix persistent hash not set on some assline recipes
2022-01-29Merge pull request #29 from iouter/masterMartin Robertz
Modify translation numbers for localization
2022-01-29Modify translation numbers for localizationiouter
2022-01-28Fix persistent hash not set on some assline recipesGlease
2022-01-27Cleanup Atoms Localization, and FontRendererTec
2022-01-27Cleanup Atoms Localization, and FontRendererTec
2022-01-23Separate EM to new tabTec
2022-01-23Fix autocompletion for EM commandsTec
2022-01-23Rework API, add localeTec
2022-01-21Merge pull request #27 from Sphyix/masterMartin Robertz
consistency across circuits
2022-01-21Merge branch 'GTNewHorizons:master' into masterSphyix
2022-01-21fix consistency across circuitsSphyix
2022-01-20Merge pull request #26 from GTNewHorizons/GTNH-Colen-patch-2GTNH-Colen
Fix UMV energy hatch/dynamo recipe to use correct circuit
2022-01-20Fix UMV energy hatch/dynamo recipe to use correct circuitGTNH-Colen
2022-01-19Merge pull request #25 from GTNewHorizons/GTNH-Colen-patch-2Martin Robertz
Update DreamCraftRecipeLoader.java
2022-01-18add CCCJason Mitchell
2022-01-18update to explicit dependenciesJason Mitchell
2022-01-18maven publish buildscript updateJason Mitchell
2022-01-18Update DreamCraftRecipeLoader.javaGTNH-Colen
2022-01-18Minor fixesTec
generated by cgit (git 2.46.0) at 2025-03-10 07:56:51 +0000