Fixing a config derp from 7edbff6ba5d1eb1abc57abe3dac04eb66fe9fbc7
also fixing items

Items and blocks autoresolve conflicts now
Merge branch 'master' of https://github.com/Robotic-Brain/WaterCraft.git