Commit graph

1637 commits

Author SHA1 Message Date
Blood-Asp
d77ee5f704
Merge pull request #1283 from JohannesGaessler/CrackingFollowup
Cracking followup 2
2017-11-25 18:56:39 +01:00
Blood-Asp
4cbc1b69a5
Merge branch 'unstable' into CrackingFollowup 2017-11-25 18:56:28 +01:00
Blood-Asp
87210137d0
Merge branch 'unstable' into CrackingFollowup 2017-11-25 18:54:57 +01:00
Blood-Asp
a2c7e31602
Merge pull request #1279 from JohannesGaessler/ResistorRecipeChange
Resistor recipe change
2017-11-25 18:49:29 +01:00
Blood-Asp
1e620c0177
Merge pull request #1276 from SuperCoder7979/Gasoline
Gasoline
2017-11-25 18:48:53 +01:00
Blood-Asp
af7e1d800d
Merge pull request #1272 from SuperCoder7979/Magic-Fix
Magic fix
2017-11-25 18:46:09 +01:00
Blood-Asp
7cc77f5abf
Merge pull request #1264 from Antifluxfield/GT6-styled_pipes
GT6 Styled Pipes & Cables
2017-11-25 18:45:33 +01:00
Blood-Asp
9ea8a85609
Merge branch 'unstable' into GT6-styled_pipes 2017-11-25 18:44:45 +01:00
Blood-Asp
dbbefafbcc
Merge branch 'unstable' into GT6-styled_pipes 2017-11-25 18:43:13 +01:00
Alkalus
1c9c9af45b
Merge pull request #1296 from JohannesGaessler/MorePhenolRecipes
More Phenol recipes
2017-11-24 11:21:47 +10:00
Alkalus
c7edbf14ea
Merge pull request #1289 from Dimach/diesel
Added large diesel repair status to NC info panel.
2017-11-24 11:21:35 +10:00
Dimach
c7177dcf9a Added info to small miners tooltip. (#1287)
* Added info to small miners tooltip.
2017-11-24 11:21:05 +10:00
Alkalus
e7ea8847b9
Merge pull request #1281 from JohannesGaessler/ForgottenTFERecipe
Forgotten Tetrafluoroethylene recipe
2017-11-24 11:20:28 +10:00
JohannesGaessler
5fc136166e Fixed a bug where restricting Output Hatches caused severe log spam (#1299) 2017-11-24 09:58:42 +10:00
Johannes Gäßler
5476c4ea39 Increased the yields of cracked Heavy Fuel, Light Fuel, Naphtha 2017-11-23 19:20:10 +01:00
Johannes Gäßler
d592d19322 Fixed the collision of LCR Hypochlorous Acid recipes 2017-11-22 23:28:31 +01:00
Johannes Gäßler
b78b3af5b1 Added recipes for Phenol production from Benzene 2017-11-21 23:32:01 +01:00
JohannesGaessler
b87a55800f Removed NEI Large boiler fuel entry for Carbon Dust (#1295)
Fixes #1285. Invalid Burn value on Carbon dust in NEI page for Large Boiler Fuels.
2017-11-22 05:54:14 +10:00
Johannes Gäßler
ad59996c53 Reenabled Cracking for Refinery Gas 2017-11-21 20:19:09 +01:00
Johannes Gäßler
a80acab83c Added IntCircuit to LCR Tetrafluoroethylene recipe for consistency 2017-11-21 20:04:37 +01:00
Dimach
5fbaf373f9 Added large diesel repair status to NC info panel. 2017-11-17 23:01:30 +02:00
Antifluxfield
2b8cca2565 Unexpected disconnection #2 2017-11-13 22:32:39 +08:00
Antifluxfield
e9e88db6dd Make the cross show which direction the pipe is connecting with 2017-11-13 14:31:56 +08:00
Johannes Gäßler
03491bdcb5 Increased recipe time for cracking in a (Large) Chemical Reactor 2017-11-11 16:08:29 +01:00
Johannes Gäßler
c8cbc16c1b Removed Cracking of unsaturated hydrocarbons, implemented alternatives
Hydrocarbons can now be hydrogenated/dehydrogenated.
Olefins can now be directly transformed into one another.
2017-11-11 13:18:43 +01:00
Johannes Gäßler
f97b56fec5 Added a forgotten LCR Tetrafluoroethylene recipe
Decreased the EU/t for producing TFE from 256 to 240 to account for
potential cable loss.
2017-11-10 23:55:39 +01:00
Johannes Gäßler
7eeab3e6d4 Resistor recipes now accept Coal, Charcoal, and Carbon 2017-11-10 18:08:55 +01:00
Antifluxfield
51334d19db Draw the cross in the hint grid 2017-11-09 15:50:03 +08:00
Pranav
1245f31d27 Fix Material Index 2017-11-08 08:03:14 -05:00
Antifluxfield
ced4854069 Try to fix the unexpected disconnection caused by those unloaded chunks 2017-11-08 16:09:32 +08:00
Pranav
c74b3dc365 Change Gasoline production a little bit 2017-11-06 22:14:22 -05:00
SuperCoder79
d30dfe7b3e
Add ethyl tert-butyl ether and rename gasolines 2017-11-06 21:05:48 -05:00
SuperCoder79
5b13b53c3a
Fix typo 2017-11-06 12:25:38 -05:00
SuperCoder79
af2278736e
Fix missing cell 2017-11-06 08:59:21 -05:00
SuperCoder79
f17a3efb6b
Remove useless import 2017-11-06 08:52:18 -05:00
Antifluxfield
e18f0a186d Fix cover placing issue with such small AABB of metapipes 2017-11-06 17:53:15 +08:00
SuperCoder79
83bd3a0120
Replace lead with toluene 2017-11-05 18:59:05 -05:00
Pranav
6bc98744ec Add Gasoline 2017-11-05 17:18:31 -05:00
SuperCoder79
c3867c68e9
Merge pull request #1 from Blood-Asp/unstable
Merge Latest changes
2017-11-05 14:48:13 -05:00
SuperCoder79
8c80a050ca
Fix small bug with block position 2017-11-05 12:44:51 -05:00
Blood-Asp
d83d52647a
Merge pull request #1271 from SuperCoder7979/Plantball-fix
Plantball fix
2017-11-05 18:12:06 +01:00
Blood-Asp
ce4d0b705d
Merge pull request #1269 from MauveCloud/unstable
Removed oredict registration of AnyIron, AnyCopper, etc.
2017-11-05 18:11:12 +01:00
Blood-Asp
2a466bb76e
Merge pull request #1267 from redmage17/unstable
Configed Storage Blocks
2017-11-05 18:07:53 +01:00
Alkalus
e6d0d0691a Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-11-06 03:06:31 +10:00
Alkalus
042be469e9 Small change to CONTRIBUTING.md. 2017-11-06 03:06:10 +10:00
Blood-Asp
53993d67ac
Merge pull request #1261 from SuperCoder7979/unstable
Fix free tin bug by making Dimethyldichlorosilane and fix methane not outputting enough cells
2017-11-05 18:01:29 +01:00
Blood-Asp
c7851042b9
Merge pull request #1254 from Antifluxfield/overflow_fix
Fix overflow when charging ultimate battery
2017-11-05 18:00:30 +01:00
Blood-Asp
e9313b5198
Merge pull request #1251 from Antifluxfield/l10n_improve
Localization improve
2017-11-05 17:58:33 +01:00
Blood-Asp
07a0e94eec
Merge pull request #1249 from Antifluxfield/recipe_loading_fix
Fix unexpected recipe loading
2017-11-05 17:55:48 +01:00
Blood-Asp
d267fc8b8d
Merge pull request #1240 from Sirse/unstable
Added TeleporterUsingEvent.
2017-11-05 17:45:44 +01:00