Commit graph

1301 commits

Author SHA1 Message Date
Johannes Gäßler
c3f2b2b49d Made it so that Pyrolyse Oven recipes are consistent
Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood
Vinegar, or Wood Tar to OreProcessing to ensure that all log types can
be used.
2017-06-15 10:27:06 +02:00
Blood-Asp
08c75fd813 Improve fog density calculation 2017-06-15 00:28:27 +02:00
Blood-Asp
911a807529 pollution smog 2017-06-14 23:51:39 +02:00
Johannes Gäßler
7f408ff581 Returned BioFuel to its previous state, added BioDiesel instead.
There are artifacts for fluids called BioFuel, therefore the change.
2017-06-14 23:15:31 +02:00
Johannes Gäßler
91fb725a47 Fixed a bug where an Assembler recipe would be added if the output is
null
2017-06-14 22:24:31 +02:00
Johannes Gäßler
3cb5ec51cf Fixed Allyl Chloride recipe consuming a Fluid Cell 2017-06-14 22:06:38 +02:00
Blood-Asp
6b4b32200d fix IC Classic compat #1090 2017-06-14 20:47:42 +02:00
Blood-Asp
b15f0d2c0b Merge pull request #1091 from draknyte1/unstable
Made the Cleanroom optional.
2017-06-14 13:47:08 +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
96b1cb31ce improve cleanroom tooltip 2017-06-14 02:16:18 +02:00
Blood-Asp
e6de8921c0 fix for timber changes 2017-06-14 01:30:36 +02:00
Blood-Asp
c397df4523 make reinforced blocks prevent monsterspawns 2017-06-14 01:19:56 +02:00
Blood-Asp
9447eea43b why does the client crash when using isClientSide() ??? 2017-06-14 01:02:49 +02:00
Blood-Asp
61d17d250d quickfix for server side crash 2017-06-14 00:00:58 +02:00
Blood-Asp
e30a5694ff wood plank compressor recipe #1013 2017-06-13 23:10:49 +02:00
Blood-Asp
4ac668066b missed one file 2017-06-13 22:50:19 +02:00
Blood-Asp
699ea26ba4 Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect. 2017-06-13 22:41:15 +02:00
Blood-Asp
3caab8d4ff Fix translation of covers 2017-06-13 21:48:10 +02: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
c665b14e22 Merge pull request #1088 from Techlone/reworking_dataorb
Reworking DataOrb and DataStick
2017-06-13 18:55:33 +02:00
Techlone
156bb2b06b Tooltips changing 2017-06-13 21:09:48 +05:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Techlone
c8a8687a72 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-13 17:44:23 +05:00
Techlone
bfd3ff4b19 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-13 17:44:13 +05:00
Blood-Asp
e85a761e82 At last one free face. 2017-06-12 13:48:54 +02:00
Blood-Asp
ef22bf6ab9 Only open machine gui if front is free. 2017-06-12 12:18:54 +02:00
Blood-Asp
8e043d00d9 Cables and pipes now change hitboxes dynamicly depending on connections or covers 2017-06-12 11:58:26 +02:00
Blood-Asp
e0cd4376b1 change back the component heat exchanger damage value 2017-06-12 11:34:25 +02:00
Johannes Gäßler
c9277a3a7e Fixed Chloromethane and Chloroform recipes missing empty cell outputs 2017-06-12 00:33:42 +02:00
Johannes Gäßler
b3e0b41ee6 Changed the Primitive Blast Furnace so that it uses the new Recipe Map 2017-06-11 18:52:08 +02:00
Blood-Asp
30b6d22d81 Merge pull request #1083 from Techlone/unstable
More fixes for the world gen
2017-06-10 23:41:41 +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
Johannes Gäßler
74c41614a5 Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc.
Made it so that GT_Values.NI and GT_Values.NF are consistently used when
applicable.

Nerfed Silicone Rubber so that you only get 3/7 as much as from a
regular plastic.
The idea is that Silicone Rubber is more versatile than PVC or SBR, but
also more expensive.

Changed the Distillation Tower description so that it aligns with the
new behavior.
2017-06-09 00:14:55 +02:00
Johannes Gäßler
6d15192990 Implemented Bricked Blast Furnace, added corresponding textures
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID
15

Refactored the non-electric Blast Furnaces:
The Bronze Blast Furnace and the Bricked Blast Furnace extend a
superclass to ensure consistent behavior.
Subclasses only differ in texture, description, and Casing Block.
2017-06-08 23:22:08 +02:00
Techlone
d7debfd34e fix wrong center chunk coordinates 2017-06-08 21:27:24 +05:00
Techlone
8172e2ef60 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-08 20:42:06 +05:00
Blood-Asp
0a375ac948 experimental worldgen change fix 2017-06-07 19:00:15 +02:00
Techlone
541144f443 formatting 2017-06-07 18:19:50 +05:00
Techlone
86318b7b44 Merge branch 'unstable' into advminer2_improvements
# Conflicts:
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07 18:17:23 +05:00
Techlone
a19e8b10eb Merge branch 'advminer2_improvements' of https://github.com/Techlone/GT5-Unofficial into advminer2_improvements 2017-06-07 18:14:15 +05:00
Techlone
38e12d554c Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-07 18:13:47 +05:00
Blood-Asp
9032c2e15b Quick fixes 2017-06-07 09:45:19 +02:00
Blood-Asp
1296755b27 Merge branch 'refs/heads/pr/1077' into unstable
# Conflicts:
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07 09:37:13 +02:00
Blood-Asp
3b1f55fcb9 Merge pull request #1076 from vlad20012/int-overflow-fix
Fixed stored energy integer overflow
2017-06-07 09:30:04 +02:00
Johannes Gäßler
785322f5c7 Rebalanced Fermented Biomass in face of the Methane Fuel Value change
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-07 00:40:19 +02:00
Blood-Asp
425a6d1cea forgot to commit the oredict changes 2017-06-06 23:58:30 +02:00
Blood-Asp
688e6eb122 Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for marble/basalt, chisel compat #1050 2017-06-06 23:57:33 +02:00
Johannes Gäßler
1d636be525 Fixed a bug where the order of DT fluid outputs was actually reversed 2017-06-06 20:27:20 +02:00
Johannes Gäßler
9295a4202a Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169 2017-06-06 18:23:11 +02:00