shader fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/cr/crafting/v2/material/Copper.java
state transition and hero spawn fix
Merge remote-tracking branch 'origin/water-animation' into Stats-Rewriting

Conflicts:
	src/com/cr/crafting/v2/material/Copper.java
	src/com/cr/crafting/v2/pattern/KnifePattern.java