aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-30fix Cobalt brass quest wants too much dust #9631Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9631 remove smale pile cobalt brass recipe
2022-01-30Merge branch 'GTNH/Upstream'Tec
# Conflicts: # build.gradle.kts
2022-01-30Waila handling was all in one place, distribute it now that it's in GT5u ↵Jason Mitchell
proper. (#907)
2022-01-30Merge pull request #104 from boubou19/masterMartin Robertz
fix small oversight on thaumcraft saplings
2022-01-30fix small oversight on thaumcraft saplingsboubou_19
2022-01-30Merge pull request #102 from GTNewHorizons/St00fMartin Robertz
St00f
2022-01-30Add compat for EnumHelper to Element#get (#908)Glease
2022-01-30Integrate Botdustries, add recipesunknown
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 #97 from Steelux8/Rocketdyne_TooltipMartin Robertz
Rocketdyne Tooltip Changes
2022-01-29Merge pull request #94 from Sphyix/masterMartin Robertz
Tree Growth Simulator different wood outputs
2022-01-29Minor Clean-up/Regression.Alkalus
2022-01-29GUI Fixes for Matter Fab.Alkalus
2022-01-29Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00fAlkalus
# Conflicts: # .gitignore # dependencies.gradle # src/main/java/gtPlusPlus/core/config/ConfigHandler.java # src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java # src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java # src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java # src/main/resources/assets/miscutils/lang/en_US.lang
2022-01-29Overhauled Matter Fabricator CPU.Alkalus
2022-01-29Added new crop.Alkalus
Added Wireless Charger locking. Fixed Cyclotron leaving bad input stacks. Improve Block localization.
2022-01-29Merge pull request #28 from GTNewHorizons/fix/assline-hashMartin Robertz
Fix persistent hash not set on some assline recipes
2022-01-29Fixed Magic Feather death handling.Alkalus
Improved Magic Feather beacon handling.
2022-01-29Re-allow removal of debuffs when sleeping.Alkalus
Localized chat strings.
2022-01-29Added Mob Mentality.Alkalus
Added perks to sleeping. Added Magic Feather.
2022-01-29Add LV and MV muffler recipes to assembler (#904)bombcar
* Add LV and MV muffler recipes to assembler * Add LV and MV muffler recipes to assembler
2022-01-29Merge pull request #29 from iouter/masterMartin Robertz
Modify translation numbers for localization
2022-01-28Bring Waila handling in houseJason Mitchell
Update deps
2022-01-28Merge pull request #101 from GTNewHorizons/runclientMartin Robertz
Update buildscript and dependencies to allow runClient
2022-01-29Modify translation numbers for localizationiouter
2022-01-28Reserve IDs for GalaxySpace (#81)glowredman
Former-commit-id: 1cfb8e9a10611aa43bdda0367f75c0b3011ba126
2022-01-28Texture tooltips update (#903)Colen
* New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com> * Fixed github shenanigans with new tier colours. * Update A LOT of textures (mostly minor) * Remove extraneous comments. * Remove obsolete comments and update materials.java. * Add tooltips for all batteries in base GT. * Remove test case Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com>
2022-01-28Update buildscript and dependencies to allow runClientbombcar
runClient needs to have the libraries for NEI to be present so they are compile instead of compileOnly.
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-27update buildscript, make github understand the license (#902)bombcar
* update buildscript, make github understand the license * LGPL-3.0
2022-01-27Add new xSMDs (#894)GTNH-Colen
* Add new xSMDs and xSMD wraps. * Add new xSMDs and xSMD wraps.
generated by cgit (git 2.34.1) at 2026-05-27 05:23:35 +0000