aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2022-01-31Merge branch 'NHmaster'Tec
# Conflicts: # build.gradle
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)
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-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-23Separate EM to new tabTec
2022-01-23Fix autocompletion for EM commandsTec
2022-01-23Rework API, add localeTec
2022-01-21Merge branch 'GTNewHorizons:master' into masterSphyix
2022-01-21fix consistency across circuitsSphyix
2022-01-20Fix UMV energy hatch/dynamo recipe to use correct circuitGTNH-Colen
2022-01-18Update DreamCraftRecipeLoader.javaGTNH-Colen
2022-01-18Minor fixesTec
2022-01-18Cleanup some LocaleTec
2022-01-18Cleanup serialization of EMTec
2022-01-17Cleanup EM api, encapsulateTec
2022-01-15Cleanup EM mapsTec
2022-01-13This should make the EM anomaly and projectile as it wasTec
2022-01-09Cleanup and update EM turret projectileTec
2022-01-08Add aspect EM containers to creative tabTec
2022-01-03Change computation & time requirements on infinite pump.GTNH-Colen
Discussed in discord.
2021-12-15Adjust ultimate battery soldering alloy amountGTNH-Afx237v7
see #9131
2021-12-13Fix compat with gtpp, also fixed the buildGlease
2021-12-11add recipe for infinite oil rigboubou_19
2021-12-05Fix JunctionsTec
2021-12-02Merge branch 'GTNewHorizons:master' into masterbasdxz
2021-10-18Change to make it divisible by 144Prometheus0000
2021-10-18remove blueprint recipe. It has no use anymoreDreamMasterXXL
use structurelib blueprint instead
2021-10-18Fix cycle in class initialization orderGlease
ExtendedFacing depends on IAlignment being fully initialized to be instantiated as part of its class initializer, which in turn require ExtendedFacing to be fully initialized to complete class initialization. How does this even work before?
generated by cgit (git 2.46.0) at 2025-03-11 01:19:09 +0000