Fixed stupid mistax in conditional

boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
Merge branch 'master' into boatsFix

Conflicts:
	src/Items/ItemBoat.h
Added additional parenthasies
Merge pull request #660 from worktycho/boatsFix

Fixed stupid mistake in conditional