Commit graph

1614 commits

Author SHA1 Message Date
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
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
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
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
Antifluxfield
51334d19db Draw the cross in the hint grid 2017-11-09 15:50:03 +08:00
Antifluxfield
ced4854069 Try to fix the unexpected disconnection caused by those unloaded chunks 2017-11-08 16:09:32 +08:00
Antifluxfield
e18f0a186d Fix cover placing issue with such small AABB of metapipes 2017-11-06 17:53:15 +08: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
Blood-Asp
471376dc70
Merge pull request #1232 from Dimach/unstable-1
Fixed small bug - basic miner cant work using battery in inner slot.
2017-11-05 17:40:05 +01:00
Blood-Asp
7982163281
Merge pull request #1230 from Antifluxfield/driller_fix
Drillers fix
2017-11-05 17:39:21 +01:00
Blood-Asp
083b6b0b2c
Merge pull request #1228 from DEMOOH/unstable
Glass fiber recipe fix
2017-11-05 17:04:57 +01:00
Blood-Asp
de7195ffc2
Merge pull request #1226 from Antifluxfield/patch-1
Fix AssLine structure check
2017-11-05 17:02:07 +01:00
Blood-Asp
3c78346bcf prevent circuit conversation/tier jump 2017-11-05 16:56:45 +01:00
Alkalus
5b5ecc71ad Added a correct CONTRIBUTING.md, removed CONTRIBUTOR.md. 2017-11-05 19:34:01 +10:00
Alkalus
7a7083bcd5 Added a CONTRIBUTOR.md which elaborates on the Issue and Pull request creation process.
Fell free to edit this as required.
2017-11-05 19:31:50 +10:00
Alkalus
c4b245af9b Added a failsafe for invalid Modular armour components. 2017-11-05 19:12:48 +10:00
SuperCoder79
a86dde4040
change compressedPlantball to plantball 2017-11-03 22:31:56 -04:00
Pranav
5067a6fe4f Fix Saplings to Plantball 2017-11-03 22:03:20 -04:00
Pranav
09cdfd27ba Revert "Fix free tin"
This reverts commit aafc8c10de.
2017-11-03 21:42:56 -04:00
Antifluxfield
0f9be5a4c9
Merge pull request #1 from Dimach/driller_fix
Fixed bug - miners digs bedrock.
2017-11-03 12:33:04 -05:00
MauveCloud
7a27c859a8 Removed oredict registration of AnyIron, AnyCopper, etc. 2017-11-02 12:46:10 -07:00
Dimach
540ddb3e09 Fixed bug - miners digs bedrock. 2017-11-02 17:27:30 +02:00
redmage17
45a2057b69 Configed Storage Blocks
Added config for removal of shapless recipes for storage blocks
2017-11-01 10:43:34 -04:00
Antifluxfield
f6a9bbb293 Add the missing condition... 2017-11-01 17:10:37 +08:00
Antifluxfield
c648ac6ef0 Visualize fluid pipe input restriction 2017-10-31 01:39:13 +08:00
Antifluxfield
78aa11bd38 Another config to control wire connections, and disable them by default. 2017-10-30 19:17:00 +08:00
Antifluxfield
1e8189e5f9 Add all the Multi-pipes 2017-10-30 16:34:12 +08:00
Antifluxfield
77c639c8fb Fix ItemPipe tick time customization 2017-10-30 16:24:09 +08:00
Antifluxfield
7b0dc97594 Add Quadruple and Nonuple fluid pipes; fix several issues 2017-10-30 16:16:16 +08:00