Commit graph

31 commits

Author SHA1 Message Date
Johannes Gäßler
de42d1da42 Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
BrickedBlastFurnace

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/api/enums/Textures.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17 01:02:38 +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
9209d0843f Port GT6 timber changes 2017-06-13 18:58:18 +02:00
Johannes Gäßler
7982374b38 Added a Recipe Map for Primitive Blast Furnaces
The Recipe Map is not yet in use.
2017-06-10 11:05:27 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Blood-Asp
23de1f09ed Cleanroom controller outputs efficency as redstone signal #948 2017-06-04 00:26:31 +02:00
Technus
82458fed2e Cherry-Pick c12e474
c12e474c23
2017-06-01 13:18:34 +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
Johannes Gäßler
37eea39e29 Enabled solid output for Distilleries, implemented Epoxy Resin / PTFE
production

Expanded the GregTech API: There is now a convenience method for
automatically creating polymerization recipes.

Disabled recipes for the Salty Water Potion in favor of a new Salt Water
fluid.
Slightly nerfed Sulfuric Acid production from Sulfur and Water to make
them align with other acids and bases (1 Dust / 1000L Chemical + 1000L
Water -> 1000L acid/base)
2017-04-22 19:08:47 +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
d41d3cd2b3 Add assemblyrecipes for all circuits per oredict 2017-03-31 22:24:15 +02:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00
Muramasa
173700a611 Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
Muramasa
fed8109b17 Update with exp changes 2016-09-24 23:05:18 +01:00
Muramasa
f53fb2b84b Bugfixes and now using built in OrePrefixes enabled/disabled lists 2016-09-09 14:25:59 +01:00
Muramasa
415e683a43 Configurable components & fixes 2016-08-31 02:22:51 +01:00
Muramasa
c66db54eab Fixes & work on #266 2016-08-23 16:39:20 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
0345ada52c Remove null checks 2016-08-13 09:10:38 +01:00
Muramasa
248ce596a5 Ore System Rewrite part 2
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
2016-07-21 07:24:42 +01:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +02:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +01:00
Blood-Asp
5fd2db9ef2 spelling fixes and chainsaw + forestry leaves fix 2016-01-03 05:27:51 +01:00
Blood-Asp
8d8594dabd GT Wrench now implements Buildcrafts Wrench IToolWrench 2015-10-25 23:56:58 +01:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
445e6c3f25 Replace T/F with builtin boolean values 2015-10-21 22:01:39 -04:00
Shawn Buckley
bea4cfc545 Bring in experimental branch 2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00