Commit graph

1763 commits

Author SHA1 Message Date
Antifluxfield
d66cecbd6b Improve the mechanism of custom materials (#1341) 2017-12-21 22:02:49 +01:00
Antifluxfield
f73c0fd7ef Fix pipe behaviors (#1329)
* Try to fix #1301

* Fix pipe behavior with covers at side

* Fix item pipe & cable behavior

* Update

* Update 2

* Based on @mitchej123 's work
2017-12-21 21:58:34 +01:00
JohannesGaessler
a40750b3b8 Fixed RawRubber from Isoprene recipe (#1311) 2017-12-21 20:49:07 +01:00
Antifluxfield
a7f5b9bf35 Fix wrong translation (#1309) 2017-12-21 20:46:12 +01:00
Blood-Asp
98f156335a
Merge pull request #1306 from YoungGT/unstable
Update language files
2017-12-21 20:20:29 +01:00
YoungGT
e97f2e437c
Update zh_CN.lang 2017-12-21 12:48:15 +08:00
YoungGT
ac87a0ce8e
Update en_US.lang 2017-12-21 12:47:23 +08:00
YoungGT
34f885071a
Fix a bug about achievements
We can find that there's always two achievements between "As Dense As Possible" and "What now?" whether you opened the batteries or not,so this PR would like to fix this.
2017-11-27 22:43:50 +08:00
YoungGT
df081bd0a7
Update zh_CN.lang 2017-11-27 22:31:24 +08:00
YoungGT
1c8ef742d7
Update language files
Added entries for these achievements,and fixed the wrong entries.
2017-11-27 22:14:27 +08:00
Blood-Asp
f9c8159f09 Default off config for GalacticraftOil compat 2017-11-25 22:49:00 +01:00
Blood-Asp
b96180ac4f GT6 style concrete speedup (no soulsand like behavior that blocks you from entrances and less OP ice hyperspeed highways) 2017-11-25 22:41:41 +01:00
Blood-Asp
0305f8626e Oredict fixes 2017-11-25 21:45:11 +01:00
Blood-Asp
4ae74f6ca4 Lossy Imp Compressor recipes for higher tier gems from lower tier gems. 2017-11-25 21:31:30 +01:00
Blood-Asp
4b65784535 Alternative high tier Lapo Orb Cluster recipe to reduce nessary Lapocrystal amount. 2017-11-25 21:30:22 +01:00
Blood-Asp
de94c67ede Cheaper SoC 2017-11-25 20:54:25 +01:00
Blood-Asp
e9627a540a Rebalance Tritanium cost, add new fusion recipes (Tungsten + Indium prod) 2017-11-25 19:41:21 +01:00
Blood-Asp
84e95d30ab
Merge pull request #1300 from mitchej123/bloody_unstable
Single block pump refactor & bugfix
2017-11-25 19:02:00 +01:00
Blood-Asp
7ce0ce850c
Merge pull request #1298 from JohannesGaessler/MoreFlexibleLCRStructure
More Flexible Large Chemical Reactor structure
2017-11-25 19:00:20 +01:00
Blood-Asp
d6cbc4725f
Merge pull request #1297 from JohannesGaessler/MoreFlexibleOilCrackerStructure
More flexible Oil Cracker structure
2017-11-25 18:59:28 +01:00
Blood-Asp
eb7185ca85
Merge pull request #1284 from redmage17/unstable
Configed Machine Casings
2017-11-25 18:57:52 +01:00
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
Jason Mitchell
2dc5b03f14 Single block pump refactor & bugfix:
1) Pump will properly save it's state and reload with chunk load/reload.
It remembers that it was pumping and doesn't immediately move down.
Additionally, corrected saving of fluid type so it will properly look it
up when it reloads

2) Fixed getYHeadOfPump() so it doesn't punch through bedrock if you
destroy the pump head.  If you break a gap into an existing pipe line,
it will move down through the broken spots until it finds an existing
set of pipes - in which case it will continue from the bottom.  If you
break the pump head, it will replace the last pipe with a new Head and
carry on about it's business.
2017-11-23 17:21:05 -08: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
b2374a5675 The Large Chemical Reactor can now have its Cupronickel Coil on any side 2017-11-22 22:43:11 +01:00
Johannes Gäßler
a35965b57c Fixed Oil Cracker description typo 2017-11-22 19:59:30 +01:00
Johannes Gäßler
1cf109d1fe Oil Cracker can now also works right -> left, EU/Maint Hatches anywhere
The Oil Cracker now also accepts Input Hatches on the right side and
Output Hatches on the left side.
Input/Output Hatches must be on opposite sides of one another.

Also, Energy/Maintenance Hatches no longer need to be on the middle ring
but can also be put on the sides.
2017-11-22 19:37:39 +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
redmage17
d66f4fdebc Configed Machine Casings
Added option to use the recipes for machine casings as they were before the plastics update. With the new uses and recipes for plastics I felel this would be a nice option.
2017-11-13 15:54:59 -05: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