Commit graph

1596 commits

Author SHA1 Message Date
Johannes Gäßler
3b39210348 Fixed desulfuriation recipes colliding with hydro-cracking recipes 2017-08-20 10:15:25 +02:00
Johannes Gäßler
1c8df8fb7f Fixed Titaniumtetrachloride temperature 2017-08-19 23:56:48 +02:00
Johannes Gäßler
c281488927 Merge branch 'unstable' into PyrometallurgyUpdate
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 23:46:31 +02:00
Johannes Gäßler
d85b7bee49 Fixed Chloroform recipe 2017-08-19 23:36:10 +02:00
Johannes Gäßler
1afc8405e8 Added multi-step recipes for the Large Chemical Reactor
Added recipes for the Large Chemical Reactor that perform several steps
of a processing line in a single recipe.
2017-08-19 23:32:39 +02:00
Johannes Gäßler
af8860be2f Merge remote-tracking branch 'origin/unstable' into
CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 14:24:52 +02:00
Johannes Gäßler
967c3c07af Reduced Oxygen consumption of Plastic Production by 50% 2017-08-19 13:32:09 +02:00
Johannes Gäßler
d294ba9773 Reduced the cost of Fluid Canners
Circuits: 2 -> 1
Pumps: 2 -> 1
Glass: 2 -> 4
2017-08-19 11:46:52 +02:00
Johannes Gäßler
e8c75a54ee Fixed Steam Macerators using constant EUt, recipe time 2017-08-19 11:32:29 +02:00
Johannes Gäßler
1b5047df4f Old chemical recipes are now enabled by default, marked as deprecated 2017-08-19 10:43:07 +02:00
Antifluxfield
4724bbe403 Adding tooltip 2017-08-19 12:08:34 +08:00
Techlone
ec0767d4fd Fix inconsistent worldgen 2017-08-19 03:17:14 +05:00
Johannes Gäßler
54437dc8f1 Greatly increased IC2 Biomass consumption, added scaleable FB recipes
Previously the energy density of IC2 Biomass was very high.
1000L of IC2 biomass could be converted into 32000L of IC2 Biogas in the
Distillery or into 64000L of IC2 Biogas in the Distillation Tower.

With an IC2 Canning Machine and a Distillery you got 128000 EU from 1
Potato.
With a Pyrolyse Oven and a Distillation Tower you got 320000 EU from 1
Potato.

With the increased consumption rates (x16/x32) of Biomass the energy
Density has been greatly reduced.
1 Potato now yields 8000 EU with an IC2 Canning Machine and 12000 EU
with a Pyrolyse Oven.

Also, scaleable Recipes for Fermented Biomass has been added.
It is now possible to produce Fermented Biomass in the Pyrolyse Oven
without the need of any Fermenters.
2017-08-18 09:24:02 +02:00
Johannes Gäßler
1e4f093966 Reenabled several old recipes regardless of the config
-IC2 Biomass -> IC2 Biogas
-Forestry Biomass -> Ethanol
-LPG -> Super Fuel
-Food --Centrifuge--> Methane
-Heavy Fuel/Light Fuel --Distillery--> Toluene
2017-08-18 08:41:13 +02:00
Muramasa-
87cdb8ac00 Fix use of RedstoneAlloy resulting in broken recipe 2017-08-17 23:28:31 +01:00
Antifluxfield
6691f1e86c Update GT_Cover_FluidRegulator.java
Improve the screwdriver-rightclick behavior.
2017-08-17 14:51:45 +08:00
Antifluxfield
505a9c263e Update GT_MetaTileEntity_MultiBlockBase.java 2017-08-16 17:51:12 +08:00
Antifluxfield
4b36ca77be Fix the Generated Item Pipes
Correct the factor.
2017-08-16 16:23:08 +08:00
Antifluxfield
a0eb30d03f Clean up imports 2017-08-16 14:00:52 +08:00
Antifluxfield
ae5a1e117d Move the Data-Access codes only to those who really needs them. 2017-08-16 13:35:45 +08:00
Antifluxfield
c09f6b5bdd Fix Tooltip of Pump
Add the missing bracket
2017-08-16 13:14:23 +08:00
Johannes Gäßler
75a528d825 Added Ass. recipes for Electronic Circuit components, reduced GT time
The following components can now be made in an Assembling Machine:
-Coated Circuit Board (-62.5% Sticky Resin cost)
-Vacuum Tube (-33% Copper/Paper cost)
-Phenolic Circuit Board (-20% Glue/Bisphenol A cost)

