Finer weapons

The Blacksmith has upgraded the armory.
Merge remote-tracking branch 'origin/weapons'