Merge pull request #1 from AdamQpzm/master

Conventions & Compilation
updateded color.java to be more original code
Fixed typos
Merge pull request #2 from ROTNdev/patch-1

Fixed typos
Updated color.java to have more original coding
Updated toString to contain less code
Added a cropstate
Added a cropstate
Added difficulties
Added Dyes, made it RGB in human readable format
corrected integer value errors
Added effects. witchmagic effect needs to be added though...
Merge pull request #1 from Wolf-in-a-bukkit/master

Merge changes from upstream