I hate git at times
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java