Add @Override everywhere
Added slot item validation and CMYK color stuff
Lots of new colorizer stuff
Made colorizer use dyes and auto-colorize when redstone powered
Get rid of pesky build.properties
Fix those pesky merge conflicts