noise perli2d
merge fixed
Merge branch 'master' of https://github.com/uriviba/opticraft into VBO

Conflicts:
	Block.cpp
	Block.h
	cScene.cpp