Commit Graph
316 Commits
Author SHA1 Message Date
GlodBlock dadf2784a8 fixes 2023-02-01 21:15:44 +08:00
asdflj 8081eb2c2c all done? 2023-02-01 16:25:42 +08:00
asdflj 5ea7f44058 Merge remote-tracking branch 'origin/bookmark' into bookmark 2023-01-31 15:51:29 +08:00
asdflj 7f53e01184 add wireless fluid pattern terminal 2023-01-31 15:50:45 +08:00
GlodBlock 2eb1854eda network update flag 2023-01-31 10:49:19 +08:00
asdflj a22814940b add wireless fluid terminal 2023-01-30 22:52:25 +08:00
GlodBlock 482298021e tank 2023-01-30 18:07:57 +08:00
asdflj 99f8e98017 spotless apply 1.0.62-gtnh-pre 2023-01-29 16:30:27 +08:00
Yang Xizhi 1f6dc04a71 Merge branch 'master' into bookmark 2023-01-29 14:25:51 +08:00
asdflj bad29bfdc3 add certus quartz tank 2023-01-29 14:21:56 +08:00
Jason Mitchell 4eb5b5f2f0 [ci skip] Add git-blame-ignore-revs for spotlessApply 2023-01-28 17:43:10 -08:00
Jason Mitchell 69a5c0e6ee [ci skip] spotlessApply with the new settings 2023-01-28 17:43:10 -08:00
Jason Mitchell ab0b8f11d4 [ci skip] Update buildscript to RetroFuturaGradle 2023-01-28 17:43:08 -08:00
GlodBlock d238a82451 portable cell recipe 2023-01-28 23:45:39 +08:00
GlodBlock 80340dbd75 add portable fluid cell 2023-01-28 23:15:33 +08:00
asdflj 44ff338023 add fluid auto filler 2023-01-28 20:47:10 +08:00
GlodBlock fc9893ac32 fix npe from two storage bus facing each other 1.0.60-gtnh 2023-01-28 15:48:14 +08:00
Martin Robertz 4d236cb898 Merge pull request #69 from asdflj/bookmark
add fluid storage monitor
1.0.59-gtnh
2023-01-25 10:36:13 +01:00
GlodBlock e424230f96 add missing super event handler 2023-01-25 14:56:36 +08:00
asdflj 3f35dadb41 add walrus 2023-01-25 14:08:36 +08:00
asdflj 2a249bf5a4 Merge branch 'bookmark' 2023-01-24 21:58:50 +08:00
asdflj 14d41f3548 fix terminal btn 2023-01-24 21:50:03 +08:00
asdflj 3531f9f23e add fluid storage monitor 2023-01-24 21:38:10 +08:00
GlodBlock ea4014fc1e fix fluid storage bus trigger 1.0.58-gtnh 2023-01-24 15:48:10 +08:00
Yang Xizhi 96ba5e2997 Merge pull request #70 from GTNewHorizons/removeasm
remove io port asm and add 16384k fluid cell
1.0.57-gtnh
2023-01-24 00:10:13 +08:00
asdflj 949eefb873 remove me io asm 2023-01-23 21:21:17 +08:00
asdflj 8a99073d40 uh 2023-01-23 21:15:29 +08:00
GlodBlock 0a5a38341f remove io port asm 2023-01-23 20:55:31 +08:00
GlodBlock 4440ea5a1c colorful tooltips and 16384k cell 2023-01-23 20:52:19 +08:00
Yang Xizhi e69a0fc977 Merge pull request #68 from GTNewHorizons/refactor
refactor code
2023-01-23 17:06:44 +08:00
GlodBlock 8d072f0c89 refactor 6 2023-01-23 16:45:14 +08:00
GlodBlock 5b62c4fdc8 refactor 5 2023-01-22 19:37:44 +08:00
GlodBlock d9449622b9 refactor 4 2023-01-21 23:19:25 +08:00
GlodBlock b9b8ac3b43 Merge branch 'master' of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git into refactor 2023-01-21 17:25:12 +08:00
GlodBlock 65134a3786 refactor 3 2023-01-21 17:19:40 +08:00
GlodBlock 018d488bee refactor 2 2023-01-21 14:45:07 +08:00
GlodBlock a70ace4742 refactor 1 2023-01-20 22:45:58 +08:00
Yang Xizhi c67ee59120 Merge pull request #62 from GTNewHorizons/fix/fluidterminal
add fluid storage bus
1.0.56-gtnh
2023-01-20 15:33:24 +08:00
Martin Robertz 4d04a057eb Merge pull request #67 from GTNewHorizons/fix/fluidterminal-spotless-fixes
Spotless apply for branch fix/fluidterminal for #62
2023-01-20 08:31:04 +01:00
GitHub GTNH Actions 204535479c spotlessApply 2023-01-20 07:30:52 +00:00
Yang Xizhi 7640a1fe88 Merge c5e9b34a5e into 15b8b291fd 2023-01-20 08:29:27 +01:00
Yang Xizhi c5e9b34a5e Merge branch 'master' into fix/fluidterminal 2023-01-20 15:29:25 +08:00
Yang Xizhi 15b8b291fd Merge pull request #64 from asdflj/levelEmitter
add fluid level emitter
2023-01-20 15:27:21 +08:00
Martin Robertz e29f044e2e Merge pull request #66 from asdflj/master
missing items always in the top
2023-01-20 08:09:27 +01:00
asdflj 37a49cb720 missing items always in the top 2023-01-20 14:50:24 +08:00
Martin Robertz 1aedac721a Merge pull request #65 from asdflj/master
remove asm
2023-01-19 07:36:50 +01:00
asdflj 3715e470aa remove asm 2023-01-19 10:09:45 +08:00
asdflj 5ca8909dbf add fluid level emitter 2023-01-19 00:07:16 +08:00
Yang Xizhi 510cd6d4bd Merge pull request #63 from GTNewHorizons/fix/fluidterminal-spotless-fixes
Spotless apply for branch fix/fluidterminal for #62
1.0.54-gtnh-pre
2023-01-17 22:44:39 +08:00
GitHub GTNH Actions f0aef4e73c spotlessApply 2023-01-17 14:44:20 +00:00