Enhance caves for mgv7, add ravines
Actually fix shader3 alpha this time
Merge 'upstream/master' into minemovie