Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

This commit is contained in:
Florian Nücke 2014-03-27 22:31:26 +01:00
commit b34f43c386

View File

@ -10,7 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection
trait IndustrialCraft2 extends Common with IEnergySink {
var addedToPowerGrid = false
private val useIndustrialCraft2Power = isServer && !Settings.get.ignorePower && Loader.isModLoaded("IC2")
private lazy val useIndustrialCraft2Power = isServer && !Settings.get.ignorePower && Loader.isModLoaded("IC2")
// ----------------------------------------------------------------------- //