Commit graph

1042 commits

Author SHA1 Message Date
Blood-Asp
699ea26ba4 Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect. 2017-06-13 22:41:15 +02:00
Blood-Asp
3caab8d4ff Fix translation of covers 2017-06-13 21:48:10 +02:00
Blood-Asp
9209d0843f Port GT6 timber changes 2017-06-13 18:58:18 +02:00
Blood-Asp
ead3fa6ad7 meh... 2017-06-13 18:57:05 +02:00
Blood-Asp
c665b14e22 Merge pull request #1088 from Techlone/reworking_dataorb
Reworking DataOrb and DataStick
2017-06-13 18:55:33 +02:00
Techlone
156bb2b06b Tooltips changing 2017-06-13 21:09:48 +05:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Techlone
c8a8687a72 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-13 17:44:23 +05:00
Techlone
bfd3ff4b19 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-13 17:44:13 +05:00
Blood-Asp
e85a761e82 At last one free face. 2017-06-12 13:48:54 +02:00
Blood-Asp
ef22bf6ab9 Only open machine gui if front is free. 2017-06-12 12:18:54 +02:00
Blood-Asp
8e043d00d9 Cables and pipes now change hitboxes dynamicly depending on connections or covers 2017-06-12 11:58:26 +02:00
Blood-Asp
e0cd4376b1 change back the component heat exchanger damage value 2017-06-12 11:34:25 +02:00
Blood-Asp
30b6d22d81 Merge pull request #1083 from Techlone/unstable
More fixes for the world gen
2017-06-10 23:41:41 +02:00
Techlone
d7debfd34e fix wrong center chunk coordinates 2017-06-08 21:27:24 +05:00
Techlone
8172e2ef60 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-08 20:42:06 +05:00
Blood-Asp
0a375ac948 experimental worldgen change fix 2017-06-07 19:00:15 +02:00
Techlone
38e12d554c Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-07 18:13:47 +05:00
Blood-Asp
9032c2e15b Quick fixes 2017-06-07 09:45:19 +02:00
Blood-Asp
1296755b27 Merge branch 'refs/heads/pr/1077' into unstable
# Conflicts:
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07 09:37:13 +02:00
Blood-Asp
3b1f55fcb9 Merge pull request #1076 from vlad20012/int-overflow-fix
Fixed stored energy integer overflow
2017-06-07 09:30:04 +02:00
Blood-Asp
425a6d1cea forgot to commit the oredict changes 2017-06-06 23:58:30 +02:00
Blood-Asp
688e6eb122 Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for marble/basalt, chisel compat #1050 2017-06-06 23:57:33 +02:00
Blood-Asp
589a77c5cb Check general redstoneoutput for null 2017-06-06 16:19:45 +02:00
Blood-Asp
530a334bb1 Fix Nitric Acid name #1079 2017-06-06 15:32:06 +02:00
Blood-Asp
d9a318678c Correcting Steel Boiler Tooltip #1080 2017-06-06 13:00:11 +02:00
Blood-Asp
b4b8820373 Fix vents as covers. Ventcovers now speed up machines 1-3% #1065 2017-06-06 00:07:09 +02:00
Blood-Asp
d26d9e1045 Attempt to prevent worldgen loops with other mods #1063 #828 2017-06-05 23:30:53 +02:00
Blood-Asp
4c25e83b0d Improved large boiler tooltip #877 2017-06-05 21:07:23 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Techlone
3fa72fd1f1 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-05 18:57:11 +05:00
Technus
e4b28e6208 Thiccness changes done 2017-06-05 15:36:02 +02:00
Technus
b3d49a8c96 Adjust pipe thiccnes 2017-06-05 15:30:43 +02:00
Technus
8293ac9d5c this actually changes the raytracer boxes reusing the collision boxes 2017-06-05 15:23:37 +02:00
Technus
71aeac25b9 Missing in item pipe 2017-06-05 15:03:34 +02:00
Blood-Asp
e102488f2c More redstone changes 2017-06-04 19:11:03 +02:00
Techlone
dbd2f58008 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-04 21:30:51 +05:00
Technus
c9908ffa98 wire/pipe hiding/reduced size 2017-06-04 09:28:43 +02:00
Technus
0db3a1d6df Missing override 2017-06-04 09:25:46 +02:00
vlad20012
64a69695e5 Fixed stored energy integer overflow 2017-06-04 05:32:47 +03:00
Blood-Asp
30de32fb07 Monocrystalline Silicon Boule 2017-06-04 00:28:53 +02:00
Blood-Asp
23de1f09ed Cleanroom controller outputs efficency as redstone signal #948 2017-06-04 00:26:31 +02:00
Technus
467e6ba022 1ddc91a 2017-06-03 16:11:59 +02:00
Blood-Asp
9a3fa2e42c Fix Pollution bug 2017-06-03 13:42:41 +02:00
Blood-Asp
b0049786b7 Make Casings and reinforced blocks transfer redstone signals 2017-06-02 18:15:29 +02:00
Blood-Asp
e3b3fd66f1 Fix compressed meteoric iron recipe. #1071 2017-06-02 12:36:31 +02:00
Blood-Asp
18c92489fd Update Modpack info 2017-06-02 12:17:56 +02:00
Blood-Asp
8342537d8c Add newlines 2017-06-01 21:23:34 +02:00
Blood-Asp
dad36f6c48 Added links to Addons and modpacks to readme 2017-06-01 21:21:27 +02:00
Techlone
4f6bdedf96 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-01 23:09:27 +05:00