Move directories
Merge branch 'master' into 1.5.2

Conflicts:
	build.cfg
	res/assets/yogpstop_qp/textures/blocks/breaker_front_horizontal.png
	res/assets/yogpstop_qp/textures/blocks/breaker_front_vertical.png
	res/assets/yogpstop_qp/textures/blocks/laser_bottom.png
	res/assets/yogpstop_qp/textures/blocks/laser_side.png
	res/assets/yogpstop_qp/textures/blocks/laser_top.png
	res/assets/yogpstop_qp/textures/blocks/marker.png
	res/assets/yogpstop_qp/textures/blocks/miningwell.png
	res/assets/yogpstop_qp/textures/blocks/miningwell_back.png
	res/assets/yogpstop_qp/textures/blocks/miningwell_front.png
	res/assets/yogpstop_qp/textures/blocks/miningwell_top.png
	res/assets/yogpstop_qp/textures/blocks/miningwell_top_w.png
	res/assets/yogpstop_qp/textures/blocks/mover.png
	res/assets/yogpstop_qp/textures/blocks/mover_bottom.png
	res/assets/yogpstop_qp/textures/blocks/mover_top.png
	res/assets/yogpstop_qp/textures/blocks/placer_front_horizontal.png
	res/assets/yogpstop_qp/textures/blocks/placer_front_vertical.png
	res/assets/yogpstop_qp/textures/blocks/plusstone_side.png
	res/assets/yogpstop_qp/textures/blocks/plusstone_top.png
	res/assets/yogpstop_qp/textures/blocks/pump_bottom.png
	res/assets/yogpstop_qp/textures/blocks/pump_side.png
	res/assets/yogpstop_qp/textures/blocks/pump_top.png
	res/assets/yogpstop_qp/textures/blocks/pump_top_c.png
	res/assets/yogpstop_qp/textures/blocks/pump_top_w.png
	res/assets/yogpstop_qp/textures/blocks/quarry.png
	res/assets/yogpstop_qp/textures/blocks/quarry_front.png
	res/assets/yogpstop_qp/textures/blocks/quarry_top.png
	res/assets/yogpstop_qp/textures/blocks/quarry_top_bb.png
	res/assets/yogpstop_qp/textures/blocks/quarry_top_mf.png
	res/assets/yogpstop_qp/textures/blocks/quarry_top_nnb.png
	res/assets/yogpstop_qp/textures/blocks/refinery.png
	res/assets/yogpstop_qp/textures/gui/infmjsrc.png
	res/assets/yogpstop_qp/textures/gui/mover.png
	res/assets/yogpstop_qp/textures/items/liquidSelector.png
	res/assets/yogpstop_qp/textures/items/listEditor.png
	res/assets/yogpstop_qp/textures/items/statusChecker.png
	res/mods/yogpstop_qp/textures/blocks/breaker_front_horizontal.png
	res/mods/yogpstop_qp/textures/blocks/breaker_front_vertical.png
	res/mods/yogpstop_qp/textures/blocks/laser_bottom.png
	res/mods/yogpstop_qp/textures/blocks/laser_side.png
	res/mods/yogpstop_qp/textures/blocks/laser_top.png
	res/mods/yogpstop_qp/textures/blocks/marker.png
	res/mods/yogpstop_qp/textures/blocks/miningwell.png
	res/mods/yogpstop_qp/textures/blocks/miningwell_back.png
	res/mods/yogpstop_qp/textures/blocks/miningwell_front.png
	res/mods/yogpstop_qp/textures/blocks/miningwell_top.png
	res/mods/yogpstop_qp/textures/blocks/miningwell_top_w.png
	res/mods/yogpstop_qp/textures/blocks/mover.png
	res/mods/yogpstop_qp/textures/blocks/mover_bottom.png
	res/mods/yogpstop_qp/textures/blocks/mover_top.png
	res/mods/yogpstop_qp/textures/blocks/placer_front_horizontal.png
	res/mods/yogpstop_qp/textures/blocks/placer_front_vertical.png
	res/mods/yogpstop_qp/textures/blocks/plusstone_side.png
	res/mods/yogpstop_qp/textures/blocks/plusstone_top.png
	res/mods/yogpstop_qp/textures/blocks/pump_bottom.png
	res/mods/yogpstop_qp/textures/blocks/pump_side.png
	res/mods/yogpstop_qp/textures/blocks/pump_top.png
	res/mods/yogpstop_qp/textures/blocks/pump_top_c.png
	res/mods/yogpstop_qp/textures/blocks/pump_top_w.png
	res/mods/yogpstop_qp/textures/blocks/quarry.png
	res/mods/yogpstop_qp/textures/blocks/quarry_front.png
	res/mods/yogpstop_qp/textures/blocks/quarry_top.png
	res/mods/yogpstop_qp/textures/blocks/quarry_top_bb.png
	res/mods/yogpstop_qp/textures/blocks/quarry_top_mf.png
	res/mods/yogpstop_qp/textures/blocks/quarry_top_nnb.png
	res/mods/yogpstop_qp/textures/blocks/refinery.png
	res/mods/yogpstop_qp/textures/gui/infmjsrc.png
	res/mods/yogpstop_qp/textures/gui/mover.png
	res/mods/yogpstop_qp/textures/items/liquidSelector.png
	res/mods/yogpstop_qp/textures/items/listEditor.png
	res/mods/yogpstop_qp/textures/items/statusChecker.png
	src/main/java/com/yogpc/qp/TileBasic.java
	src/main/resources/assets/yogpstop_qp/textures/blocks/breaker_front_horizontal.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/breaker_front_vertical.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/laser_bottom.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/laser_side.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/laser_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/marker.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/miningwell.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/miningwell_back.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/miningwell_front.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/miningwell_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/miningwell_top_w.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/mover.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/mover_bottom.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/mover_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/placer_front_horizontal.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/placer_front_vertical.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/plusstone_side.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/plusstone_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/pump_bottom.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/pump_side.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/pump_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/pump_top_c.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/pump_top_w.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry_front.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry_top.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry_top_bb.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry_top_mf.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/quarry_top_nnb.png
	src/main/resources/assets/yogpstop_qp/textures/blocks/refinery.png
	src/main/resources/assets/yogpstop_qp/textures/gui/infmjsrc.png
	src/main/resources/assets/yogpstop_qp/textures/gui/mover.png
	src/main/resources/assets/yogpstop_qp/textures/items/liquidSelector.png
	src/main/resources/assets/yogpstop_qp/textures/items/listEditor.png
	src/main/resources/assets/yogpstop_qp/textures/items/statusChecker.png
