upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-12 08:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
189 Commits 4 Branches 497 Tags
d29f0351391a6cff44ea8afc2499d3078191cf31
Commit Graph
189 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GlodBlock d29f035139 fluid terminal clean up 2022-11-07 19:17:20 +08:00
asdflj ce1ac164dc update 2022-11-05 15:34:36 +08:00
asdflj fd6eb37369 fluid terminal add "use substitutions" button 2022-10-31 09:16:19 +08:00
asdflj b576e4b178 pattern terminal shift click player inventory encode pattern to transfer output pattern slot 2022-10-28 15:25:46 +08:00
asdflj 16003b93ba update lang and fix dual interface infinity export fluid bug 2022-10-26 14:16:41 +08:00
Martin Robertz 6cf7918cb8 Merge pull request #31 from guineawheek/fluid_p2p_blocking 
make blocking mode work with fluid p2ps
 2022-10-24 12:21:09 +02:00
Guinea Wheek e9351c5302 move reflection to Ae2Reflect 2022-10-24 02:59:03 -07:00
Guinea Wheek 521a256378 make blocking mode work with fluid p2ps 2022-10-24 01:31:08 -07:00
Martin Robertz da804448a8 Merge pull request #29 from asdflj/dev 
fluid terminal support long fluid amount
1.0.27-gtnh 		2022-10-23 10:09:07 +02:00
asdflj e47c65fbdf support long fluid amount 2022-10-23 10:50:10 +08:00
Martin Robertz 02f3ed037c Merge pull request #28 from asdflj/dev 
add fluid terminal
1.0.26-gtnh 		2022-10-20 18:29:43 +02:00
asdflj 238fd317e4 add fluid terminal 2022-10-20 12:28:01 +08:00
Connor-Colenso 87d7f699e8 Merge pull request #27 from GTNewHorizons/formatted-cell-tooltip 
Add filter tooltip to partitioned storage cells
1.0.25-gtnh 		2022-10-10 06:08:18 +01:00
Matej Dipčár 7eb22f8720 Add filter tooltip to partitioned storage cells 2022-10-10 06:17:04 +02:00
Martin Robertz 1a2ba79745 Merge pull request #26 from GTNewHorizons/fix 
fix AIOOBE in amount set packet
1.0.24-gtnh 		2022-10-08 19:11:56 +02:00
GlodBlock e6b4917b64 fix AIOOBE 2022-10-09 00:11:03 +08:00
Martin Robertz c29f50214e Merge pull request #25 from GTNewHorizons/fix 
fix wrong invert trigger
1.0.23-gtnh 		2022-10-08 17:01:23 +02:00
GlodBlock b2f07d2a02 fix wrong invert trigger 2022-10-08 20:20:11 +08:00
Martin Robertz d8140da431 Merge pull request #23 from GTNewHorizons/fix 
fix wrong bytes display when ingrentent isn't enough and a possible d…
1.0.22-gtnh 		2022-10-07 21:38:14 +02:00
Yang Xizhi 47dce05cfa Merge branch 'master' into fix 2022-10-06 23:10:15 +08:00
GlodBlock ab4acbe5eb fix wrong bytes display when ingrentent isn't enough and a possible dupe from fluid packet decoder 2022-10-06 23:07:26 +08:00
Martin Robertz 587fd70876 Merge pull request #22 from GTNewHorizons/craftin-card 
crafting card support for fluid export bus
1.0.21-gtnh 		2022-10-04 12:14:07 +02:00
GlodBlock d820b68a7d uh 2022-10-03 20:04:19 +08:00
GlodBlock bce6e35675 crafting card support for fluid export bus 2022-10-03 19:46:57 +08:00
Martin Robertz b6b9f71677 Merge pull request #21 from GTNewHorizons/eio-compact-fix 
eio conduct compact and fix transfer item and fluid in different dirs
1.0.20-gtnh 		2022-10-01 12:56:28 +02:00
Martin Robertz 63daee5e56 Merge pull request #20 from asdflj/master 
Update and fix some bug
 2022-10-01 10:49:50 +02:00
GlodBlock c6f7c17854 eio conduct compact and fix transfer item and fluid in differentdirections 2022-10-01 14:44:34 +08:00
asdflj 61ac42d270 fix MouseRegionManager can't display tooltip. 
when ingredient buffer outputting fluid, the current slot is used continuously,not from first slot to start output.
 2022-09-30 16:55:11 +08:00
GlodBlock 989cd173fb more sanity asm 2022-09-29 21:42:27 +08:00
asdflj 8cafbceed7 add crafting preview screen support nei bookmark 2022-09-29 19:50:22 +08:00
Martin Robertz 292a70ab6e Merge pull request #18 from asdflj/master 
me dual interface add insert mode
1.0.18-gtnh 		2022-09-22 17:25:49 +02:00
Martin Robertz a575e58ac7 Merge pull request #19 from GTNewHorizons/packet 
add obs check
1.0.17-gtnh 		2022-09-21 18:16:09 +02:00
GlodBlock b6e7a2f570 add obs check 2022-09-21 22:00:40 +08:00
Martin Robertz 69418714dd Merge pull request #17 from GTNewHorizons/packet 
asm packet return to crafting inventory
1.0.16-gtnh 		2022-09-21 09:02:35 +02:00
GlodBlock de89faed70 . 2022-09-21 13:48:32 +08:00
asdflj 2b8c983e8a me dual interface add insert mode 2022-09-21 12:32:45 +08:00
GlodBlock 733774e7a3 asm packet return to crafting inventory 2022-09-21 00:04:41 +08:00
Martin Robertz a63add7bff Merge pull request #16 from asdflj/master 
update
1.0.15-gtnh 		2022-09-17 14:17:02 +02:00
zy f6c10901d9 update 
add recipe encode pattern crafting blank pattern
add control shift click to encode whole stack
fix import export nane display error
 2022-09-17 20:05:30 +08:00
zy c313f51750 update 
add recipe encode pattern crafting blank pattern
add control shift click to encode whole stack
fix import export nane display error
 2022-09-17 19:05:31 +08:00
Martin Robertz 1d4acb8076 Merge pull request #15 from GTNewHorizons/fix/rename 
Display dual interface custom name
1.0.13-gtnh 		2022-09-08 12:08:15 +02:00
DianeXD bdf3ab1a56 Display dual interface custom name 2022-09-07 21:18:19 +08:00
Martin Robertz b51f786f53 Merge pull request #14 from asdflj/master 
update zh lang and fix import export bus shift click transfer upgrade card
1.0.12-gtnh 		2022-09-04 17:49:39 +02:00
asdflj 6d5c8ca435 Update zh_CN.lang 2022-09-04 19:03:33 +08:00
zy 9d6c0b4c56 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java
 2022-09-03 20:20:49 +08:00
zy 49181f3df6 add fluid bus shift click transfer upgrade card into the slot 2022-09-03 20:19:38 +08:00
zy 92e5c4adc7 add fluid bus shift click transfer upgrade card into the slot 2022-09-03 18:55:42 +08:00
asdflj 409e1f2a8d Merge branch 'GTNewHorizons:master' into master 2022-09-03 03:47:32 -05:00
asdflj 15c056556d update zh_ch lang 2022-09-02 10:44:29 +08:00
Martin Robertz 76f2ddf18e Merge pull request #13 from GTNewHorizons/overflow 
fix int overflow in fluid storage cell
1.0.11-gtnh 		2022-09-01 11:32:26 +02:00