aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Expand)Author
2017-11-25Merge branch 'unstable' into GT6-styled_pipesBlood-Asp
2017-11-24Merge pull request #1296 from JohannesGaessler/MorePhenolRecipesAlkalus
2017-11-24Merge pull request #1289 from Dimach/dieselAlkalus
2017-11-24Added info to small miners tooltip. (#1287)Dimach
2017-11-24Merge pull request #1281 from JohannesGaessler/ForgottenTFERecipeAlkalus
2017-11-24Fixed a bug where restricting Output Hatches caused severe log spam (#1299)JohannesGaessler
2017-11-22Fixed the collision of LCR Hypochlorous Acid recipesJohannes Gäßler
2017-11-21Added recipes for Phenol production from BenzeneJohannes Gäßler
2017-11-22Removed NEI Large boiler fuel entry for Carbon Dust (#1295)JohannesGaessler
2017-11-21Added IntCircuit to LCR Tetrafluoroethylene recipe for consistencyJohannes Gäßler
2017-11-17Added large diesel repair status to NC info panel.Dimach
2017-11-13Unexpected disconnection #2Antifluxfield
2017-11-13Make the cross show which direction the pipe is connecting withAntifluxfield
2017-11-10Added a forgotten LCR Tetrafluoroethylene recipeJohannes Gäßler
2017-11-09Draw the cross in the hint gridAntifluxfield
2017-11-08Try to fix the unexpected disconnection caused by those unloaded chunksAntifluxfield
2017-11-06Fix cover placing issue with such small AABB of metapipesAntifluxfield
2017-11-05Merge pull request #1271 from SuperCoder7979/Plantball-fixBlood-Asp
2017-11-05Merge pull request #1269 from MauveCloud/unstableBlood-Asp
2017-11-05Merge pull request #1267 from redmage17/unstableBlood-Asp
2017-11-05Merge pull request #1261 from SuperCoder7979/unstableBlood-Asp
2017-11-05Merge pull request #1254 from Antifluxfield/overflow_fixBlood-Asp
2017-11-05Merge pull request #1251 from Antifluxfield/l10n_improveBlood-Asp
2017-11-05Merge pull request #1249 from Antifluxfield/recipe_loading_fixBlood-Asp
2017-11-05Merge pull request #1240 from Sirse/unstableBlood-Asp
2017-11-05Merge pull request #1232 from Dimach/unstable-1Blood-Asp
2017-11-05Merge pull request #1230 from Antifluxfield/driller_fixBlood-Asp
2017-11-05Merge pull request #1228 from DEMOOH/unstableBlood-Asp
2017-11-05Merge pull request #1226 from Antifluxfield/patch-1Blood-Asp
2017-11-05prevent circuit conversation/tier jumpBlood-Asp
2017-11-05Added a failsafe for invalid Modular armour components.Alkalus
2017-11-03change compressedPlantball to plantballSuperCoder79
2017-11-03Fix Saplings to PlantballPranav
2017-11-03Revert "Fix free tin"Pranav
2017-11-03Merge pull request #1 from Dimach/driller_fixAntifluxfield
2017-11-02Removed oredict registration of AnyIron, AnyCopper, etc.MauveCloud
2017-11-02Fixed bug - miners digs bedrock.Dimach
2017-11-01Configed Storage Blocksredmage17
2017-11-01Add the missing condition...Antifluxfield
2017-10-31Visualize fluid pipe input restrictionAntifluxfield
2017-10-30Another config to control wire connections, and disable them by default.Antifluxfield
2017-10-30Add all the Multi-pipesAntifluxfield
2017-10-30Fix ItemPipe tick time customizationAntifluxfield
2017-10-30Add Quadruple and Nonuple fluid pipes; fix several issuesAntifluxfield
2017-10-30Soldering Tools for cable connectionAntifluxfield
2017-10-30GT6 styled pipe and wire connectionAntifluxfield
2017-10-25fix chloroformSuperCoder79
2017-10-25fix free tinSuperCoder79
2017-10-25Fix free tinSuperCoder79
2017-10-21Fix overflow when charging ultimate battery Antifluxfield