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 |
|
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 |
|