Redured Cataputs demo map

Merge branch 'master' of https://github.com/pboechat/VoxelEngine

Conflicts:
	Assets/AuberNoise.meta
	Assets/AuberNoise/Editor.meta
	Assets/AuberNoise/Editor/NoiseExtensions.meta
	Assets/AuberNoise/Editor/NoiseExtensions/Edt_TextureCreator.cs
	Assets/AuberNoise/Editor/NoiseExtensions/Edt_TextureCreator.cs.meta
	Assets/AuberNoise/Noise.meta
	Assets/AuberNoise/Noise/IModule.cs
	Assets/AuberNoise/Noise/IModule.cs.meta
	Assets/AuberNoise/Noise/MathUtils.cs
	Assets/AuberNoise/Noise/MathUtils.cs.meta
	Assets/AuberNoise/Noise/Model.meta
	Assets/AuberNoise/Noise/Model/Cylinder.cs
	Assets/AuberNoise/Noise/Model/Cylinder.cs.meta
	Assets/AuberNoise/Noise/Model/Line.cs
	Assets/AuberNoise/Noise/Model/Line.cs.meta
	Assets/AuberNoise/Noise/Model/Plane.cs
	Assets/AuberNoise/Noise/Model/Plane.cs.meta
	Assets/AuberNoise/Noise/Model/Sphere.cs
	Assets/AuberNoise/Noise/Model/Sphere.cs.meta
	Assets/AuberNoise/Noise/Module.meta
	Assets/AuberNoise/Noise/Module/Abs.cs
	Assets/AuberNoise/Noise/Module/Abs.cs.meta
	Assets/AuberNoise/Noise/Module/Add.cs
	Assets/AuberNoise/Noise/Module/Add.cs.meta
	Assets/AuberNoise/Noise/Module/Billow.cs
	Assets/AuberNoise/Noise/Module/Billow.cs.meta
	Assets/AuberNoise/Noise/Module/Blend.cs
	Assets/AuberNoise/Noise/Module/Blend.cs.meta
	Assets/AuberNoise/Noise/Module/CheckerBoard.cs
	Assets/AuberNoise/Noise/Module/CheckerBoard.cs.meta
	Assets/AuberNoise/Noise/Module/Clamp.cs
	Assets/AuberNoise/Noise/Module/Clamp.cs.meta
	Assets/AuberNoise/Noise/Module/Const.cs
	Assets/AuberNoise/Noise/Module/Const.cs.meta
	Assets/AuberNoise/Noise/Module/Curve.cs
	Assets/AuberNoise/Noise/Module/Curve.cs.meta
	Assets/AuberNoise/Noise/Module/Cylinders.cs
	Assets/AuberNoise/Noise/Module/Cylinders.cs.meta
	Assets/AuberNoise/Noise/Module/Displace.cs
	Assets/AuberNoise/Noise/Module/Displace.cs.meta
	Assets/AuberNoise/Noise/Module/Exponent.cs
	Assets/AuberNoise/Noise/Module/Exponent.cs.meta
	Assets/AuberNoise/Noise/Module/Invert.cs
	Assets/AuberNoise/Noise/Module/Invert.cs.meta
	Assets/AuberNoise/Noise/Module/Max.cs
	Assets/AuberNoise/Noise/Module/Max.cs.meta
	Assets/AuberNoise/Noise/Module/Min.cs
	Assets/AuberNoise/Noise/Module/Min.cs.meta
	Assets/AuberNoise/Noise/Module/Multiply.cs
	Assets/AuberNoise/Noise/Module/Multiply.cs.meta
	Assets/AuberNoise/Noise/Module/Perlin.cs
	Assets/AuberNoise/Noise/Module/Perlin.cs.meta
	Assets/AuberNoise/Noise/Module/Power.cs
	Assets/AuberNoise/Noise/Module/Power.cs.meta
	Assets/AuberNoise/Noise/Module/RidgedMulti.cs
	Assets/AuberNoise/Noise/Module/RidgedMulti.cs.meta
	Assets/AuberNoise/Noise/Module/RotatePoint.cs
	Assets/AuberNoise/Noise/Module/RotatePoint.cs.meta
	Assets/AuberNoise/Noise/Module/ScaleBias.cs
	Assets/AuberNoise/Noise/Module/ScaleBias.cs.meta
	Assets/AuberNoise/Noise/Module/ScalePoint.cs
	Assets/AuberNoise/Noise/Module/ScalePoint.cs.meta
	Assets/AuberNoise/Noise/Module/Select.cs
	Assets/AuberNoise/Noise/Module/Select.cs.meta
	Assets/AuberNoise/Noise/Module/Spheres.cs
	Assets/AuberNoise/Noise/Module/Spheres.cs.meta
	Assets/AuberNoise/Noise/Module/Terrace.cs
	Assets/AuberNoise/Noise/Module/Terrace.cs.meta
	Assets/AuberNoise/Noise/Module/TranslatePoint.cs
	Assets/AuberNoise/Noise/Module/TranslatePoint.cs.meta
	Assets/AuberNoise/Noise/Module/Turbulence.cs
	Assets/AuberNoise/Noise/Module/Turbulence.cs.meta
	Assets/AuberNoise/Noise/Module/Voronoi.cs
	Assets/AuberNoise/Noise/Module/Voronoi.cs.meta
	Assets/AuberNoise/Noise/NoiseGen.cs
	Assets/AuberNoise/Noise/NoiseGen.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils.meta
	Assets/AuberNoise/Noise/NoiseUtils/GradientColor.cs
	Assets/AuberNoise/Noise/NoiseUtils/GradientColor.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/ImageMap.cs
	Assets/AuberNoise/Noise/NoiseUtils/ImageMap.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMap.cs
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMap.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMapBuilder.cs
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMapBuilder.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/RendererImage.cs
	Assets/AuberNoise/Noise/NoiseUtils/RendererImage.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/RendererNormal.cs
	Assets/AuberNoise/Noise/NoiseUtils/RendererNormal.cs.meta
	Assets/AuberNoise/Noise/Readme.txt
	Assets/AuberNoise/Noise/Readme.txt.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.unity.meta
	Assets/Demos.meta
	Assets/Demos/CatapultGame.meta
	Assets/Demos/CatapultGame/Materials.meta
	Assets/Demos/CatapultGame/Materials/Atlas.mat
	Assets/Demos/CatapultGame/Materials/Atlas.mat.meta
	Assets/Demos/CatapultGame/Textures.meta
	Assets/Demos/CatapultGame/Textures/atlas.png
	Assets/Demos/CatapultGame/Textures/atlas.png.meta
	Assets/Demos/MinecraftLikeGame/MinecraftLikeGame.unity
	Assets/Demos/MinecraftLikeGame/MinecraftLikeGame.unity.meta
	Assets/Demos/MinecraftLikeGame/MinecraftLikePlayer.cs
	Assets/Demos/MinecraftLikeGame/MinecraftLikePlayer.cs.meta
	Assets/VoxelEngine.meta
	Assets/VoxelEngine/Direction.cs
	Assets/VoxelEngine/Direction.cs.meta
	Assets/VoxelEngine/Editor.meta
	Assets/VoxelEngine/Editor/VoxelChunkInspector.cs
	Assets/VoxelEngine/Editor/VoxelChunkInspector.cs.meta
	Assets/VoxelEngine/Editor/VoxelEngineInspector.cs
	Assets/VoxelEngine/Editor/VoxelEngineInspector.cs.meta
	Assets/VoxelEngine/Editor/VoxelTerrainInspector.cs
	Assets/VoxelEngine/Editor/VoxelTerrainInspector.cs.meta
	Assets/VoxelEngine/ProceduralMesh.cs
	Assets/VoxelEngine/ProceduralMesh.cs.meta
	Assets/VoxelEngine/ProceduralMeshes.cs
	Assets/VoxelEngine/ProceduralMeshes.cs.meta
	Assets/VoxelEngine/Singleton.cs
	Assets/VoxelEngine/Singleton.cs.meta
	Assets/VoxelEngine/VoxelChunk.cs
	Assets/VoxelEngine/VoxelChunk.cs.meta
	Assets/VoxelEngine/VoxelEngine.cs
	Assets/VoxelEngine/VoxelEngine.cs.meta
	Assets/VoxelEngine/VoxelTerrain.cs.meta
	VoxelEngine.userprefs

