Update resource pack
Merge remote-tracking branch 'origin/master'

Conflicts:
	resourcepacks/STHCraftUE-32x32.zip