Commit graph

469 commits

Author SHA1 Message Date
vlad20012
64a69695e5 Fixed stored energy integer overflow 2017-06-04 05:32:47 +03: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
Johannes Gäßler
7e07c88383 Made rubber consistent, rewrote WireProcessing, implemented ht cables
All rubbers are now made by first producing the polymer and then
vulcanizing it with Sulfur (equivalent to natural rubber).

Rewrote WireProcessing to reduce the amount of duplicate code.

Implemented recipes that utilize a combination of a dielectric and a
synthetic rubber to make cables.
This halves total insulation cost for below-EV cables and reduces it to
75% for EV+ cables (conductive polymer not yet implemented).
2017-06-03 12:59:25 +02:00
Johannes Gäßler
e3873392a8 Added two changes accidentally not added to the previous commit. 2017-06-03 12:47:01 +02:00
Johannes Gäßler
8a19bd9fc9 Increased the input slots of the assembler from 2 to 6. 2017-06-03 12:45:20 +02:00
Techlone
c5402ee389 Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers
change build.gradle for debugging in IDEA
2017-06-02 22:18:29 +05:00
Johannes Gäßler
63a5d1dad7 Added methods for adding Distillery recipes with a solid output.
Universal Distillation recipes now utilize the solid output.

Fixed the chemical formula for Tetranitromethane and fluid name for
NitroDiesel
2017-06-01 22:59:06 +02:00
Techlone
067f4491a8 Merge branch 'unstable' into advminer2_improvements 2017-06-01 20:59:40 +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
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
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +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
Techlone
19f7074897 Merge branch 'unstable' into advminer2_improvements 2017-06-01 00:02:13 +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
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
c28a8ceb78 Catch broken items on recipe move 2017-05-31 18:10:11 +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
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
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
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
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
Johannes Gäßler
856f1bebbf Changed the NEI GUI of the Distillation Tower to show up to 12 outputs.
Also added a currently unused GUI for 9x9 recipes.
2017-05-16 22:19:36 +02: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
359e7e5905 Added Materials for Hydrocarbon chains of up to 4 carbon atoms. 2017-05-14 19:34:14 +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
Johannes Gäßler
60348c09ba Added a new recipe map for the LCR, expanded the API to allow for custom
NEI stack positioning.

Refactored the name of the Large Boiler Fake Fuels so they're in line
with other names.
Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-13 16:37:39 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12 21:12:01 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
7bc06a3969 Implemented checkMachine for the LCR, added machine casings 2017-05-08 00:11:36 +02:00
Johannes Gäßler
0aeab34a56 Fixed the Electric Blast Furnace not recognizing recipes when there is
more than one Fluid input.

Also added a String representation for GT_FluidStack that was used for
debugging.
2017-05-06 18:01:06 +02:00
Johannes Gäßler
5e43252e8a Added a graphic for acids, made the javadoc more descriptive 2017-05-04 22:04:04 +02:00
Johannes Gäßler
f625a93e46 Materials for existing fluids, ash nerf, plastic production svg 2017-05-02 21:06:35 +02:00
Johannes Gäßler
978c4877b6 Added molecular formulas for the new materials, added alternative
charcoal recipes.

Charcoal can now be made by treating Wood Pulp or Sugar with Sulfuric
Acid (takes very long, doesn't scale well)
2017-05-01 22:02:36 +02:00
Johannes Gäßler
2a8bc79bb5 Added recipes for centrifuging Stone Dust
The amount of elements you get from centrifuging is proportional to
their mass percentage in the earths continental crust with a tolerance
of ~5-20%
2017-05-01 12:42:21 +02:00
Johannes Gäßler
09c76543b2 methods for pipe creation, new plastic pipes, implemented PVC
Added a new plastic: Polyvinyl Chloride, currently only used for item
pipes

Added Polytetrafluoroethylene Fluid Pipes

Fixed the number of fluid cells for polymerization, Fixed the default
alpha value for the MaterialBuilder class
2017-05-01 00:47:19 +02:00
Johannes Gäßler
1f83a98876 New recipes, convenience methods, recipe rebalancings
Implemented new recipes for Gunpowder, Saltpeter, Sulfuric Acid 
Gave Sulfur dust a burn value (1600, the same as coal)
Made all chemical recipes stoichiometrically correct whenever possible
(2 H + 1 O -> 1 H2O instead of 2 H + 1 O -> 3 H2O)
Added a convenience method to Materials that lets you get dust
succinctly
Put all simplified recipe additions in a separate method, the config is
still missing
2017-04-30 18:04:25 +02:00
Johannes Gäßler
8ac41d3c3c Chem reactors can now output 2 items, implemented recipes for Nitric
Acid,added utility methods to get Material cells or integrated circuits,
it's now possible to declare a temperature for automatically created
fluids / gases
2017-04-30 01:36:10 +02:00