I herped le derp

Possibly fix my foops?
Merge branch 'master' of https://github.com/VillageCraft-Dev/VcMod

Conflicts:
	src/com/villagecraft/vcmod/blacksmith/Blacksmith.java
	src/com/villagecraft/vcmod/themoon/AsyncMoonAir.java