Commit Graph
462 Commits
Author SHA1 Message Date
Martin Robertz 51874d4b59 Merge remote-tracking branch 'michaeldoylecs/feature-shift-pause' into dev 2025-01-12 12:32:11 +01:00
Martin Robertz 9f20656711 Merge remote-tracking branch 'origin/fix-essentia-level-maintaining' into dev 2025-01-12 12:32:06 +01:00
Martin Robertz fc165a7f6f Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2025-01-12 12:29:00 +01:00
Martin Robertz b2be6bca47 Merge branch 'master' into fix-essentia-level-maintaining 2025-01-12 12:14:59 +01:00
Martin Robertz 49adbe3271 Merge branch 'master' into feature-shift-pause 2025-01-12 12:14:44 +01:00
lailani-f 40a086ce16 Fix NPE caused by Level Maintainer (#259) 2025-01-11 20:06:16 -06:00
Maya 4a5e763170 Add cell + pattern disassemble recipes like AE2 (#257) 2025-01-10 11:19:06 -06:00
Martin Robertz a3392db769 Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2025-01-10 14:04:22 +01:00
Martin Robertz 877316fcb3 Merge branch 'master' into fix-essentia-level-maintaining 2025-01-10 14:04:06 +01:00
Martin Robertz cc1718c9b0 Merge branch 'master' into feature-shift-pause 2025-01-10 14:03:42 +01:00
5b0d356fe5 x2 button funtional for fluid pattern terminals. And varions fixes. (#252)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Alexdoru <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-01-09 11:47:53 +00:00
Michael Doyle 68c0fb6797 Move EssentiaGas check into add to view logic 2025-01-05 15:15:15 -05:00
Michael Doyle e585e6779f Prevent EssentiaRepo view movement when repo is paused 2025-01-05 15:12:38 -05:00
Michael Doyle e32da01619 Prevent FluidRepo view movement when repo is paused 2025-01-05 14:17:44 -05:00
Michael Doyle bd4644dd01 Pause DisplayRepo when player is shifting in the terminal 2025-01-05 14:17:04 -05:00
Michael Doyle b2a5c95974 Update AE2 dependency and implement required methods 2025-01-05 14:15:06 -05:00
Martin Robertz 31e88fa1ff Merge branch 'master' into fix-essentia-level-maintaining 2025-01-05 01:04:59 +01:00
Martin Robertz 880c5d3d70 Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2025-01-05 01:04:50 +01:00
0b67a8a4e7 Scalable Walrus (#248)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-01-04 15:48:13 -07:00
Martin Robertz 5907154d8e Merge branch 'master' into fix-essentia-level-maintaining 2025-01-04 16:13:39 +01:00
Martin Robertz 5092dcc3d3 Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2025-01-04 16:13:35 +01:00
03538d3338 Add class dump args (#239)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-01-04 04:34:09 +00:00
lordIcocain 6acffd220e Fix npe on fluid conduit connected check (#255) 2025-01-02 22:45:18 +01:00
Martin Robertz 8d9a9c7e8c Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2024-12-31 14:03:44 +01:00
Martin Robertz 0f9796b73c Merge branch 'master' into fix-essentia-level-maintaining 2024-12-31 14:03:33 +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
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
glowredman 0df88f2305 Cleanup (#253) 2024-12-29 19:51:31 -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 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
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 30c3ab100d Merge branch 'master' into fix/same-network-multiple-extract-only-storage-bus 2024-12-22 00:30:45 +01:00
Martin Robertz d0005adcf8 Merge branch 'master' into fix-essentia-level-maintaining 2024-12-21 19:47:41 +01:00
EnderProyects 02ee43b04e Add new texture for infinite water cell (#251) 2024-12-17 15:45:17 +00:00
AlexdoruandMartin Robertz 8b1dff3f21 Fix pattern dividing (#246)
Co-authored-by: Martin Robertz <[email protected]>
2024-12-06 19:30:11 +01:00
boubou19 be6dfac4d0 retain the priority setting of the fluid storage buses when wrenched (#247) 2024-11-24 21:59:46 +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
Alexdoru adc2a1f2fd fix changing size of the interface terminal switching to a different GUI entirely (#242) 2024-11-17 22:35:04 +00:00
Alexdoruandboubou19 8a37e085c1 Hide P2P outputs from interface terminal (#241)
Co-authored-by: boubou19 <[email protected]>
2024-11-17 22:26:00 +00:00
hiroscho b6b03cfbd8 use StorageBusInventoryHandler 2024-11-17 13:56:08 +01:00
AlexdoruandMCTBL 8b4ab1ba61 Fix clearing the current search when clicking the change terminal size button (#240)
Co-authored-by: MCTBL <[email protected]>
2024-11-17 12:51:48 +00:00
AlexdoruandMCTBL e48073976d fix the search strings resetting when changing the terminal size in the interface terminal (#243)
Co-authored-by: MCTBL <[email protected]>
2024-11-17 13:48:36 +01:00
hiroscho 91542f3d68 Fix that the clicked slot in a level maintainer is not determined correctly (#236) 2024-11-16 15:20:06 +01:00
lordIcocain 311210fc4a another fix (#235) 2024-10-27 16:06:27 +01:00
lordIcocain 25133d8c3f fail (#233) 2024-10-22 16:07:58 +02:00
lordIcocainandMartin Robertz 25da378a51 Fix: Adv blocking card for omni. False positive when getAdaptor() return null. (#231)
* fix_getadaptor

* spotless

* allow certus tank & buffers

* better check

* spotless

* better blocking behavior

---------

Co-authored-by: Martin Robertz <[email protected]>
2024-10-20 15:00:14 +02:00
lordIcocain f8e7aba55a Add Smart Blocking Mode GUI for DualInterface (#232) 2024-10-19 10:03:07 -05:00