Commit Graph
744 Commits
Author SHA1 Message Date
Martin Robertz e82da137c2 Merge remote-tracking branch 'lordIcocain/super_stoker' into dev 2025-05-26 08:12:59 +02:00
boubou19 1aba318d4c Merge branch 'master' into super_stoker 2025-05-25 21:54:37 +02: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
Martin Robertz f0978bdc6e Merge branch 'master' into dev 2025-05-25 21:10:46 +02: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
Maya 4aae6020c3 Merge branch 'master' into fix-bus-gui 2025-05-25 12:32:29 -06:00
Martin Robertz e1e1b0c8c7 Merge branch 'master' into dev 2025-05-25 15:13:01 +02:00
Martin Robertz f235a68266 update 1.4.75-gtnh 2025-05-25 15:10:33 +02:00
Martin Robertz 5a4f068543 update 2025-05-25 15:06:43 +02:00
Martin Robertz f1ff8c7ab9 Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-05-25 15:03:00 +02:00
Martin Robertz 9f9e35e3e0 Merge remote-tracking branch 'lordIcocain/magnet-and-restock' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-25 15:02:54 +02:00
lordIcocain e6d4119617 introduce Ultimate pattern 2025-05-25 11:09:23 +03:00
Caedis bec7f3633a Merge branch 'master' into magnet-and-restock 2025-05-24 21:10:21 -05:00
Caedis 0dfa3955f6 Pre Release Build
Merged PRs (no # means no changes):
	#293
	#294
	#278
	#298

Failed PRs:
	#275: Failed to merge
1.4.74-gtnh-pre
2025-05-24 21:08:43 -05:00
Caedis b7e2b23fee Merge pr-278 2025-05-24 21:08:40 -05:00
Caedis 5506df388d Merge pr-298 2025-05-24 21:08:31 -05:00
Caedis 72df92ffd7 Merge pr-294 2025-05-24 21:08:22 -05:00
Caedis 5e16f171c4 Merge pr-293 2025-05-24 21:08:13 -05:00
Caedis f44242a8c2 update ae2 dep 2025-05-24 21:07:49 -05: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
Kogepan229 dcac065134 simple 2025-05-24 02:29:09 +09:00
Kogepan229 f694689a29 Fix fluid import/export bus GUI when WAILA is disabled 2025-05-24 02:01:44 +09:00
lordIcocain 830ac91521 make baubles optional (#296) 2025-05-23 05:14:36 -04:00
Kogepan229 fc6fe04a35 Rename receivePacket -> receivePackets 2025-05-20 19:38:18 +09:00
Kogepan229 f7683ef4d3 Ensure that the itemstack is not null 2025-05-20 19:28:41 +09:00
Kogepan229 de8dad31cf Put itemstack to slot on client 2025-05-20 19:17:17 +09:00
Kogepan229 25bb154d6f Show correct state in GUI 2025-05-20 18:59:44 +09:00
Kogepan229 40ff313d48 Improve gui sync 2025-05-20 18:44:59 +09:00
lordIcocain 1049cd90af rebranding 2025-05-20 06:50:45 +03:00
lordIcocain 226467ce13 restore restock 2025-05-20 06:29:03 +03:00
lordIcocain 6c922c3f02 remove extra check 2025-05-20 06:09:20 +03:00
lordIcocain e4d1157d3c review 2025-05-20 06:03:59 +03:00
lordIcocain 60a89bf2f9 use fluid in patterns 2025-05-19 03:22:44 +03:00
Kogepan229 fea6dc1e88 Constant NBT tag name 2025-05-19 00:52:12 +09:00
Kogepan229 0601dd05e2 Prevent Waila from overwriting tileentity 2025-05-19 00:39:31 +09:00
Kogepan229 b768403330 Remove unnecessary method 2025-05-18 17:33:43 +09:00
Kogepan229 54190b8fc6 Disable initially 2025-05-18 02:15:12 +09:00
Kogepan229 ad03889420 Add GUI update packet 2025-05-18 02:08:10 +09:00
Kogepan229 1282ee759b Fix updating state 2025-05-18 00:11:36 +09:00
Kogepan229 4869e0d049 Catch invalid link 2025-05-18 00:11:14 +09:00
Kogepan229 7a3e6fb8f5 Fix request stack size 2025-05-17 20:48:09 +09:00
Kogepan229 a59c4f5074 Cleanup 2025-05-17 17:12:58 +09:00
Kogepan229 042c1df3c5 Fix calc request 2025-05-17 16:21:45 +09:00
Martin Robertz 1a959b5b8d update 1.4.67-gtnh 2025-05-16 21:33:36 +02:00