Merge branch '1.5.2' into 1.4.7

Conflicts:
	build.cfg
	src/main/resources/mods/yogpstop_qp/textures/blocks/breaker_front_horizontal.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/breaker_front_vertical.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/laser_bottom.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/laser_side.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/laser_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/marker.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/miningwell.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/miningwell_back.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/miningwell_front.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/miningwell_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/miningwell_top_w.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/mover.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/mover_bottom.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/mover_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/placer_front_horizontal.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/placer_front_vertical.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/plusstone_side.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/plusstone_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/pump_bottom.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/pump_side.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/pump_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/pump_top_c.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/pump_top_w.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry_front.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry_top.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry_top_bb.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry_top_mf.png
	src/main/resources/mods/yogpstop_qp/textures/blocks/quarry_top_nnb.png
	src/main/resources/mods/yogpstop_qp/textures/items/liquidSelector.png
	src/main/resources/mods/yogpstop_qp/textures/items/listEditor.png
	src/main/resources/mods/yogpstop_qp/textures/items/statusChecker.png
Merge branch '1.4.7' into 1.4.5

Conflicts:
	build.cfg
	src/main/java/com/yogpc/qp/client/GuiP_Manual.java
	src/main/java/com/yogpc/qp/client/GuiP_SelectBlock.java
	src/main/java/com/yogpc/qp/client/GuiQ_List.java
	src/main/java/com/yogpc/qp/client/GuiQ_Manual.java
	src/main/java/com/yogpc/qp/client/GuiQ_SelectBlock.java