Fixed some Blacksmith things and fixed getInventory
Merge remote-tracking branch 'origin/master' into BranDev-Branch