Commit Graph
649 Commits
Author SHA1 Message Date
Martin Robertz b36215c817 Merge branch 'master' into dev 1.4.9-gtnh-pre 2024-12-31 14:02:09 +01:00
Martin Robertz 954f5eec37 update 1.4.8-gtnh 2024-12-31 14:01:51 +01:00
lordIcocainandMaya 319dcc95df Prevent Universal Wireless crafting terminal void items. (#254)
Co-authored-by: Maya <[email protected]>
2024-12-30 21:16:00 -06:00
Martin Robertz 2b53beff01 Merge remote-tracking branch 'hiroscho/fix/same-network-multiple-extract-only-storage-bus' into dev 1.4.7-gtnh-pre 2024-12-30 20:58:35 +01:00
Martin Robertz f25928c014 Merge remote-tracking branch 'origin/fix-essentia-level-maintaining' into dev 2024-12-30 20:58:31 +01:00
Martin Robertz 9b142a9ee4 Merge remote-tracking branch 'lordIcocain/walrus_potential' into dev 2024-12-30 20:58:24 +01:00
Martin Robertz ec02446519 Merge remote-tracking branch 'lordIcocain/Super_Multiply_Super_Divide' into dev 2024-12-30 20:58:17 +01:00
Martin Robertz 0cf0eb151c Merge branch 'master' into dev
# Conflicts:
#	dependencies.gradle
2024-12-30 20:57:41 +01:00
Martin Robertz b663d87801 update 1.4.6-gtnh 2024-12-30 20:56:51 +01:00
Maya bd128f59db Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2024-12-29 19:52:21 -06:00
Maya e187ef370e Merge branch 'master' into fix-essentia-level-maintaining 2024-12-29 19:52:07 -06:00
Maya 36644fa59a Merge branch 'master' into walrus_potential 2024-12-29 19:51:54 -06:00
Maya 43b3b619e8 Merge branch 'master' into Super_Multiply_Super_Divide 2024-12-29 19:51:45 -06:00
glowredman 0df88f2305 Cleanup (#253) 2024-12-29 19:51:31 -06:00
lordIcocain 29b000ff59 fix 2024-12-27 21:21:30 +02:00
lordIcocain 6cdc253867 fix 2024-12-27 19:51:48 +02:00
lordIcocain 3f3be51fc4 real 2024-12-27 17:15:26 +02:00
Alexdoru c74d7cabd3 rm 2024-12-27 11:46:33 +02:00
Martin Robertz 3ff6d7e9d6 update 1.4.5-gtnh-pre 2024-12-27 10:19:12 +01:00
Martin Robertz 424721a1b9 Merge remote-tracking branch 'lordIcocain/Super_Multiply_Super_Divide' into dev 2024-12-27 10:18:42 +01:00
Martin Robertz 504dfb51af Merge branch 'master' into Super_Multiply_Super_Divide 2024-12-27 10:18:30 +01:00
Martin Robertz 86e421a4c0 Merge remote-tracking branch 'lordIcocain/walrus_potential' into dev 2024-12-27 10:18:22 +01:00
Martin Robertz 892112756a Merge remote-tracking branch 'origin/fix-essentia-level-maintaining' into dev 2024-12-27 10:18:11 +01:00
Martin Robertz a716f528c2 Merge remote-tracking branch 'hiroscho/fix/same-network-multiple-extract-only-storage-bus' into dev 2024-12-27 10:17:54 +01:00
Martin Robertz 91b8e2b25c Merge remote-tracking branch 'origin/asm' into dev 2024-12-27 10:17:40 +01:00
Martin Robertz 4a39cf4ece update 1.4.4-gtnh 2024-12-27 10:16:39 +01:00
lordIcocain 94be0bc52c conflicts... 2024-12-27 11:15:41 +02:00
lordIcocain 24b2e0a20b Merge branch 'master' into Super_Multiply_Super_Divide 2024-12-27 11:09:51 +02:00
lordIcocain 9d8447c002 super 2024-12-27 10:39:28 +02:00
Maya 486bd52417 Merge branch 'master' into walrus_potential 2024-12-26 23:39:11 -06:00
Maya 8069a1cf5f Merge branch 'master' into asm 2024-12-26 20:20:39 -06:00
lordIcocainandMartin Robertz e0aed44bcf Skip this side check if fluid conduit not connected. (#249)
Co-authored-by: Martin Robertz <[email protected]>
2024-12-26 16:11:02 -06:00
Martin Robertz ff70fc4264 Merge branch 'master' into walrus_potential 2024-12-26 22:55:54 +01:00
Martin Robertz 2876db6772 Merge branch 'master' into fix-essentia-level-maintaining 2024-12-26 22:55:35 +01:00
Martin Robertz 51d6de3242 Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2024-12-26 22:50:56 +01:00
Maya 55f48a98f4 update 1.4.2-gtnh 2024-12-26 12:13:41 -06:00
lordIcocainandMartin Robertz d85e09dda3 Add Fluid Void Cell (#234)
Co-authored-by: Martin Robertz <[email protected]>
2024-12-26 12:11:43 -06:00
Martin Robertz d7e034dcf7 Merge branch 'master' into walrus_potential 2024-12-22 00:31:02 +01:00
Martin Robertz 30c3ab100d Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2024-12-22 00:30:45 +01:00
Martin Robertz 05995607bc Merge branch 'master' into asm 2024-12-22 00:29:26 +01:00
Martin Robertz d0005adcf8 Merge branch 'master' into fix-essentia-level-maintaining 2024-12-21 19:47:41 +01:00
Martin Robertz 71d820eacb update 1.4.0-gtnh 2024-12-17 19:26:58 +01:00
EnderProyects 02ee43b04e Add new texture for infinite water cell (#251) 2024-12-17 15:45:17 +00:00
Martin Robertz 170bf2099a update 1.3.51-gtnh 2024-12-07 20:14:47 +01:00
AlexdoruandMartin Robertz 8b1dff3f21 Fix pattern dividing (#246)
Co-authored-by: Martin Robertz <[email protected]>
2024-12-06 19:30:11 +01:00
lordIcocain 0e9652af56 first commit 2024-11-27 06:49:02 +02:00
boubou19 be6dfac4d0 retain the priority setting of the fluid storage buses when wrenched (#247) 1.3.50-gtnh 2024-11-24 21:59:46 +01:00
Martin Robertz 9fb8baef7b update 1.3.49-gtnh 2024-11-23 16:40:15 +01:00
hiroschoandMartin Robertz 3314e31bdc Fix fluid is registered twice in crafting CPU (#237)
Co-authored-by: Martin Robertz <[email protected]>
2024-11-23 00:27:51 +01:00
RecursivePineapple 0cd4f49d50 Fixed essentia level maintaining
You could previously level maintain the thaumic energistics fake
essentia item, but this wouldn't work properly due to the continuous
buildup of the fake items. It would work initially, but once you added
or removed any essentia, it would not make more.

To fix this, this commit checks if the maintained item is an essentia
stack and does two things.

First, it will convert NEI addon aspects to thaumic energistics. This
is because it's very difficult to get the thaumic energistics item (to
configure maintainers).
I tried to add some logic to AE's SlotFake that converts addon aspects
to thaumic energistics aspects, but it broke level maintainers. It added
very little, so I removed that.

Second, it will check the essentia cache to get the stack size instead of
the item cache.
2024-11-19 14:16:59 -05:00