New color detector and TNT Block (Doesn't explode yet!)
Merge branch 'myswamp'