Commit Graph
715 Commits
Author SHA1 Message Date
lordIcocain aaada9be25 Merge remote-tracking branch 'origin/p2pinterface-share-configandstorage-inventory' into p2pinterface-share-configandstorage-inventory 2025-06-28 22:03:54 +03:00
lordIcocain 90a37ae8f2 fix another dupe 2025-06-28 22:03:47 +03:00
Martin Robertz e48bddc4ab Merge branch 'master' into p2pinterface-share-configandstorage-inventory 2025-06-27 17:46:16 +02:00
lordIcocain 9e43bcad94 rework 2025-06-26 20:14:37 +03:00
zyf051520 25abc806df Fix FluidExportBus NPE (#314) 1.4.93-gtnh 2025-06-24 07:31:59 +00:00
Martin Robertz cf19ea08fc Merge branch 'master' into p2pinterface-share-configandstorage-inventory 2025-06-22 18:33:50 +02:00
Martin Robertz 0d00adea19 fix
(cherry picked from commit 481d842d03)
2025-06-22 18:33:26 +02:00
Martin Robertz 04558b6913 update 1.4.91-gtnh 2025-06-22 18:22:29 +02:00
0499adcc6f Add Super Stock Replenisher (#278)
Co-authored-by: Maya <[email protected]>
Co-authored-by: boubou19 <[email protected]>
Co-authored-by: lordIcocain <[email protected]>
2025-06-22 17:49:44 +02:00
Martin Robertz 6dcac5c664 Merge branch 'master' into p2pinterface-share-configandstorage-inventory 2025-06-20 21:59:41 +02:00
Martin Robertz 35136c31ee update 1.4.89-gtnh 2025-06-20 21:56:28 +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
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
Martin Robertz 1ffcea9dd9 update 1.4.86-gtnh 2025-06-09 15:35:46 +02: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
Martin Robertz fe3168ed6e update 1.4.80-gtnh 2025-05-31 14:55:00 +02: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
Martin Robertz 5cc8534ba2 update 1.4.76-gtnh 2025-05-25 21:10:05 +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
Martin Robertz f235a68266 update 1.4.75-gtnh 2025-05-25 15:10:33 +02:00
Kogepan229 47e41751df Fix NEI search always showing void cell (#300) 2025-05-24 21:02:42 -05:00
Martin Robertz df1384a7ee update 1.4.72-gtnh 2025-05-24 22:27:58 +02: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
Martin Robertz a57cb5db52 update 1.4.69-gtnh 2025-05-23 22:59:21 +02: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
Martin Robertz 1a959b5b8d update 1.4.67-gtnh 2025-05-16 21:33:36 +02:00
Caedis f629b3a7da Update dependencies.gradle (#292) 2025-05-13 22:00:56 +08:00
lordIcocainandMaya c9cf92ca4a Fix cell math for distribution card (#291)
Co-authored-by: Maya <[email protected]>
1.4.65-gtnh
2025-05-12 14:21:33 +00:00
Martin Robertz 6e613b33af update 1.4.63-gtnh 2025-05-12 09:31:48 +02:00
Maya 3af7873882 update 1.4.61-gtnh 2025-05-11 12:16:20 -05:00
lordIcocain 412c6d9cf2 fix player inventory position in interface terminal (#290) 2025-05-11 12:15:24 -05:00
lordIcocainandMaya ddd046fa15 item renamer (#288)
Co-authored-by: Maya <[email protected]>
1.4.58-gtnh
2025-05-06 22:47:25 +00:00