All folders restructured
Voxel query
Catapult demo
Merge branch 'master' of https://github.com/pboechat/VoxelEngine

Conflicts:
	Assets/AuberNoise.meta
	Assets/AuberNoise/Editor.meta
	Assets/AuberNoise/Editor/NoiseExtensions.meta
	Assets/AuberNoise/Editor/NoiseExtensions/Edt_TextureCreator.cs
	Assets/AuberNoise/Editor/NoiseExtensions/Edt_TextureCreator.cs.meta
	Assets/AuberNoise/Noise.meta
	Assets/AuberNoise/Noise/IModule.cs
	Assets/AuberNoise/Noise/IModule.cs.meta
	Assets/AuberNoise/Noise/MathUtils.cs
	Assets/AuberNoise/Noise/MathUtils.cs.meta
	Assets/AuberNoise/Noise/Model.meta
	Assets/AuberNoise/Noise/Model/Cylinder.cs
	Assets/AuberNoise/Noise/Model/Cylinder.cs.meta
	Assets/AuberNoise/Noise/Model/Line.cs
	Assets/AuberNoise/Noise/Model/Line.cs.meta
	Assets/AuberNoise/Noise/Model/Plane.cs
	Assets/AuberNoise/Noise/Model/Plane.cs.meta
	Assets/AuberNoise/Noise/Model/Sphere.cs
	Assets/AuberNoise/Noise/Model/Sphere.cs.meta
	Assets/AuberNoise/Noise/Module.meta
	Assets/AuberNoise/Noise/Module/Abs.cs
	Assets/AuberNoise/Noise/Module/Abs.cs.meta
	Assets/AuberNoise/Noise/Module/Add.cs
	Assets/AuberNoise/Noise/Module/Add.cs.meta
	Assets/AuberNoise/Noise/Module/Billow.cs
	Assets/AuberNoise/Noise/Module/Billow.cs.meta
	Assets/AuberNoise/Noise/Module/Blend.cs
	Assets/AuberNoise/Noise/Module/Blend.cs.meta
	Assets/AuberNoise/Noise/Module/CheckerBoard.cs
	Assets/AuberNoise/Noise/Module/CheckerBoard.cs.meta
	Assets/AuberNoise/Noise/Module/Clamp.cs
	Assets/AuberNoise/Noise/Module/Clamp.cs.meta
	Assets/AuberNoise/Noise/Module/Const.cs
	Assets/AuberNoise/Noise/Module/Const.cs.meta
	Assets/AuberNoise/Noise/Module/Curve.cs
	Assets/AuberNoise/Noise/Module/Curve.cs.meta
	Assets/AuberNoise/Noise/Module/Cylinders.cs
	Assets/AuberNoise/Noise/Module/Cylinders.cs.meta
	Assets/AuberNoise/Noise/Module/Displace.cs
	Assets/AuberNoise/Noise/Module/Displace.cs.meta
	Assets/AuberNoise/Noise/Module/Exponent.cs
	Assets/AuberNoise/Noise/Module/Exponent.cs.meta
	Assets/AuberNoise/Noise/Module/Invert.cs
	Assets/AuberNoise/Noise/Module/Invert.cs.meta
	Assets/AuberNoise/Noise/Module/Max.cs
	Assets/AuberNoise/Noise/Module/Max.cs.meta
	Assets/AuberNoise/Noise/Module/Min.cs
	Assets/AuberNoise/Noise/Module/Min.cs.meta
	Assets/AuberNoise/Noise/Module/Multiply.cs
	Assets/AuberNoise/Noise/Module/Multiply.cs.meta
	Assets/AuberNoise/Noise/Module/Perlin.cs
	Assets/AuberNoise/Noise/Module/Perlin.cs.meta
	Assets/AuberNoise/Noise/Module/Power.cs
	Assets/AuberNoise/Noise/Module/Power.cs.meta
	Assets/AuberNoise/Noise/Module/RidgedMulti.cs
	Assets/AuberNoise/Noise/Module/RidgedMulti.cs.meta
	Assets/AuberNoise/Noise/Module/RotatePoint.cs
	Assets/AuberNoise/Noise/Module/RotatePoint.cs.meta
	Assets/AuberNoise/Noise/Module/ScaleBias.cs
	Assets/AuberNoise/Noise/Module/ScaleBias.cs.meta
	Assets/AuberNoise/Noise/Module/ScalePoint.cs
	Assets/AuberNoise/Noise/Module/ScalePoint.cs.meta
	Assets/AuberNoise/Noise/Module/Select.cs
	Assets/AuberNoise/Noise/Module/Select.cs.meta
	Assets/AuberNoise/Noise/Module/Spheres.cs
	Assets/AuberNoise/Noise/Module/Spheres.cs.meta
	Assets/AuberNoise/Noise/Module/Terrace.cs
	Assets/AuberNoise/Noise/Module/Terrace.cs.meta
	Assets/AuberNoise/Noise/Module/TranslatePoint.cs
	Assets/AuberNoise/Noise/Module/TranslatePoint.cs.meta
	Assets/AuberNoise/Noise/Module/Turbulence.cs
	Assets/AuberNoise/Noise/Module/Turbulence.cs.meta
	Assets/AuberNoise/Noise/Module/Voronoi.cs
	Assets/AuberNoise/Noise/Module/Voronoi.cs.meta
	Assets/AuberNoise/Noise/NoiseGen.cs
	Assets/AuberNoise/Noise/NoiseGen.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils.meta
	Assets/AuberNoise/Noise/NoiseUtils/GradientColor.cs
	Assets/AuberNoise/Noise/NoiseUtils/GradientColor.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/ImageMap.cs
	Assets/AuberNoise/Noise/NoiseUtils/ImageMap.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMap.cs
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMap.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMapBuilder.cs
	Assets/AuberNoise/Noise/NoiseUtils/NoiseMapBuilder.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/RendererImage.cs
	Assets/AuberNoise/Noise/NoiseUtils/RendererImage.cs.meta
	Assets/AuberNoise/Noise/NoiseUtils/RendererNormal.cs
	Assets/AuberNoise/Noise/NoiseUtils/RendererNormal.cs.meta
	Assets/AuberNoise/Noise/Readme.txt
	Assets/AuberNoise/Noise/Readme.txt.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/TextureGranite.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial5.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial6.unity.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.cs
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.cs.meta
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.unity
	Assets/AuberNoise/Noise/TutorialsAndExamples/Tutorial8.unity.meta
	Assets/Demos.meta
	Assets/Demos/CatapultGame.meta
	Assets/Demos/CatapultGame/Materials.meta
	Assets/Demos/CatapultGame/Materials/Atlas.mat
	Assets/Demos/CatapultGame/Materials/Atlas.mat.meta
	Assets/Demos/CatapultGame/Textures.meta
	Assets/Demos/CatapultGame/Textures/atlas.png
	Assets/Demos/CatapultGame/Textures/atlas.png.meta
	Assets/Demos/MinecraftLikeGame/MinecraftLikeGame.unity
	Assets/Demos/MinecraftLikeGame/MinecraftLikeGame.unity.meta
	Assets/Demos/MinecraftLikeGame/MinecraftLikePlayer.cs
	Assets/Demos/MinecraftLikeGame/MinecraftLikePlayer.cs.meta
	Assets/VoxelEngine.meta
	Assets/VoxelEngine/Direction.cs
	Assets/VoxelEngine/Direction.cs.meta
	Assets/VoxelEngine/Editor.meta
	Assets/VoxelEngine/Editor/VoxelChunkInspector.cs
	Assets/VoxelEngine/Editor/VoxelChunkInspector.cs.meta
	Assets/VoxelEngine/Editor/VoxelEngineInspector.cs
	Assets/VoxelEngine/Editor/VoxelEngineInspector.cs.meta
	Assets/VoxelEngine/Editor/VoxelTerrainInspector.cs
	Assets/VoxelEngine/Editor/VoxelTerrainInspector.cs.meta
	Assets/VoxelEngine/ProceduralMesh.cs
	Assets/VoxelEngine/ProceduralMesh.cs.meta
	Assets/VoxelEngine/ProceduralMeshes.cs
	Assets/VoxelEngine/ProceduralMeshes.cs.meta
	Assets/VoxelEngine/Singleton.cs
	Assets/VoxelEngine/Singleton.cs.meta
	Assets/VoxelEngine/VoxelChunk.cs
	Assets/VoxelEngine/VoxelChunk.cs.meta
	Assets/VoxelEngine/VoxelEngine.cs
	Assets/VoxelEngine/VoxelEngine.cs.meta
	Assets/VoxelEngine/VoxelTerrain.cs.meta
	VoxelEngine.userprefs