Commit graph

1358 commits

Author SHA1 Message Date
Techlone
067f4491a8 Merge branch 'unstable' into advminer2_improvements 2017-06-01 20:59:40 +05:00
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
52e9d2ea9e The MV Chemical Reactor no longer needs plastic.
Plastic has been rebalanced as a Material that strictly only becaomes
available with MV.
To avoid circular dependencies MV Chemical Reactors no longer strictly
needs plastic.
2017-05-30 23:51:02 +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
Johannes Gäßler
56bb017df6 Implemented SBR recipes, Added method for LCM recipes, adjusted
polymerization

Polymerization now requires Titaniumtetrachloride instead of Titanium
Dust; Can only be performed in a LCM.

Adjusted the visual representation of LCM recipes in NEI
2017-05-30 02:10:13 +02:00
Johannes Gäßler
407c77fd31 Added Materials for Polystyrene, SBR, implemented Polystyrene recipes 2017-05-29 14:24:52 +02:00
Johannes Gäßler
98ade12e9c Added recipes for the synthetic production of rubber from hydrocarbons 2017-05-29 12:29:16 +02:00
Johannes Gäßler
3a01667534 Added Recipes for Tetranitromethane, made it the additive for NitroFuel
Moved the old NitroFuel recipes to simplified recipes.

Added a new Material for Diluted Sulfuric Acid.

Adjusted the fuel value of Ethanol: 128 -> 168.

Adjusted the recipes for Capacitors; Particularly you can now use PVC
instead of silicone.
2017-05-29 10:52:51 +02:00
Johannes Gäßler
e445fafd32 Fixed a bug where cicuit configs for distilleries ranged from 0-10
instead of 1-11
2017-05-29 00:13:18 +02:00
Johannes Gäßler
c38cc2bc7b Changed the Distillation Tower so that it outputs fluids only at the
correct levels.

Adjusted existing distillation recipes so that they line up with this
change.
Slightly rebalanced Charcoal Byproducts.
2017-05-29 00:09:38 +02:00
Johannes Gäßler
3d83a381d6 Added recipes for distilling cracked hydrocarbons, adjusted fuel values
Made it so that all Hydrocarbons have a fuel value of 24000 * C + 20000
* H.
Oxygen for alcohols is ignored.

In particular:
Hydrogen: 15000 -> 20000
Methane: 45000 -> 104000

LPG production no longer yields Methane.
LPG is now produced from Propane or Butane.
Super Fuel from LPG is now a simplified recipe.
Methane from centrifuging food is now a simplified recipe.
2017-05-28 19:30:02 +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
407c7e3ac3 Fixed IC2 steam compatibility for cracking 2017-05-25 23:52:33 +02:00
Johannes Gäßler
4c02055503 Rewrote parts of the Oil Cracker so that it's in line with the new
recipes
2017-05-25 18:34:00 +02:00
Johannes Gäßler
e304e8f9de Fixed stocheometrically incorrect Chloroform recipe. 2017-05-25 01:06:48 +02:00
Johannes Gäßler
66c957a21e Removed debugging print accidentally left in from the previous version 2017-05-25 00:41:17 +02:00
Johannes Gäßler
b27566a70a Expanded Materials class for cracked Fluids, changed cracking recipes
Fluid cracking can be done with either Steam or Hydrogen and at 3
different severities for a total of six different recipes.
Cracking severity is controlled with a programmed circuit.

Removed the previously used liquids for cracked light fuel/heavy fuel

Changed the Distillation Tower recipes so they can utilize up to 11
fluid outputs
2017-05-24 23:59:42 +02:00