Commit Graph
488 Commits
Author SHA1 Message Date
Martin Robertz 99a405ea84 Merge remote-tracking branch 'lc-1337/super_stoker' into dev 2025-06-20 22:02:47 +02:00
Martin Robertz 6dcac5c664 Merge branch 'master' into p2pinterface-share-configandstorage-inventory 2025-06-20 21:59:41 +02:00
Sanjay S. 061a63bef5 Fixed crash caused by missing IInventory cast to duality.getStorage() call in onPartActivate(...) 2025-06-20 10:42:08 -04:00
Sanjay S. c516293195 Fixed crash caused by missing AppEngInternalInventory cast to duality.getStorage() call in onPartActivate(...) 2025-06-20 10:22:48 -04:00
Sanjay S. 778532490f Brought PartFluidP2PInterface up to date with dependent PR 2025-06-20 09:55:35 -04:00
Sanjay S. f1324c98d4 Merge branch 'p2pinterface-share-configandstorage-inventory' of https://github.com/Inphysible/AE2FluidCraft-Rework into p2pinterface-share-configandstorage-inventory 2025-06-20 09:50:53 -04:00
Sanjay S. c9e062d92a Brought 'PartFluidP2PInterface' up to date with dependent PR 2025-06-20 09:49:23 -04:00
lc-1337andboubou19 dffd8e07e0 always use fluid packet for partition (#310)
Co-authored-by: boubou19 <[email protected]>
2025-06-19 08:45:08 +00:00
Ethryanandgithub-actions[bot] 88c5b6be72 Hide EC stuff if EC is not loaded. (#312)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-06-17 16:24:33 +02:00
lordIcocain 5b6442a54f unlimit stack size 2025-06-15 16:41:27 +03:00
lc-1337 0095f69da2 fix player null crash magnet (#309) 2025-06-15 00:24:25 -05:00
Ruling-0 c074e19ec5 Merge branch 'master' into p2pinterface-share-configandstorage-inventory 2025-06-14 23:36:17 -05:00
Sanjay S. 6c53f5953d Brought PartFluidP2PInterface up to date with dependent PR 2025-06-14 09:19:10 -04:00
Sanjay S. 7dc41f03b3 Merge branch 'p2pinterface-share-configandstorage-inventory' of https://github.com/Inphysible/AE2FluidCraft-Rework into p2pinterface-share-configandstorage-inventory 2025-06-14 09:04:52 -04:00
Sanjay S. bfb8d92afb Brought PartFluidP2PInterface up to date with dependent PR 2025-06-14 09:03:42 -04:00
Sanjay S. 3542351217 Brought PartFluidP2PInterface up to date with dependent PR 2025-06-14 09:01:05 -04:00
Alexdoru bfba45e796 Account for client /server desync when teleporting items with magnet (#305) 2025-06-11 06:26:00 +02:00
Michael Doyle dee1277753 Fix Universal Terminal restock hotkey chat message saying the opposite of the current state (#308) 2025-06-10 20:36:14 -05:00
Kogepan229andboubou19 6ac5ea30f0 Rewrite Level Maintainer/Terminal Logic (#294)
Co-authored-by: boubou19 <[email protected]>
2025-06-09 20:12:08 +00:00
RecursivePineapple 3428c86f64 Fix div by zero (#306) 2025-06-09 12:25:06 +02:00
Alexdoru c504dbb28a Magnet improvements (#303) 2025-06-08 19:42:19 +02:00
lordIcocain 22cf955086 Merge branch 'master' into super_stoker 2025-06-01 12:05:54 +03:00
c5cea9eb19 Add magnet and restock to Universal terminal (#275)
Co-authored-by: Maya <[email protected]>
Co-authored-by: Caedis <[email protected]>
Co-authored-by: Ruling-0 <[email protected]>
2025-05-30 21:35:35 -06:00
Sanjay S. a3d5a72737 Brought GuiDualInterface up to date with dependent PR 2025-05-26 17:39:57 -04:00
Sanjay S. 2f19144a28 Complete implementation of complement PR's changes to main AE2 2025-05-26 17:13:17 -04:00
boubou19 1aba318d4c Merge branch 'master' into super_stoker 2025-05-25 21:54:37 +02:00
Kogepan229andMaya 410e33faa0 Fix fluid import/export bus GUI when WAILA is disabled (#298)
Co-authored-by: Maya <[email protected]>
2025-05-25 18:36:05 +00:00
Kogepan229 47e41751df Fix NEI search always showing void cell (#300) 2025-05-24 21:02:42 -05:00
Kogepan229andboubou19 a70854c832 Restore NEI highlighting when searching for fluid in cells (#299)
Co-authored-by: boubou19 <[email protected]>
2025-05-24 18:09:11 +00:00
Kogepan229 c0d438f774 Use long stack size in NEI CellView (#297) 2025-05-23 21:46:16 +02:00
lordIcocain 830ac91521 make baubles optional (#296) 2025-05-23 05:14:36 -04:00
lordIcocain 1049cd90af rebranding 2025-05-20 06:50:45 +03:00
lordIcocainandMaya c9cf92ca4a Fix cell math for distribution card (#291)
Co-authored-by: Maya <[email protected]>
2025-05-12 14:21:33 +00:00
lordIcocain 412c6d9cf2 fix player inventory position in interface terminal (#290) 2025-05-11 12:15:24 -05:00
Maya e81cbb4012 spotless 2025-05-06 17:55:04 -05:00
Maya 9a61285887 Merge branch 'master' into super_stoker 2025-05-06 17:51:58 -05:00
lordIcocainandMaya ddd046fa15 item renamer (#288)
Co-authored-by: Maya <[email protected]>
2025-05-06 22:47:25 +00:00
lordIcocainandMaya f72dde88e6 order from crafting status (#287)
Co-authored-by: Maya <[email protected]>
2025-05-06 17:43:48 -05:00
lordIcocainandMaya aecddfb94a Use interface terminal gui from ae2, instead of copy code from ae2 (#286)
Co-authored-by: Maya <[email protected]>
2025-05-06 17:39:49 -05:00
glowredman 452f9d9620 Artificial universe cell recipe (#289) 2025-05-04 10:03:39 +02:00
lordIcocainandMaya a03db709ba copy of fix interface terminal crash (#285)
Co-authored-by: Maya <[email protected]>
2025-04-21 05:55:27 +00:00
lordIcocainandMaya 56703bf498 Fix math when cell restricted and new fluid added (#284)
Co-authored-by: Maya <[email protected]>
2025-04-21 05:51:46 +00:00
Maya 5917070e55 Merge branch 'master' into super_stoker 2025-04-19 10:41:51 -05:00
Kogepan229 a4a5dcd9d8 Small improvements to the Level Maintainer GUI (#283) 2025-04-19 10:41:29 -05:00
lordIcocain c1c7a63475 increase precision 2025-04-14 01:44:26 +03:00
lordIcocain 26d497c6ee Merge remote-tracking branch 'origin/super_stoker' into super_stoker 2025-04-11 17:21:48 +03:00
lordIcocain c07455c5c1 less often sync gui data
change item return logic
drop cell on break
fix gui not display last fluid slot
fix not all fluids cell provide capacity
2025-04-11 17:21:40 +03:00
Maya 491d1f016c Merge branch 'master' into super_stoker 2025-04-08 23:49:51 -05:00
Guillaume MercierandMaya 3952557fa2 Make the fluid handler more resilient. (#272)
Co-authored-by: Maya <[email protected]>
2025-04-09 04:48:22 +00:00
lordIcocainandMaya be8457d829 Fix isConduit check (#281)
Co-authored-by: Maya <[email protected]>
2025-04-09 04:44:48 +00:00