Merge remote-tracking branch 'remotes/Vanhal/master' into dev_recipeDisabling

Conflicts:
	src/main/java/com/vanhal/progressiveautomation/blocks/BlockPlanter.java
	src/main/java/com/vanhal/progressiveautomation/items/PAItems.java
Reversed Wooden Generator recipe back to RF Engine on top and Redstone Block in middle