aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2017-11-25Merge pull request #1276 from SuperCoder7979/GasolineBlood-Asp
Gasoline
2017-11-25Merge pull request #1272 from SuperCoder7979/Magic-FixBlood-Asp
Magic fix
2017-11-25Merge branch 'unstable' into GT6-styled_pipesBlood-Asp
2017-11-24Merge pull request #1296 from JohannesGaessler/MorePhenolRecipesAlkalus
More Phenol recipes
2017-11-24Merge pull request #1289 from Dimach/dieselAlkalus
Added large diesel repair status to NC info panel.
2017-11-24Added info to small miners tooltip. (#1287)Dimach
* Added info to small miners tooltip.
2017-11-24Merge pull request #1281 from JohannesGaessler/ForgottenTFERecipeAlkalus
Forgotten Tetrafluoroethylene recipe
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
Fixes #1285. Invalid Burn value on Carbon dust in NEI page for Large Boiler Fuels.
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
Decreased the EU/t for producing TFE from 256 to 240 to account for potential cable loss.
2017-11-09Draw the cross in the hint gridAntifluxfield
2017-11-08Fix Material IndexPranav
2017-11-08Try to fix the unexpected disconnection caused by those unloaded chunksAntifluxfield
2017-11-06Change Gasoline production a little bitPranav
2017-11-06Add ethyl tert-butyl ether and rename gasolinesSuperCoder79
2017-11-06Fix typoSuperCoder79
2017-11-06Fix missing cellSuperCoder79
2017-11-06Remove useless importSuperCoder79
2017-11-06Fix cover placing issue with such small AABB of metapipesAntifluxfield
2017-11-05Replace lead with tolueneSuperCoder79
2017-11-05Add GasolinePranav
2017-11-05Fix small bug with block positionSuperCoder79
2017-11-05Merge pull request #1271 from SuperCoder7979/Plantball-fixBlood-Asp
Plantball fix
2017-11-05Merge pull request #1269 from MauveCloud/unstableBlood-Asp
Removed oredict registration of AnyIron, AnyCopper, etc.
2017-11-05Merge pull request #1267 from redmage17/unstableBlood-Asp
Configed Storage Blocks
2017-11-05Merge pull request #1261 from SuperCoder7979/unstableBlood-Asp
Fix free tin bug by making Dimethyldichlorosilane and fix methane not outputting enough cells
2017-11-05Merge pull request #1254 from Antifluxfield/overflow_fixBlood-Asp
Fix overflow when charging ultimate battery
2017-11-05Merge pull request #1251 from Antifluxfield/l10n_improveBlood-Asp
Localization improve
2017-11-05Merge pull request #1249 from Antifluxfield/recipe_loading_fixBlood-Asp
Fix unexpected recipe loading
2017-11-05Merge pull request #1240 from Sirse/unstableBlood-Asp
Added TeleporterUsingEvent.
2017-11-05Merge pull request #1232 from Dimach/unstable-1Blood-Asp
Fixed small bug - basic miner cant work using battery in inner slot.
2017-11-05Merge pull request #1230 from Antifluxfield/driller_fixBlood-Asp
Drillers fix
2017-11-05Merge pull request #1228 from DEMOOH/unstableBlood-Asp
Glass fiber recipe fix
2017-11-05Merge pull request #1226 from Antifluxfield/patch-1Blood-Asp
Fix AssLine structure check
2017-11-05prevent circuit conversation/tier jumpBlood-Asp
2017-11-05Added a failsafe for invalid Modular armour components.Alkalus
2017-11-04Clean up codeSuperCoder79
2017-11-03change compressedPlantball to plantballSuperCoder79
2017-11-03Fix the magic energy absorberPranav
2017-11-03Fix Saplings to PlantballPranav
2017-11-03Revert "Fix free tin"Pranav
This reverts commit aafc8c10de94d6752a6ce974499a8fa5d89d7dca.
2017-11-03Merge pull request #1 from Dimach/driller_fixAntifluxfield
Fixed bug - miners digs bedrock.
2017-11-02Removed oredict registration of AnyIron, AnyCopper, etc.MauveCloud
2017-11-02Fixed bug - miners digs bedrock.Dimach