Made it simpler to add Items and Blocks

Use MineTraxItems and MineTraxBlocks Now
Fixed my derps with the textures...

They should now show up. -_-
Merge remote-tracking branch 'origin/master' into Gradle
More fixes. Stop adding files! :(