07332ca245
Conflicts: common/mekanism/induction/common/MekanismInduction.java resources/assets/mekanism/lang/en_US.lang |
||
---|---|---|
.. | ||
buildcraft/api | ||
calclavia/lib | ||
cofh/api | ||
dan200 | ||
ic2/api | ||
mekanism | ||
micdoodle8/mods/galacticraft/api | ||
powercrystals/minefactoryreloaded/api | ||
rebelkeithy/mods/metallurgy/api | ||
thermalexpansion/api | ||
universalelectricity |