Merge pull request #226 from stranger1029/master

Update ko_KR.lang
Counters are occasionally meant to be reset.
Merge pull request #228 from skyboy/master

Failed drop delay isn't supposed to be a one-time deal.
Fruit picker can extract IC2 resin
Merge pull request #229 from skyboy/master

sounds good
Better mimic vanilla spawner's entity init
Merge pull request #236 from skyboy/master

Better mimic vanilla spawner's entity init
Laser drill per-work power is 4x precharger power
Merge branch 'master' of https://github.com/powercrystals/MineFactoryReloaded
MFR hard-requires PCC 1.1.7 or higher
Merge pull request #237 from skyboy/master

MFR hard-requires PCC 1.1.7 or higher
Fix double-collision conveyor/router dupe bug
Machines are limited to so much energy per tick

regardless of source of energy
Merge remote-tracking branch 'upstream/master'
Don't attempt to receive energy if none is required
Fix Slaughterhouse blacklist
Reduce default requested energy to 35 MJ
Use machine.getActivationEnergyMJ() instead.
I will eventually get this right
Preferred laser ores now use lists

So they don't overwrite the previous preferred ore.

Also: changed setLaserPreferredOre to addLaserPreferredOre. Old one is
still there, but deprecated.