Magnetizer
Merge remote-tracking branch 'origin/master'

Conflicts:
	MTM.iws
	run/logs/2014-09-23-1.log.gz
	run/logs/2014-09-23-2.log.gz
	run/logs/2014-09-23-3.log.gz
	run/logs/2014-09-23-4.log.gz
	run/logs/2014-09-23-5.log.gz
	run/logs/2014-09-23-6.log.gz
	run/logs/2014-09-23-7.log.gz
	run/logs/fml-client-1.log
	run/logs/fml-client-2.log
	run/logs/fml-client-3.log
	run/logs/fml-client-latest.log
	run/logs/fml-junk-earlystartup.log
	run/logs/latest.log
	run/saves/New World/DIM-1/data/villages.dat
	run/saves/New World/DIM1/data/villages.dat
	run/saves/New World/data/villages.dat
	run/saves/New World/level.dat
	run/saves/New World/level.dat_old
	run/saves/New World/playerdata/040a63f0-e153-3f49-84a8-b60ca564e69f.dat
	run/saves/New World/region/r.-1.-1.mca
	run/saves/New World/region/r.-1.0.mca
	run/saves/New World/region/r.0.-1.mca
	run/saves/New World/region/r.0.0.mca
	run/saves/New World/session.lock
	run/saves/New World/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json
	src/main/java/com/hebbe1234/MTM/block/BlockMTM.java
	src/main/java/com/hebbe1234/MTM/client/renderer/RenderMagnetizer.java
	src/main/java/com/hebbe1234/MTM/tileEntity/TileEntitiesMTM.java