Commit Graph
699 Commits
Author SHA1 Message Date
Martin Robertz 00529ca1b3 Merge branch 'master' into dev
# Conflicts:
#	dependencies.gradle
1.4.64-gtnh-pre
2025-05-12 09:33:13 +02:00
Martin Robertz 5b1607a817 Merge remote-tracking branch 'lordIcocain/fix-cell-math' into dev 2025-05-12 09:32:41 +02:00
Martin Robertz 6e613b33af update 1.4.63-gtnh 2025-05-12 09:31:48 +02:00
lordIcocain 1163beabdf correct singleByteAmount 2025-05-12 01:23:48 +03:00
lordIcocain f31956ecc5 simplify 2025-05-12 00:54:55 +03:00
lordIcocain 0c0a6655a5 fix math 2025-05-12 00:40:39 +03:00
Maya ca0618c5ab Merge branch 'master' into dev 1.4.62-gtnh-pre 2025-05-11 12:17:37 -05: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
Martin Robertz 28ddd23ffb fix 1.4.60-gtnh-pre 2025-05-10 14:04:19 +02:00
Martin Robertz d1e6bfcb47 update 2025-05-10 13:39:25 +02:00
Martin Robertz 76313d947a sa+deps 2025-05-10 13:38:54 +02:00
Martin Robertz b4ea48a827 Merge remote-tracking branch 'lordIcocain/magnet-and-restock' into dev
# Conflicts:
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
2025-05-10 13:38:30 +02: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]>
1.4.58-gtnh
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
Martin Robertz 3bc871e541 update 1.4.56-gtnh 2025-05-04 13:35:55 +02:00
glowredman 452f9d9620 Artificial universe cell recipe (#289) 2025-05-04 10:03:39 +02:00
Martin Robertz bd67f35f36 update 1.4.53-gtnh 2025-04-21 10:21:36 +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 d222b00de2 update 1.4.50-gtnh 2025-04-19 10:43:04 -05: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
Maya c724875af6 update 1.4.46-gtnh 2025-04-08 23:49:04 -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
Maya 64a17f61f4 update 1.4.42-gtnh 2025-04-02 17:53:11 -05: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