Commit graph

1142 commits

Author SHA1 Message Date
Techlone
f2f74c09f9 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-01 20:59:20 +05:00
Techlone
7c48590a49 OreDrill state saving 2017-06-01 20:58:24 +05:00
Techlone
75a33be210 Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this 2017-06-01 20:23:13 +05: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
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +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
Techlone
19f7074897 Merge branch 'unstable' into advminer2_improvements 2017-06-01 00:02:13 +05:00
Techlone
f19e920925 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-01 00:01:54 +05:00
Techlone
b187410005 AdvMiner rewriting; now it's Ore Drilling Plant
Four tiers of Ore Drilling Plant
I - radius is 3 chunks MV+ (default)
II - radius is 4 chunks HV+
III - radius is 6 chunks EV+
IV - radius is 9 chunks IV+

New behavior:
- pick pipes after mining finish
- extract ore block before moving down
2017-06-01 00:01:32 +05:00
Johannes Gäßler
3c45c2accb Added recipes for oil desulfurization with Fluids and Cells swapped. 2017-05-31 19:03:51 +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
Johannes Gäßler
038e51535b Fixed a bug where the Chemical Reactor still only had one output slot in
it's machine inventory, causing the second output to be voided.
2017-05-30 17:00:31 +02:00
Johannes Gäßler
38bfbabd58 Fixed a bug where the LCM could have a mMaxProgressTime of zero. 2017-05-30 10:21:46 +02:00
Techlone
a391c6fca8 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-05-27 20:45:19 +05:00
antifluxfield
c42c2facb1 Update GT_Cover_PlayerDetector.java 2017-05-27 14:48:39 +08:00
antifluxfield
aa4839ebf6 Update GT_Cover_PlayerDetector.java 2017-05-27 14:46:03 +08:00
Johannes Gäßler
e304e8f9de Fixed stocheometrically incorrect Chloroform recipe. 2017-05-25 01:06:48 +02:00
Johannes Gäßler
32db407391 Removed debugging prints accidentally left in the previous commit 2017-05-18 19:27:53 +02:00
Johannes Gäßler
d805ce4613 Fixed MaterialStack String representations sometimes missing brackets 2017-05-18 19:22:06 +02:00
Yuriy Shnitkovskiy
c0f8bafc60 I guess I wanted to put it here for some reason 2017-05-16 19:52:04 +03:00
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03:00
Yura
4e3ed071dc Auto Maintenance Hatch tweaks
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-16 16:17:01 +03:00
Johannes Gäßler
724f9a4e09 Moved the Biomass -> Ethanol recipes to the simplified chemical recipes. 2017-05-16 00:18:03 +02:00
Johannes Gäßler
8823dc53f8 Added a GUI for the Large Chemical Reactor 2017-05-15 21:08:27 +02:00
Johannes Gäßler
921cff51d8 Bugfix: I had accidentally copied the IC2 Biogas recipes instead of
moving them.
2017-05-14 18:51:58 +02:00
Johannes Gäßler
d77592f68d Moved old IC2 Biogas recipes to the simplified recipes. 2017-05-14 18:49:08 +02:00
Johannes Gäßler
25ff27a2a2 Merge branch 'LargeChemicalReactor' into ChemistryUpdate 2017-05-13 23:40:08 +02:00
Johannes Gäßler
c0152219c5 Corrected several chlorination recipes in terms of stoichiometrics 2017-05-13 23:35:25 +02:00
Johannes Gäßler
a16ea6bbc7 Changed the Layout of the LCM to 3x3x3, tweaked the name of casings and
the descriptions of multiblocks to make them consistent.
2017-05-13 23:08:50 +02:00
Johannes Gäßler
17edbc2d48 Fixed a bug that caused there to be two identical recipes for TiF4 2017-05-13 17:51:51 +02:00