Less dull diamond tools/weapons

also swapped wood and stone