Commit Graph
790 Commits
Author SHA1 Message Date
Martin Robertz 50bcccb3e5 Merge remote-tracking branch 'lordIcocain/super_stoker' into dev 2025-06-09 15:35:03 +02:00
lordIcocain 708fe0e731 new texture 2025-06-08 13:07:50 +03:00
Martin Robertz 2ce439c997 update 1.4.85-gtnh-pre 2025-06-08 12:07:25 +02:00
Martin Robertz 9f2d51cdcf Merge remote-tracking branch 'lordIcocain/universal_terminal_universal_bauble' into dev 2025-06-08 12:06:06 +02:00
Martin Robertz 7f5954847f Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-06-08 12:06:02 +02:00
lordIcocain 6d43b9aee7 make universal terminal universal bauble 2025-06-08 12:17:59 +03:00
lordIcocain e8f25f8487 fix patterning without inputs/outputs 2025-06-06 21:13:39 +03:00
Martin Robertz 0d7425cb82 update 1.4.84-gtnh-pre 2025-06-05 21:51:23 +02:00
Martin Robertz 47a1d87522 Merge remote-tracking branch 'origin/magnet' into dev 2025-06-05 21:51:01 +02:00
Alexdoru 01865afd10 don't magnet fake entity items from ME assemblers 2025-06-04 17:43:52 +02:00
Alexdoru d5cb385fc1 remove check who dropped the item 2025-06-04 17:42:04 +02:00
Alexdoru 08bffd9d50 cache Enum.values() call for WirelessMagnet.Mode enum 2025-06-04 17:23:47 +02:00
Alexdoru 1591a73c38 teleport items on the clientside as well 2025-06-04 17:16:08 +02:00
Alexdoru dd0554ce64 play a sound when picking up items 2025-06-04 17:13:21 +02:00
Alexdoru 8aa0eddb24 fire the PlayerPickupXpEvent 2025-06-04 17:09:57 +02:00
Alexdoru 42616147aa change while loops to for loops and correct the generic method signature 2025-06-04 17:05:19 +02:00
Alexdoru cc3ed57790 delete NBTTagCompound hallucination 2025-06-04 17:01:15 +02:00
Alexdoru 25ee628e7f only run magnet logic every 5 ticks 2025-06-04 17:01:15 +02:00
Alexdoru ab816d2ebe avoid checking for other players for every item if alone 2025-06-04 17:01:15 +02:00
Dream Master fca219c1c4 update 1.4.83-gtnh-pre 2025-06-04 12:22:34 +02:00
Dream Master f4e99ff522 Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-06-04 12:21:03 +02:00
lordIcocain a6c36d3af5 fix fluid export bus crafting mode 2025-06-03 06:37:39 +03:00
Martin Robertz 887c947928 sa+deps 1.4.82-gtnh-pre 2025-06-01 13:56:36 +02:00
Martin Robertz b1101cfb32 update 2025-06-01 13:40:58 +02:00
Martin Robertz 817292c7ac Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-06-01 13:38:36 +02:00
Martin Robertz b5f5f7185c Merge remote-tracking branch 'lordIcocain/super_stoker' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-06-01 13:38:31 +02:00
lordIcocain 0779b10ebc fluid packet long 2025-06-01 12:57:10 +03:00
lordIcocain 22cf955086 Merge branch 'master' into super_stoker 2025-06-01 12:05:54 +03:00
lordIcocain 67072ce99b Merge branch 'master' into ae-navite-fluid-support 2025-06-01 09:48:06 +03:00
lordIcocain 09f7642c67 Interface fluid support 2025-05-31 21:40:43 +03:00
Martin Robertz f520007769 update 1.4.81-gtnh-pre 2025-05-31 14:57:03 +02:00
Martin Robertz 60838676c2 Merge branch 'master' into dev
# Conflicts:
#	dependencies.gradle
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-31 14:56:22 +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
Dream Master aa9713d125 update 1.4.79-gtnh-pre 2025-05-28 13:18:23 +02:00
Dream Master b70e9fa013 Merge remote-tracking branch 'Inphysible/p2pinterface-share-configandstorage-inventory' into dev 2025-05-28 13:09:19 +02:00
Dream Master c601dc33a1 Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-05-28 13:09:05 +02:00
lordIcocain fb6f5aa356 fix ultra pattern rewrite 2025-05-27 05:11:38 +03: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 5f3a72641b update 1.4.78-gtnh-pre 2025-05-26 08:15:16 +02:00
Martin Robertz b3ebd65461 Merge remote-tracking branch 'lordIcocain/magnet-and-restock' into dev 2025-05-26 08:13:07 +02:00
Martin Robertz e82da137c2 Merge remote-tracking branch 'lordIcocain/super_stoker' into dev 2025-05-26 08:12:59 +02:00
lordIcocain 1c74bb5673 use WeakHashMap for cache 2025-05-26 04:46:30 +03:00
lordIcocain 79e09c9d3b Merge remote-tracking branch 'origin/magnet-and-restock' into magnet-and-restock 2025-05-26 04:43:22 +03:00
lordIcocain 65fabfc6ea move icons
change default list mode value to blacklist
2025-05-26 04:43:14 +03:00
boubou19 1aba318d4c Merge branch 'master' into super_stoker 2025-05-25 21:54:37 +02:00
Ruling-0 34718cb7f1 Merge branch 'master' into magnet-and-restock 2025-05-25 14:54:24 -05:00
Martin Robertz d6c6c260d9 update 1.4.77-gtnh-pre 2025-05-25 21:12:29 +02:00
Martin Robertz def63f2b8b Merge remote-tracking branch 'Kogepan229/fix-bus-gui' into dev 2025-05-25 21:10:50 +02:00