calclavia/Universal-Electricity — pull request #57 by Mattredsox (2012-12-26 21:28:49+00:00)
Title: Fixed compatibility with AtomicStrykers Minefactory

Recipes conflicted, MF is an older mod so it takes seniority. Talked
with AtomicStryker.