aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-03Merge pull request #24 from GTNewHorizons/GTNH-Colen-patch-2Martin Robertz
Change computation & time requirements on infinite pump.
2022-01-03Change computation & time requirements on infinite pump.GTNH-Colen
Discussed in discord.
2021-12-24Fix dependencyJohann Bernhardt
2021-12-24Adjust ultimate battery soldering alloy amountGTNH-Afx237v7
see #9131
2021-12-24Merge pull request #19 from GTNewHorizons/unified-build-scriptBass
GTNewHorizons/TecTech/pull/19 Update buildscript Unify build script