Less dull diamond tools/weapons

Also swapped wood and stone