The time needed to make Glass Tube in the Alloy Smelter has been
reduced: 12s -> 8s
2017-08-13 11:51:45 +02:00
Johannes Gäßler
a184258c98 Reverted the changes to basic machine processing.
Basic Machines no longer automatically add an integrated circuit to
their input.
2017-08-13 09:08:24 +02:00
Technus
8eade43a19 Fix NPE, GREG why u no crash game! 2017-08-12 15:08:25 +02:00
Muramasa-
9fc5d17eb5 Pump tooltips 2017-08-12 02:21:09 +01:00
Muramasa-
14a7d0768f Show dim id with scanner 2017-08-11 23:04:33 +01:00
Muramasa-
8b85da877d implements #1061 2017-08-11 22:52:51 +01:00
Muramasa-
eb24bee24b Some tooltip info #1183 2017-08-11 22:08:49 +01:00
Muramasa-
d58cece573 maybe correct #1137 2017-08-11 21:19:55 +01:00
Blood-Asp
a7c5d30146 Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterials
More Item Pipe Materials
2017-08-11 21:24:48 +02:00
Blood-Asp
d4ea25e1bc Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScaling
Pyrolyse oven coil scaling
2017-08-11 21:20:08 +02:00
Blood-Asp
ff7396509b Merge pull request #1176 from Dimach/unstable-4
Added new info to batbuffer nuclear control panel and fixed bug
2017-08-11 21:14:08 +02:00
Blood-Asp
1b1f96dcd9 Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowup
Cracking Balance Followup
2017-08-11 15:18:10 +02:00
Blood-Asp
9962e826a7 Merge pull request #1159 from JohannesGaessler/AshRebalance
Ash rebalance
2017-08-11 15:16:16 +02:00
Blood-Asp
42094fdf46 Merge pull request #1158 from JohannesGaessler/StoneDustRebalance
Stone Dust Rebalance
2017-08-11 15:07:05 +02:00
Blood-Asp
2c50b0a825 Merge pull request #1157 from Dimach/unstable-1
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
2017-08-11 14:54:23 +02:00
Blood-Asp
c0da1931dd Merge pull request #1156 from Antifluxfield/distillery-recipe-fix-alt
Another Distillery recipe fix
2017-08-11 14:33:27 +02:00
Blood-Asp
4ae02f55c8 Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFix
Multiblock Fluid IO fix
2017-08-11 14:24:37 +02:00
Blood-Asp
987d1ec11e Merge pull request #1149 from joakibj/fix-orebasalticmineralsand
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
2017-08-11 14:21:03 +02:00
Blood-Asp
46420e73cb Merge pull request #1144 from Dimach/unstable
Fixed coloring of pyrolyse oven.
2017-08-11 14:19:10 +02:00
Johannes Gäßler
a749a8536f Reverted changes to Mercury Ore Washing. 2017-08-07 23:12:27 +02:00
Johannes Gäßler
c2ededaf5a Made the tooltips for Multiblock Hatches more descriptive. 2017-08-07 22:00:26 +02:00
Johannes Gäßler
f3d3cc24de Fixed a bug where the Nugget amount did not scale with the config 2017-08-07 21:20:43 +02:00
Johannes Gäßler
4822c5ca28 Reverted the Galena formula: PbS -> Pb3Ag3S2 2017-08-07 21:06:41 +02:00
Johannes Gäßler
e4fff57b04 Reverted the change that gated Plastic at MV. It's available at LV again 2017-08-07 20:56:22 +02:00
Johannes Gäßler
3b7a016408 Replaced Tin with Wrought Iron as Item Pipe Material 2017-08-07 20:50:41 +02:00
Johannes Gäßler
a7787342b1 Fluid can now also be locked via cells, added a chat message 2017-08-06 12:05:08 +02:00
Johannes Gäßler
a63730107b Implemented NBT for the Locked Fluid 2017-08-06 09:41:44 +02:00
Johannes Gäßler
cbcb04d117 Output Hatches can now be locked to a specific fluid
Currently not working as intended
2017-08-06 09:36:05 +02:00
Johannes Gäßler
9bd9d7d5e0 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-06 09:36:02 +02:00