Commit graph

827 commits

Author SHA1 Message Date
Blood-Asp
0a375ac948 experimental worldgen change fix 2017-06-07 19:00:15 +02: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
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
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
7ddf9c5f4e Teleporter and Energy Transmitter fixes 2017-06-01 13:28:05 +02:00
Daniel
0a928887ed Cleanup and some commentary 2017-06-01 13:24:02 +02:00
Daniel
8b1e6d55be 7bd71fe 2017-06-01 13:23:51 +02:00
Daniel
28694dac93 Fix that so pollution is not negative. 2017-06-01 13:22:27 +02:00
Technus
a4f0426159 8e0e516 2017-06-01 13:22:10 +02:00
Technus
a99e0d4ffb Not needed. 2017-06-01 13:19:27 +02:00
Technus
82458fed2e Cherry-Pick c12e474
c12e474c23
2017-06-01 13:18:34 +02:00
Technus
7a08da6a06 that makes it look better? 2017-06-01 12:01:20 +02:00
Technus
427b1e105a Why does one change the machine state TWICE in the same tick... 2017-06-01 12:00:52 +02:00
Blood-Asp
9a69e1978d Fix comb processing recipes #1052 2017-05-31 22:57:21 +02:00
Blood-Asp
94f8581477 Fix multiblock recipe search fix #1044 2017-05-31 21:52:58 +02:00
Blood-Asp
b047ab56b2 Fix spelling #1043 2017-05-31 21:42:32 +02:00
Blood-Asp
080c229e09 fix #1041 2017-05-31 21:37:50 +02:00
Blood-Asp
4c17c2beff Make Internal wireless redstone work as machine controller 2017-05-31 21:37:26 +02:00
Blood-Asp
09e0361990 Add recipe for very heavy oil 2017-05-31 21:11:34 +02:00
Blood-Asp
b418fede09 Change Automaintain default 2017-05-31 18:59:32 +02:00
Blood-Asp
5386a69022 Merge pull request #1051 from JohannesGaessler/unstable
[5.09.29] EBF recipe fix followup
2017-05-31 18:58:06 +02:00
Blood-Asp
3f73fa9b86 Merge pull request #1058 from Georggi/patch-4
Auto Maintenance Hatch tweaks
2017-05-31 18:57:39 +02:00
Blood-Asp
ba030d3239 Merge pull request #1060 from JohannesGaessler/MaterialFormulaFix
Material formula fix
2017-05-31 18:57:05 +02:00
Blood-Asp
b170cd5a5c Merge pull request #1067 from antifluxfield/unstable
Wrong behavior of Player Detector
2017-05-31 18:55:35 +02:00
Blood-Asp
1af33411d2 Disable switching armor gui because of broken sync 2017-05-31 18:53:56 +02:00
Blood-Asp
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +02:00
Blood-Asp
40304ed2f5 Catch login armor crash 2017-05-31 18:09:30 +02:00