Commit Graph
496 Commits
Author SHA1 Message Date
Martin Robertz 14488c78ce Merge remote-tracking branch 'Kogepan229/rewrite-level-maintainer' into dev 2025-05-23 23:15:54 +02:00
Martin Robertz 7cf8ce4702 Merge remote-tracking branch 'lordIcocain/ae-navite-fluid-support' into dev 2025-05-23 23:15:06 +02:00
Martin Robertz 8d90bf7db6 Merge remote-tracking branch 'lordIcocain/super_stoker' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-23 23:14:55 +02:00
Martin Robertz 8ad20a7935 Merge remote-tracking branch 'lordIcocain/magnet-and-restock' into dev 2025-05-23 23:13:47 +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
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
Kogepan229 b1d347c65e Cleanup old NBT tag 2025-05-17 02:36:16 +09:00
Kogepan229 5234ca631f Rewrite Level Maintainer/Terminal logic 2025-05-17 00:51:29 +09:00
lordIcocain bc1f6adf9d compatibility with ae native fluid 2025-05-16 06:46:09 +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
Maya eece3f73cb Merge branch 'master' into magnet-and-restock 2025-05-06 17:51:00 -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
Maya ec86685d7d Merge branch 'master' into magnet-and-restock 2025-04-19 10:41:41 -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 b9cd36f3cc restock cleanup 2025-04-11 19:16:32 +03:00
lordIcocain 7190bf39f5 fix restock crash on out of range 2025-04-11 17:49:33 +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
lordIcocain f388bdaf78 caching by UUID instead of EntityPlayer 2025-04-11 02:11:14 +03:00
lordIcocain bb912ec8a1 Fix filters
Add oredictionary filter
Fix inconsistent with WCT
Gui improvements
Filter caching
GuiFCImgButton 3/4 size support
2025-04-11 02:00:31 +03:00