Fixed shear/silk touch being defaulted to sneak only
Merge remote-tracking branch 'origin/master' into 1.7.x

Conflicts:
	java/squeek/wailaharvestability/WailaHandler.java