Fix something
Merge branch 'master' into 1.5.2
Merge branch '1.5.2' into 1.4.7

Conflicts:
	src/org/yogpstop/qp/BlockInfMJSrc.java
	src/org/yogpstop/qp/BlockLaser.java
	src/org/yogpstop/qp/BlockMarker.java
	src/org/yogpstop/qp/BlockMover.java
	src/org/yogpstop/qp/BlockPump.java
	src/org/yogpstop/qp/BlockQuarry.java
	src/org/yogpstop/qp/BlockRefinery.java