Commit Graph
93 Commits
Author SHA1 Message Date
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
mczph 6cf27b1ba5 Add files via upload 2022-07-15 12:07:11 +08:00
GlodBlock 35f2dd4073 add larger buffer 2022-07-13 21:16:19 +08:00
GlodBlock 61cdd8c487 black essentia gas from ThE 2022-07-13 20:05:14 +08:00
Martin Robertz 43fe8323ff Merge pull request #3 from GlodBlock/upstream
upstream
1.0.3-gtnh
2022-07-12 08:03:49 +07:00
Yang Xizhi 932bb9eadc Merge branch 'master' into upstream 2022-07-12 00:02:20 +08:00
GlodBlock f39548d97b remove the origin hacky shit 2022-07-11 23:53:15 +08:00
Martin Robertz c5a75cf770 Merge pull request #2 from DianeXD/master
Adapt to gtnh version and add gtpp support
2022-07-09 17:47:17 +07:00
GlodBlock c9ed833e59 optimize tick a bit 2022-07-09 18:21:17 +08:00
DianeXD f08a6ca75c Adapt to gtnh version and add gtpp support 2022-07-09 18:15:23 +08:00
Martin Robertz 7c929f912e Merge pull request #1 from DianeXD/master
Update pattern terminal
2022-07-09 15:45:24 +07:00
DianeXD e3f02860e8 Update pattern terminal
Basically the same as this pr
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial/pull/143
2022-07-09 15:15:42 +08:00
GlodBlock 07b03d1ef1 fix power drain 2022-07-06 13:22:54 +08:00
GlodBlock af42494561 revert the energy consumption when insert/extract fluid 2022-07-06 11:25:44 +08:00
GlodBlock e8b28010b4 fix dual part 2022-07-01 12:03:50 +08:00
GlodBlock 3e5563cbb4 dep 2022-06-30 20:34:03 +08:00
GlodBlock 68bb02b171 recipe for oc pattern editor 2022-06-30 20:27:19 +08:00
GlodBlock e38869f07d ec2 style output rule and oc integration 2022-06-30 19:52:58 +08:00
GlodBlock 19f9dee682 finish the fluid interface 2022-06-25 08:30:30 +08:00
GlodBlock 475842d115 1.12 fluid interface style 2022-06-23 23:54:49 +08:00
Martin Robertz 594fbd7f69 Merge branch 'GlodBlock:1.7.10' into master 1.0.2-gtnh 2022-06-22 10:05:22 +02:00
GlodBlock 0845c25190 remove unnecessary null fail 2022-06-21 21:12:30 +08:00
GlodBlock bb600eed3f imp inventory for decoder 2022-06-18 17:18:24 +08:00
GlodBlock e1213b2d5a small clean up 2022-06-13 10:36:41 +08:00
GlodBlock 12565b1389 fluid display 2022-06-13 10:24:38 +08:00
GlodBlock 213b43d213 allow code fluid container 2022-06-12 23:30:30 +08:00
Martin Robertz db9c1f9529 fix version tag 1.0.1-gtnh 2022-06-05 18:56:02 +02:00
Martin Robertz 43f9f489dd add workflow 1.0.0-gtnh 2022-06-05 18:12:46 +02:00
GlodBlock 0501c65153 add config to remove recipes 2022-06-05 23:44:52 +08:00
GlodBlock 7c4a3fa349 remove i18n. it's dumb shit 2022-06-05 23:39:51 +08:00
Yang Xizhi c7b2ef5511 Merge pull request #15 from StrangeMan1580/1.7.10
Russian localization for Fluid Buses
2022-06-01 13:27:31 +08:00