Commit graph

674 commits

Author SHA1 Message Date
Johannes Gäßler
c2e4ebea6e Fixed EV Pumps using the wrong Rubber 2017-08-21 09:05:08 +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
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
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
Muramasa-
9fc5d17eb5 Pump tooltips 2017-08-12 02:21:09 +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
d4ea25e1bc Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScaling
Pyrolyse oven coil scaling
2017-08-11 21:20: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
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
46420e73cb Merge pull request #1144 from Dimach/unstable
Fixed coloring of pyrolyse oven.
2017-08-11 14:19:10 +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
9bd9d7d5e0 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-06 09:36:02 +02:00
Johannes Gäßler
74529795fb Removed Burn Value for Carbon Dust. 2017-08-06 09:35:47 +02:00
Johannes Gäßler
2ddf1d19ad Added the Large Chemical Reactor Controller inventory to the item input 2017-08-06 09:35:44 +02:00
Johannes Gäßler
0ddc793c9d Enabled Coal/Charcoal/Coal Coke Blocks for the Primitive Blast Furnace 2017-08-05 23:22:45 +02:00
Johannes Gäßler
cd4ca84e80 Fixed a bug with ghost Items left behind in the Large Chemical Reactor 2017-08-04 10:47:54 +02:00
Johannes Gäßler
3b976f4aea Multiblock Chemical Reactor now also automatically adds an Int. Circ. 2017-08-02 22:24:53 +02:00
Johannes Gäßler
ee7f576abf Reenabled regular Rubber for the EV Conveyor Belt 2017-08-02 22:15:30 +02:00
Antifluxfield
a1f0a213c4 Find a better way to handle those dusts 2017-08-02 16:04:25 +08:00
Johannes Gäßler
c146a47ff9 Adapted the Large Chemical Reactor recipes for the Int. Circuits 2017-08-01 18:33:28 +02:00
Johannes Gäßler
d563a92dbc Moved Synthetic Rubber requirement: EV -> IV, made it more convenient
Cable insulation works as it did before for EV cables.
IV+ Cables can be insulated with only molten Silicone.
Insulation now also works with whole Dusts at 4x the batch size.
2017-08-01 16:08:15 +02:00
Johannes Gäßler
d1a106aa81 Added a line to the NEI handler that hints at leaving IntCirc(0) empty 2017-08-01 13:56:29 +02:00
Johannes Gäßler
3ddd4158ab Changed Vacuum Freezer Circuits: Elite -> Data/Extreme 2017-07-31 10:15:32 +02:00
Johannes Gäßler
83d64e5d52 Added a new Basic Circuit: Microprocessor
Produced similarly to the Integrated Processor, but yields 2 Basic
Circuits instead of 1 Good Circuit.
2017-07-31 10:10:36 +02:00
Johannes Gäßler
6a1d32e4a3 Overhauled the Wetware Circuit recipes
They no longer need beer.
Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
2017-07-31 09:46:57 +02:00
Johannes Gäßler
54fc4e222a Overhauled Fiberglass Circuit Board
Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board
Fiber-Reinforced Boards are now made by combining Epoxy Resin with
either Glass Fiber or Carbon Fiber.

Glass Fiber is produced from Borosilicate Glass, which is in turn
produced from Glass and Boron.
To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
2017-07-26 21:50:09 +02:00
Johannes Gäßler
4cda183354 Added a new Circuit board tier: Plastic Circuit Board 2017-07-25 17:42:52 +02:00
Johannes Gäßler
ea769424c4 Adjusted GT_Pollution Javadoc 2017-07-24 22:26:51 +02:00
Johannes Gäßler
d3eb6181f7 Pyrolyze Oven processing speed now depends on Coil Tier 2017-07-24 22:21:32 +02:00
Johannes Gäßler
5371a8b2ad Pyrolyze Oven now accepts all Coils, transformed umlauts in doc to asci 2017-07-24 18:58:40 +02:00
Johannes Gäßler
a786856ce6 Removed Burn Value for Carbon Dust. 2017-07-20 09:22:18 +02:00
Johannes Gäßler
fff1f594fb Added the Large Chemical Reactor Controller inventory to the item input 2017-07-17 20:08:47 +02:00
Antifluxfield
1fff7f2aa4 Update GT_RecipeAdder.java 2017-07-14 00:12:44 +08:00
Antifluxfield
000740ff66 Reduce the batch size if fluid amount is exceeding 2017-07-13 01:57:38 +08:00
Johannes Gäßler
96d56e97da Added an option to findRecipe() to only return recipes with enough input 2017-07-11 17:14:00 +02:00
Johannes Gäßler
da2e748e8a Fixed Item Distributor causing an OutOfboundsException for invalid NBT. 2017-07-09 23:14:30 +02:00
Blood-Asp
6ff1299467 oil fix part 2 2017-07-09 16:23:45 +02:00
Dimach
1b50758a2e Fixed coloring of pyrolyse oven. 2017-07-07 12:36:47 +03:00
Blood-Asp
f657b3d0c6 Fix Pyrooven textures 2017-07-06 23:16:26 +02:00
Blood-Asp
3f8b428110 Restore old oil calculation 2017-07-06 23:02:29 +02:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
2017-07-06 22:36:37 +02:00
Blood-Asp
2673a6fb86 Merge pull request #1142 from Dimach/miners
Added LV and MV miners.
2017-07-06 22:35:57 +02:00
Dimach
480132b25f Changed miner rates. 2017-07-06 17:56:43 +03:00
Dimach
0375e11deb Changed MV miner radius. 2017-07-06 14:35:33 +03:00
Dimach
0334a19993 Changed miner mechanics and rates. 2017-07-06 13:42:45 +03:00