Updated ArsMagicka2.
Merge branch 'master' of github.com:demon012/RedwoodMinecraftPack

Conflicts:
	changelog.txt