Join tags with a '+' as done elsewhere too.
Suppress deprecation warning for now.
Slightly more tolarance for boats.
Add heuristic for the THORNS enchantment.