upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-11 15:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
123 Commits 4 Branches 497 Tags
19d6bb119c4e127e028c5d13435debb1aebbdb65
Commit Graph
123 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Robertz 19d6bb119c Merge pull request #8 from Runakai1/Terminal 
Terminal
 2022-08-14 12:09:24 +02:00
Runakai1 05b8538154 added another nullcheck 2022-08-14 11:16:48 +02:00
Runakai1 3f15f9524b Added nullcheck 2022-08-14 11:12:13 +02:00
Runakai1 539538d551 Stuff Changed 2022-08-13 19:09:15 +02:00
Runakai1 13a23165c2 removed unnecessary var 2022-08-13 16:22:19 +02:00
Runakai1 69fe6b2950 Removed unimportant imports 2022-08-13 15:57:26 +02:00
Runakai1 aff48957cd Merge branch 'Terminal' of https://github.com/Runakai1/AE2FluidCraft-Rework into Terminal 2022-08-13 15:44:24 +02:00
Runakai1 b3f3ecfe2e Made button functional added icon + proper functionality 2022-08-13 15:41:55 +02:00
Runakai1 2fc407ce61 Changed way to see if item is a fluid display 2022-08-13 12:25:37 +02:00
Alexandre Tardif 9834066b4b Button works! 2022-08-13 12:25:37 +02:00
Runakai1 6aa1a877e5 Test 
Test
 2022-08-13 12:24:07 +02:00
Runakai1 ae7de51dbf Changed way to see if item is a fluid display 2022-08-13 11:56:51 +02:00
Alexandre Tardif 4ec705dd74 Button works! 2022-08-12 18:41:48 -04:00
Runakai1 b51bff6772 Test 
Test
 2022-08-12 23:29:20 +02:00
Martin Robertz 1998750489 Merge pull request #7 from GlodBlock/npe 
fix npe from getItem()
 2022-08-05 21:08:45 +07:00
GlodBlock 220eb8016a fix npe from getitem 2022-08-05 21:13:42 +08:00
Martin Robertz a27a6f1609 Merge pull request #6 from GlodBlock/bugfix 
fix drops leak to item cell when discretizer go offline
1.0.5-gtnh 		2022-08-01 14:50:45 +07:00
Yang Xizhi d91991482a Merge branch 'master' into bugfix 2022-08-01 14:57:29 +08:00
Yang Xizhi d7d22c1a3e Merge pull request #35 from GlodBlock/bugfix 
fix drops leak to item cell when discretizer go offline
 2022-08-01 14:53:43 +08:00
GlodBlock e8825d74e7 fix drops leak to item cell when discretizer go offline 2022-08-01 14:52:57 +08:00
Yang Xizhi 0937feb979 comment out the problemaic code 
it is more tricky than me thougt...
1.0.4-gtnh 		2022-07-31 22:17:54 +08:00
Martin Robertz 8373bae017 Merge branch 'GlodBlock:1.7.10' into master 2022-07-31 13:25:23 +07:00
Martin Robertz 38accb20fb Merge pull request #5 from GlodBlock/upstream 
upstream
 2022-07-31 13:25:12 +07:00
Yang Xizhi c961a5d922 Merge pull request #34 from GlodBlock/bugfix 
Bugfix
 2022-07-30 22:36:09 +08:00
Yang Xizhi 63d12aa759 Merge branch 'upstream' into bugfix 2022-07-30 22:36:03 +08:00
Yang Xizhi 2b94b20e2e Merge pull request #33 from GlodBlock/bugfix 
fix 4096k int overflow and drops
 2022-07-30 22:33:36 +08:00
GlodBlock ec9f55d17a fix 4096k int overflow and drops 2022-07-30 22:32:42 +08:00
GlodBlock 3e8c507556 clean up 2022-07-30 19:03:37 +08:00
GlodBlock dc6445bb6e check nei 2022-07-29 22:10:58 +08:00
GlodBlock 510bd94c5c add ic2 nei support 2022-07-29 22:07:05 +08:00
Yang Xizhi 5ee263e9de Merge pull request #32 from GlodBlock/1.7.10 
upstreamfix
 2022-07-29 20:44:20 +08:00
GlodBlock e8133a8522 ignore stack size 0 2022-07-29 20:39:34 +08:00
GlodBlock 411ec67624 wwwaaaaahhh 2022-07-29 17:36:07 +08:00
GlodBlock 26bc19c207 fix craft mode 2022-07-29 17:24:59 +08:00
Yang Xizhi e241b75065 Merge pull request #31 from GlodBlock/fixstream 
fix update
 2022-07-27 23:29:54 +08:00
Yang Xizhi b97a0f6126 Merge branch 'upstream' into fixstream 2022-07-27 23:29:46 +08:00
GlodBlock 3d2df578a6 make dual interface use the same adpator like normal one 2022-07-27 22:23:39 +08:00
GlodBlock ea9ba2c4cc fix cell byte calulation 2022-07-26 22:05:48 +08:00
GlodBlock 56d81eef56 move block loader to postinit 2022-07-25 22:08:34 +08:00
Yang Xizhi 9fee31d784 Update GregTech5RecipeExtractor.java 2022-07-24 19:46:26 +08:00
Yang Xizhi 079e5e34c4 Merge branch 'master' into upstream 2022-07-24 19:40:51 +08:00
GlodBlock 3ebf64f38b fix wct display drops 2022-07-24 18:29:46 +08:00
GlodBlock 736a4b2051 combine button 2022-07-24 18:00:10 +08:00
GlodBlock 5747b4535b clean up reflection 2022-07-22 19:18:13 +08:00
GlodBlock 3c128450b5 creative tabs 2022-07-22 12:10:04 +08:00
Jason Mitchell 76eeeb1be9 [ci skip] Migrate github actions to GTNH-Actions-Workflows 2022-07-16 10:36:56 -07:00
Yang Xizhi 8cd24b9a3b Merge pull request #29 from mczph/1.7.10 
Update zh_cn.lang 1.7.10
 2022-07-15 15:48:57 +08:00
mczph f40c6477de Update zh_CN.lang 2022-07-15 15:45:04 +08:00
GlodBlock bc32f7743e update readme 2022-07-15 13:15:36 +08:00
mczph 70f9ffefc3 Update zh_CN.lang 2022-07-15 12:11:42 +08:00