Commit Graph
488 Commits
Author SHA1 Message Date
Martin Robertz 9c6329f140 remove double entry 2025-05-04 15:00:00 +02:00
Martin Robertz 6a219f160f sa 2025-05-04 14:34:23 +02:00
Martin Robertz 3cfe6742a1 Merge remote-tracking branch 'lordIcocain/item-renamer' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-04 14:34:00 +02:00
Martin Robertz 72d7f58408 Merge remote-tracking branch 'lordIcocain/order-from-crafting-status' into dev 2025-05-04 14:32:47 +02:00
Martin Robertz d7d89d4cb7 Merge remote-tracking branch 'lordIcocain/use-ae2-interface-terminal' into dev 2025-05-04 14:32:44 +02:00
Martin Robertz 13d437150e Merge remote-tracking branch 'lordIcocain/super_stoker' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-04 14:32:17 +02:00
Martin Robertz 4dc4752ea5 Merge remote-tracking branch 'lordIcocain/magnet-and-restock' into dev 2025-05-04 14:29:38 +02:00
glowredman 452f9d9620 Artificial universe cell recipe (#289) 2025-05-04 10:03:39 +02:00
lordIcocain 46c320f01a item renamer 2025-05-03 09:11:34 +03:00
lordIcocain ac38db8fb8 order from crafting status 2025-05-03 08:10:47 +03:00
lordIcocain 1a67c6ab04 Merge branch 'master' into use-ae2-interface-terminal 2025-04-29 07:10:21 +03:00
lordIcocain e5ec99d062 use ae2 gui 2025-04-29 07:01:47 +03: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
lordIcocain 083c135874 Merge remote-tracking branch 'origin/magnet-and-restock' into magnet-and-restock 2025-04-09 22:44:30 +03:00
lordIcocain 765033762a fix filters 2025-04-09 22:44:22 +03:00
Maya 491d1f016c Merge branch 'master' into super_stoker 2025-04-08 23:49:51 -05:00
Maya a82b9b2931 Merge branch 'master' into magnet-and-restock 2025-04-08 23:49:41 -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
Kogepan229andMaya 3bcbed7c44 Backport NEI Cell View (#282)
Co-authored-by: Maya <[email protected]>
2025-04-09 04:40:48 +00:00
lordIcocain 95d4b0a14b fix crash when terminal out of range 2025-04-09 00:18:53 +03:00
Kogepan229andMaya 613ca10f74 Allow math expression in Fluid Level Emitter GUI (#279)
Co-authored-by: Maya <[email protected]>
2025-04-02 22:52:55 +00:00
cdfe803f16 Partition gregtech fluids (#273)
Co-authored-by: Jurre Groenendijk <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-04-02 22:47:31 +00:00
Guido de HartandMaya 3b66cab727 made ItemBaseWirelessTerminal.canHandle null-safe (#274)
Co-authored-by: Maya <[email protected]>
2025-04-02 22:41:17 +00:00
lordIcocainandMaya e90c29413d Fix pattern multi (#277)
Co-authored-by: Maya <[email protected]>
2025-04-02 22:36:05 +00:00
StaffiX 77cfc0ba64 Change Creative Cell Capacity (#276) 2025-04-02 10:53:16 -05:00
lordIcocain e92d524e36 update 2025-04-02 15:57:09 +03:00
lordIcocain e37a24a861 1st commit 2025-03-29 04:37:30 +02:00
Kogepan229andMaya 2f8d51183d Fix terminal key bindings for mouse (#270)
Co-authored-by: Maya <[email protected]>
2025-03-22 14:41:57 +00:00
Kogepan229 a4bf54f1b9 Fix an issue that GT and AE2FC fluids could not be used with Creative Fluid Cell (#271) 2025-03-20 10:49:31 +00:00
Maya 23e80c7dd9 Fix fluid containers with null empty items not deleting in fluid terminal (#267) 2025-02-28 13:07:11 -06:00
Zoltán Szepesi d78618d950 Read NBT tags combine and beSubstitute from ItemStack when converting them to FluidPattern (#268) 2025-02-22 22:30:19 -06:00
lordIcocain b13bd463a0 1st commit 2025-02-22 22:59:45 +02:00
Martin Robertz 7b8d87477b convert to long like in ae2 code 2025-02-14 12:22:38 +01:00
JuliaandJulia Dijkstra b14bded93c Improve ME Fluid Auto Filler Performance (#266)
Co-authored-by: Julia Dijkstra <[email protected]>
2025-02-14 06:24:26 +00:00
lordIcocainandMaya bedb2c25e1 No more drop drops from interface (#265)
Co-authored-by: Maya <[email protected]>
2025-01-26 19:01:35 +00:00
0908e906d2 Option to restrict fluid cell (#263)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-01-25 22:13:40 +00:00
lordIcocain c853dbc30d Allow exotic cells use upgrade cards (#264) 2025-01-23 17:26:37 -06:00
lordIcocain 31a5decaeb Add Support Void and Distribution card for cells and increase card limit for cells (#262) 2025-01-17 11:48:52 -06:00