Commit graph

93 commits

Author SHA1 Message Date
Johannes Gäßler
ddf58e6ef4 Merge branch 'unstable_blood' into unstable
Conflicts:
	src/main/java/gregtech/api/enums/MaterialBuilder.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-26 20:25:32 +02:00
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable
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/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25 23:45:45 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
Johannes Gäßler
6f3d92f3fa Added a config option for easier EV+ Cables 2017-06-24 11:56:35 +02:00
Johannes Gäßler
c0c498fb8c Added Bricked BF config, fixed Primitive BF class hierarchy
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
2017-06-23 23:48:38 +02:00
Johannes Gäßler
668ca431a8 Merge remote-tracking branch 'origin/unstable' into OilRefining
Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18 17:26:04 +02:00
Johannes Gäßler
34474480f7 Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
Conflicts:
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15 12:28:14 +02:00
Blood-Asp
911a807529 pollution smog 2017-06-14 23:51:39 +02:00
Draknyte1
d1eea59fe7 Made the Cleanroom optional.
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14 18:55:26 +10:00
Blood-Asp
9209d0843f Port GT6 timber changes 2017-06-13 18:58:18 +02:00
Blood-Asp
ead3fa6ad7 meh... 2017-06-13 18:57:05 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +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
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
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
Yuriy Shnitkovskiy
bc7eaaa762 Added config for automation 2017-05-16 19:49:46 +03: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
a0bf545451 Added config for simple chemical recipes and stone dust centifugation 2017-05-01 14:36:50 +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
bf414f1c99 Implemented Nitric Acid, Rocket Fuel 2017-04-28 23:34:39 +02:00
Johannes Gäßler
869cad0bba Added a lot of (petro)chemistry stuff, expanded the API
Created an adapter class for creating materials.
Materials now have bit flags for automatic gas/fluid creation.
Added a new convenience method for adding distillery recipes.
Recipes now show the exact recipe duration instead of the duration
rounded down to the nearest int.

Added new Materials with relevant recipes:
Acetic Acid, Acetone, Calcium Acetate, Charcoal Byproducts, Carbon
Monoxide, Ethanol, Ethylene, Methanol, Methyl Acetate, Polyvinyl
Acetate, Propene, Sulfuric Ethylene, Vinyl Acetate

Made vinegar visible.
2017-04-19 23:36:50 +02:00
Blood-Asp
f030951982 Config for blocks below crops 2017-03-31 21:19:04 +02:00
Blood-Asp
dd8510792f Detect low grav dimensions by world provider 2017-03-31 19:01:32 +02:00
Blood-Asp
e73ee32ddb Reserved IDs 2017-02-28 15:01:43 +01:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
Maxime Legkiy
8e2280bc2c Fix name config category to UndergroundFluid
Fix comments configuration
Fix Start config - add nether and end to BlackList. Default spawn fluids on overworld and Moon.
Add Decrease Per Operation Amount (if 0 an endless source)
2017-02-17 01:55:54 +03:00
Maxime Legkiy
901a7d66c1 Add new flexible configuration undeground oil 2017-02-13 04:24:48 +03:00
Maxime Legkiy
772ec04bf3 Add Underground Oil Generating settings in GregTech.cfg
Add supports White and Black List (DIM ID)
Add settings generating for standart Dimension and Galacticraft Dimension - Moon and Mars
Add settings for select type Underground Fluid - for Nether default Pahoehoe Lava, for Moon - Helium 3
Add settings max Amount Generating
For generating oil in other Dimension (Twilight Forest or Mystcraft) use settings - RealDimensionEnable
2017-02-09 05:38:20 +03:00
Maxime Legkiy
d3a72491b4 Add support Save/Load Dimensions Data 2017-02-07 04:47:52 +03:00
Maxime Legkiy
d703850358 Add UndergroundOil Settings 2017-02-07 02:44:31 +03:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00
David Vierra
d519d7f00b Replace all literal numbers referring to tool types with named constants 2016-12-13 19:15:07 +01:00
Данила Большаков
8ea9df2e7b Hide bar 2016-12-13 13:53:37 +03:00
Danila Bolshakov
60704cca7f forgot check null 2016-12-13 11:50:01 +03:00
Danila Bolshakov
920ba2f0c3 Add progress bar 2016-12-13 11:41:38 +03:00
Blood-Asp
a60428ab53 Fix ignored oredict names list not working 2016-11-01 13:18:44 +01:00
Blood-Asp
814dc25690 Modular Armor changes 1 2016-10-30 22:39:40 +01:00
Blood-Asp
16f03e76e8 Allow max 1 crafting sound every 10 ticks to prevent rare crashes. 2016-10-26 20:34:04 +02:00
Blood-Asp
dc56e5ef44 Immersive Engineering compatibility and more fuels in generators 2016-10-22 13:04:50 +02:00
Blood-Asp
a70ce1a67b Cleanup recipe classes 2016-10-19 13:37:36 +02:00
Blood-Asp
4384688c07 Fix Compressed Aluminium issues. Making of Compressed plates and use in heavy duty alloy ingots. 2016-10-18 18:49:48 +02:00
Blood-Asp
a006b76304 Drop Items from Exploding GT Machines + Config 2016-10-13 22:26:14 +02:00
Muramasa
e16b037cb7 Add config to enable all disabled mats & components. 2016-10-13 18:51:14 +01:00
Muramasa
79f0947172 Pull exp changes 2016-10-07 16:50:34 +01:00
Muramasa
b88e197530 Fix GT Crop extraction recipes & Seperate Comb&Crop nerf config option 2016-10-07 16:44:21 +01:00
Blood-Asp
c27399b512 Move load order for doors to fix malisis doors conflict. 2016-10-07 17:36:21 +02:00
Muramasa
16a3c059b3 Fix pollution onWorldTick server crash 2016-09-28 13:23:21 +02:00
Muramasa
7b7e0d8a78 Fix pollution onWorldTick server crash 2016-09-28 08:07:07 +01:00