Edited Armor and wolf textures
Pharaoh name saves and sync between server and client
Merge pull request #71 from logomaster256/master

Added glass
Wolf Pelts, and other stuff
Merge branch 'master' of https://github.com/logomaster256/Atum into logomaster256-master

Conflicts:
	common/rebelkeithy/mods/atum/Atum.java
	common/rebelkeithy/mods/atum/ConfigAtum.java
	common/rebelkeithy/mods/atum/blocks/BlockAtumSapling.java
Update date spawning
Flax Seeds
Added Flax
Desert Armor and other stuff