Merge pull request #15 from vaendryl/master

update to latest
Almost done
update to latest
Merge pull request #16 from vaendryl/master

update to latest
fixed bug
Revert "fixed bug"

This reverts commit 3bf09b64482d1b2d37d77613f84a717b94bd0711.
Merge pull request #17 from vaendryl/master

4.2 WIP 3
just doing some stuff so that I can code my mod more easily
Merge pull request #29 from EnderShadow/master

just some stuff to make it easier for me to make my mod