Merge branch 'master' into decorative
proper names & texture for DustDye and DyedDust. also fixes issues with harvesting of DustDye
Merge branch 'master' into decorative
cleanup
Merge branch 'decorative'

Conflicts:
	src/main/java/com/zpig333/runesofwizardry/block/BlockDustDye.java
	src/main/resources/assets/runesofwizardry/lang/en_US.lang