Merge branch 'HEAD' of https://github.com/LinusVanElswijk/Terasology.git into develop

Conflicts:
	.gitignore
	README.markdown
	applet/index.html
	build.gradle
	config/checkstyle/checkstyle.xml
	engine/src/main/resources/assets/shaders/genericMeshMaterial.info
	engine/src/main/resources/assets/shaders/ui/font.info
	engine/src/main/resources/assets/textures/lavaStill.png
	engine/src/main/resources/assets/textures/waterNormal.texinfo
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	mods/adventure/assets/blocks/Transparent.json
	mods/books/assets/blocks/Bookcase.json
	mods/books/assets/prefabs/bookcase.prefab
	mods/books/src/main/java/org/terasology/books/logic/BookComponent.java
	mods/books/src/main/java/org/terasology/books/logic/ReadBookAction.java
	mods/books/src/main/java/org/terasology/books/rendering/gui/windows/UIScreenBook.java
	mods/cellularAutomata/assets/blocks/CABSource.json
	mods/cellularAutomata/assets/blocks/CABWater01.json
	mods/cellularAutomata/src/main/java/org/terasology/cellularAutomata/components/DevToolComponent.java
	mods/core/assets/prefabs/axe.prefab
	mods/core/assets/prefabs/coal.prefab
	mods/core/assets/prefabs/droppedblock.prefab
	mods/core/assets/prefabs/droppeditem.prefab
	mods/core/assets/prefabs/pickaxe.prefab
	mods/core/assets/prefabs/player.prefab
	mods/core/assets/prefabs/refinementRock.prefab
	mods/craft/assets/prefabs/plankstair.prefab
	mods/craft/src/main/java/org/terasology/craft/componentSystem/action/CraftingAction.java
	mods/craft/src/main/java/org/terasology/craft/componentSystem/controllers/CraftingSystem.java
	mods/craft/src/main/java/org/terasology/craft/componentSystem/rendering/CraftBlocksRenderer.java
	mods/craft/src/main/java/org/terasology/craft/components/actions/CraftingActionComponent.java
	mods/craft/src/main/java/org/terasology/craft/events/crafting/AddItemEvent.java
	mods/craft/src/main/java/org/terasology/craft/events/crafting/ChangeLevelEvent.java
	mods/craft/src/main/java/org/terasology/craft/events/crafting/CheckRefinementEvent.java
	mods/craft/src/main/java/org/terasology/craft/events/crafting/DeleteItemEvent.java
	mods/craft/src/main/java/org/terasology/craft/rendering/CraftingGrid.java
	mods/dynamicBlocks/assets/blockTiles/TrainTrack.png
	mods/dynamicBlocks/assets/blockTiles/TrainTrackCurve.png
	mods/dynamicBlocks/assets/blockTiles/TrainTrackIntersection.png
	mods/dynamicBlocks/assets/blocks/TrainTrack.json
	mods/dynamicBlocks/assets/blocks/TrainTrackIntersection.json
	mods/dynamicBlocks/assets/materials/boat.mat
	mods/dynamicBlocks/assets/materials/train.mat
	mods/fences/assets/blocks/Fence.json
	mods/fences/assets/blocks/FenceGateClosed.json
	mods/funnyBlocks/assets/shapes/bowlingPin.json
	mods/hunger/assets/blocks/BlueBerry.json
	mods/hunger/assets/blocks/RainRoot.json
	mods/hunger/assets/blocks/SmirkRoot.json
	mods/hunger/src/main/java/org/terasology/hunger/HungerComponent.java
	mods/hunger/src/main/java/org/terasology/hunger/HungerSystem.java
	mods/miniion/assets/blocks/OreonCrop/OreonPlant1.json
	mods/miniion/assets/blocks/OreonCrop/OreonPlant2.json
	mods/miniion/assets/blocks/OreonFarmDry.json
	mods/miniion/assets/blocks/OreonFarmWet.json
	mods/miniion/assets/prefabs/minioncommand.prefab
	mods/miniion/src/main/java/org/terasology/miniion/components/MinionCommandComponent.java
	mods/miniion/src/main/java/org/terasology/miniion/components/MinionComponent.java
	mods/miniion/src/main/java/org/terasology/miniion/components/SimpleMinionAIComponent.java
	mods/miniion/src/main/java/org/terasology/miniion/components/ZoneListComponent.java
	mods/miniion/src/main/java/org/terasology/miniion/components/namesComponent.java
	mods/miniion/src/main/java/org/terasology/miniion/componentsystem/controllers/MinionSystem.java
	mods/miniion/src/main/java/org/terasology/miniion/componentsystem/controllers/SimpleMinionAISystem.java
	mods/miniion/src/main/java/org/terasology/miniion/minionenum/MinionBehaviour.java
	mods/miniion/src/main/java/org/terasology/miniion/pathfinder/AStarPathing.java
	mods/miniion/src/main/java/org/terasology/miniion/utilities/MinionMessage.java
	mods/morelights/assets/blocks/morelights/tree/SakuraTrunk.json
	mods/morelights/assets/blocks/morelights/tree/StarTreeTrunk.json
	mods/plants/assets/blocks/Corn1.json
	mods/portals/assets/prefabs/portal.prefab
	mods/portals/src/main/java/org/terasology/portals/DefaultMobFactory.java
	mods/portals/src/main/java/org/terasology/portals/SpawnableComponent.java
	mods/portals/src/main/java/org/terasology/portals/SpawnerSystem.java
	mods/potions/src/main/java/org/terasology/potions/DrinkPotionAction.java
	mods/test/assets/materials/guardskin.mat
	mods/test/assets/materials/pony.mat
	settings.gradle
	src/dev/java/org/terasology/world/TerrainPreviewGeneratorDev.java
	src/main/java/org/terasology/asset/AssetManager.java
	src/main/java/org/terasology/asset/Assets.java
	src/main/java/org/terasology/audio/AudioManager.java
	src/main/java/org/terasology/audio/loaders/OggSoundLoader.java
	src/main/java/org/terasology/audio/loaders/OggStreamingSoundLoader.java
	src/main/java/org/terasology/audio/openAL/BasicSoundPool.java
	src/main/java/org/terasology/audio/openAL/BasicSoundSource.java
	src/main/java/org/terasology/audio/openAL/BasicStreamingSoundPool.java
	src/main/java/org/terasology/audio/openAL/BasicStreamingSoundSource.java
	src/main/java/org/terasology/audio/openAL/OggSound.java
	src/main/java/org/terasology/audio/openAL/OggStreamingSound.java
	src/main/java/org/terasology/audio/openAL/OpenALException.java
	src/main/java/org/terasology/audio/openAL/OpenALSound.java
	src/main/java/org/terasology/audio/openAL/OpenALStreamingSound.java
	src/main/java/org/terasology/audio/openAL/SoundPool.java
	src/main/java/org/terasology/audio/openAL/SoundSource.java
	src/main/java/org/terasology/componentSystem/BlockParticleEmitterSystem.java
	src/main/java/org/terasology/componentSystem/MiniaturizerSystem.java
	src/main/java/org/terasology/componentSystem/RenderSystem.java
	src/main/java/org/terasology/componentSystem/action/AddMiniatureBlockAction.java
	src/main/java/org/terasology/componentSystem/action/ExplosionAction.java
	src/main/java/org/terasology/componentSystem/action/PlaySoundAction.java
	src/main/java/org/terasology/componentSystem/action/TunnelAction.java
	src/main/java/org/terasology/componentSystem/characters/CharacterSoundSystem.java
	src/main/java/org/terasology/componentSystem/common/HealthSystem.java
	src/main/java/org/terasology/componentSystem/controllers/DebugControlSystem.java
	src/main/java/org/terasology/componentSystem/controllers/HierarchicalAISystem.java
	src/main/java/org/terasology/componentSystem/controllers/ItemPickupSystem.java
	src/main/java/org/terasology/componentSystem/controllers/LocalPlayerSystem.java
	src/main/java/org/terasology/componentSystem/controllers/MenuControlSystem.java
	src/main/java/org/terasology/componentSystem/controllers/SimpleAISystem.java
	src/main/java/org/terasology/componentSystem/items/ItemSystem.java
	src/main/java/org/terasology/componentSystem/rendering/BlockDamageRenderer.java
	src/main/java/org/terasology/componentSystem/rendering/DroppedItemsRenderer.java
	src/main/java/org/terasology/componentSystem/rendering/FirstPersonRenderer.java
	src/main/java/org/terasology/componentSystem/worldSimulation/GrowthSimulator.java
	src/main/java/org/terasology/components/BlockParticleEffectComponent.java
	src/main/java/org/terasology/components/CharacterSoundComponent.java
	src/main/java/org/terasology/components/HealthComponent.java
	src/main/java/org/terasology/components/ItemComponent.java
	src/main/java/org/terasology/components/LightComponent.java
	src/main/java/org/terasology/components/actions/MiniaturizerComponent.java
	src/main/java/org/terasology/config/AdvancedConfig.java
	src/main/java/org/terasology/config/Config.java
	src/main/java/org/terasology/config/InputConfig.java
	src/main/java/org/terasology/entityFactory/DroppedBlockFactory.java
	src/main/java/org/terasology/entityFactory/DroppedItemFactory.java
	src/main/java/org/terasology/entityFactory/PlayerFactory.java
	src/main/java/org/terasology/entitySystem/metadata/core/StringMapTypeHandler.java
	src/main/java/org/terasology/game/Terasology.java
	src/main/java/org/terasology/game/TerasologyApplet.java
	src/main/java/org/terasology/game/TerasologyEngine.java
	src/main/java/org/terasology/game/modes/StateLoading.java
	src/main/java/org/terasology/game/modes/StateMainMenu.java
	src/main/java/org/terasology/game/modes/StateSinglePlayer.java
	src/main/java/org/terasology/game/modes/loadProcesses/InitialiseWorld.java
	src/main/java/org/terasology/game/modes/loadProcesses/LoadEntities.java
	src/main/java/org/terasology/game/modes/loadProcesses/PrepareLocalWorld.java
	src/main/java/org/terasology/game/modes/loadProcesses/RegisterBlocks.java
	src/main/java/org/terasology/game/modes/loadProcesses/RegisterInputSystem.java
	src/main/java/org/terasology/game/types/FreeStyleType.java
	src/main/java/org/terasology/game/types/GameType.java
	src/main/java/org/terasology/game/types/SurvivalType.java
	src/main/java/org/terasology/input/CameraOverEvent.java
	src/main/java/org/terasology/input/InputSystem.java
	src/main/java/org/terasology/io/ProtobufHandler.java
	src/main/java/org/terasology/logic/LocalPlayer.java
	src/main/java/org/terasology/logic/commands/Commands.java
	src/main/java/org/terasology/logic/door/DoorSystem.java
	src/main/java/org/terasology/logic/generators/DefaultGenerators.java
	src/main/java/org/terasology/logic/manager/GUIManager.java
	src/main/java/org/terasology/logic/manager/ShaderManager.java
	src/main/java/org/terasology/logic/mod/ModInfo.java
	src/main/java/org/terasology/logic/mod/ModManager.java
	src/main/java/org/terasology/math/Diamond3iIterator.java
	src/main/java/org/terasology/math/TeraMath.java
	src/main/java/org/terasology/model/inventory/Icon.java
	src/main/java/org/terasology/model/structures/ViewFrustum.java
	src/main/java/org/terasology/monitoring/PerformanceMonitor.java
	src/main/java/org/terasology/monitoring/impl/IPerformanceMonitor.java
	src/main/java/org/terasology/monitoring/impl/NullPerformanceMonitor.java
	src/main/java/org/terasology/monitoring/impl/PerformanceMonitorImpl.java
	src/main/java/org/terasology/physics/BulletPhysics.java
	src/main/java/org/terasology/physics/character/BulletCharacterMovementSystem.java
	src/main/java/org/terasology/physics/character/CharacterMovementComponent.java
	src/main/java/org/terasology/protobuf/ChunksProtobuf.java
	src/main/java/org/terasology/rendering/assetLoaders/GLSLShaderLoader.java
	src/main/java/org/terasology/rendering/assetLoaders/MaterialLoader.java
	src/main/java/org/terasology/rendering/assetLoaders/PNGTextureLoader.java
	src/main/java/org/terasology/rendering/assets/Font.java
	src/main/java/org/terasology/rendering/assets/Material.java
	src/main/java/org/terasology/rendering/assets/Texture.java
	src/main/java/org/terasology/rendering/cameras/Camera.java
	src/main/java/org/terasology/rendering/gui/animation/AnimationOpacity.java
	src/main/java/org/terasology/rendering/gui/animation/AnimationRotate.java
	src/main/java/org/terasology/rendering/gui/dialogs/UIDialogCreateNewWorld.java
	src/main/java/org/terasology/rendering/gui/dialogs/UIDialogMods.java
	src/main/java/org/terasology/rendering/gui/layout/ColumnLayout.java
	src/main/java/org/terasology/rendering/gui/widgets/UIButton.java
	src/main/java/org/terasology/rendering/gui/widgets/UIComboBox.java
	src/main/java/org/terasology/rendering/gui/widgets/UIItemCell.java
	src/main/java/org/terasology/rendering/gui/widgets/UILabel.java
	src/main/java/org/terasology/rendering/gui/widgets/UISlider.java
	src/main/java/org/terasology/rendering/gui/widgets/UIText.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuConfigAdvanced.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuConfigAudio.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuConfigControls.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuConfigVideo.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuMultiplayer.java
	src/main/java/org/terasology/rendering/gui/windows/UIMenuSingleplayer.java
	src/main/java/org/terasology/rendering/gui/windows/UIScreenHUD.java
	src/main/java/org/terasology/rendering/gui/windows/UIScreenInventory.java
	src/main/java/org/terasology/rendering/gui/windows/UIScreenMetrics.java
	src/main/java/org/terasology/rendering/logic/MeshRenderer.java
	src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java
	src/main/java/org/terasology/rendering/primitives/ChunkMesh.java
	src/main/java/org/terasology/rendering/primitives/ChunkTessellator.java
	src/main/java/org/terasology/rendering/primitives/MeshFactory.java
	src/main/java/org/terasology/rendering/renderer/AABBRenderer.java
	src/main/java/org/terasology/rendering/renderer/BlockOverlayRenderer.java
	src/main/java/org/terasology/rendering/shader/IShaderParameters.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersBlock.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersChunk.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersDefault.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersGelCube.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersHdr.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersLightBufferPass.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersParticle.java
	src/main/java/org/terasology/rendering/shader/ShaderParametersPost.java
	src/main/java/org/terasology/rendering/world/BlockGrid.java
	src/main/java/org/terasology/rendering/world/ChunkUpdateManager.java
	src/main/java/org/terasology/rendering/world/Skysphere.java
	src/main/java/org/terasology/rendering/world/WorldRenderer.java
	src/main/java/org/terasology/version/TerasologyGameVersionInfo.java
	src/main/java/org/terasology/world/AbstractWorldProviderDecorator.java
	src/main/java/org/terasology/world/BlockEntityRegistry.java
	src/main/java/org/terasology/world/EntityAwareWorldProvider.java
	src/main/java/org/terasology/world/WorldInfo.java
	src/main/java/org/terasology/world/WorldProvider.java
	src/main/java/org/terasology/world/WorldProviderCore.java
	src/main/java/org/terasology/world/WorldProviderCoreImpl.java
	src/main/java/org/terasology/world/WorldProviderWrapper.java
	src/main/java/org/terasology/world/WorldView.java
	src/main/java/org/terasology/world/block/Block.java
	src/main/java/org/terasology/world/block/BlockEntitySystem.java
	src/main/java/org/terasology/world/block/BlockPickupSystem.java
	src/main/java/org/terasology/world/block/family/AlignToSurfaceFamily.java
	src/main/java/org/terasology/world/block/family/BlockFamily.java
	src/main/java/org/terasology/world/block/family/HorizontalBlockFamily.java
	src/main/java/org/terasology/world/block/family/SymmetricFamily.java
	src/main/java/org/terasology/world/block/loader/BlockDefinition.java
	src/main/java/org/terasology/world/block/loader/BlockLoader.java
	src/main/java/org/terasology/world/block/loader/TileLoader.java
	src/main/java/org/terasology/world/block/management/BlockManager.java
	src/main/java/org/terasology/world/block/shapes/BlockMeshPart.java
	src/main/java/org/terasology/world/chunks/Chunk.java
	src/main/java/org/terasology/world/chunks/Chunks.java
	src/main/java/org/terasology/world/chunks/MiniatureChunk.java
	src/main/java/org/terasology/world/chunks/provider/ChunkProvider.java
	src/main/java/org/terasology/world/chunks/provider/LocalChunkProvider.java
	src/main/java/org/terasology/world/chunks/store/ChunkStore.java
	src/main/java/org/terasology/world/chunks/store/ChunkStoreProtobuf.java
	src/main/java/org/terasology/world/generator/BaseMapGenerator.java
	src/main/java/org/terasology/world/generator/MapGenerator.java
	src/main/java/org/terasology/world/generator/core/FloraGenerator.java
	src/main/java/org/terasology/world/generator/core/ForestGenerator.java
	src/main/java/org/terasology/world/generator/core/PerlinTerrainGenerator.java
	src/main/java/org/terasology/world/lighting/LightPropagator.java
	src/main/java/org/terasology/world/liquid/LiquidSimulator.java
	src/main/java/org/terasology/world/localChunkProvider/AbstractChunkTask.java
	src/main/java/org/terasology/world/localChunkProvider/ChunkTask.java
	src/main/java/org/terasology/world/localChunkProvider/ShutdownTask.java
	src/main/protobuf/Chunks.proto
	src/main/resources/assets/blockTiles/plant/Grass.png
	src/main/resources/assets/blockTiles/plant/GrassSide.png
	src/main/resources/assets/blocks/building/Brick.json
	src/main/resources/assets/blocks/building/CobbleStone.json
	src/main/resources/assets/blocks/building/Plank.json
	src/main/resources/assets/blocks/flora/Dandelion.json
	src/main/resources/assets/blocks/flora/Glowbell.json
	src/main/resources/assets/blocks/flora/GlowbellBloom.json
	src/main/resources/assets/blocks/flora/cacti/Cactus.json
	src/main/resources/assets/blocks/flora/tree/BirkTrunk.json
	src/main/resources/assets/blocks/flora/tree/OakTrunk.json
	src/main/resources/assets/blocks/flora/tree/PineTrunk.json
	src/main/resources/assets/blocks/flora/tree/RedLeaf.json
	src/main/resources/assets/blocks/liquid/Lava.json
	src/main/resources/assets/blocks/liquid/Water.json
	src/main/resources/assets/blocks/mineral/CoalOre.json
	src/main/resources/assets/blocks/mineral/CopperOre.json
	src/main/resources/assets/blocks/mineral/DiamondOre.json
	src/main/resources/assets/blocks/mineral/GoldOre.json
	src/main/resources/assets/blocks/mineral/IronOre.json
	src/main/resources/assets/blocks/mineral/Stone.json
	src/main/resources/assets/blocks/soil/Dirt.json
	src/main/resources/assets/blocks/soil/Grass.json
	src/main/resources/assets/blocks/soil/Gravel.json
	src/main/resources/assets/blocks/soil/Sand.json
	src/main/resources/assets/blocks/soil/Snow.json
	src/main/resources/assets/materials/default.mat
	src/main/resources/assets/materials/monkeyHead.mat
	src/main/resources/assets/materials/monkeyHead1.mat
	src/main/resources/assets/materials/monkeyHead2.mat
	src/main/resources/assets/materials/monkeyHead3.mat
	src/main/resources/assets/materials/monkeyHead4.mat
	src/main/resources/assets/materials/monkeyHead5.mat
	src/main/resources/assets/materials/monkeyHead6.mat
	src/main/resources/assets/materials/monkeyHead7.mat
	src/main/resources/assets/materials/monkeyHead8.mat
	src/main/resources/assets/materials/monkeyHead9.mat
	src/main/resources/assets/shaders/animateOpacity_frag.glsl
	src/main/resources/assets/shaders/block_frag.glsl
	src/main/resources/assets/shaders/blur_frag.glsl
	src/main/resources/assets/shaders/chunk_frag.glsl
	src/main/resources/assets/shaders/chunk_vert.glsl
	src/main/resources/assets/shaders/combine_vert.glsl
	src/main/resources/assets/shaders/debug_vert.glsl
	src/main/resources/assets/shaders/defaultTextured_frag.glsl
	src/main/resources/assets/shaders/default_frag.glsl
	src/main/resources/assets/shaders/down_frag.glsl
	src/main/resources/assets/shaders/gelatinousCube_frag.glsl
	src/main/resources/assets/shaders/gelatinousCube_vert.glsl
	src/main/resources/assets/shaders/genericMesh.info
	src/main/resources/assets/shaders/genericMeshMaterial.info
	src/main/resources/assets/shaders/genericMeshMaterial_frag.glsl
	src/main/resources/assets/shaders/genericMeshMaterial_vert.glsl
	src/main/resources/assets/shaders/hdr_frag.glsl
	src/main/resources/assets/shaders/highp_frag.glsl
	src/main/resources/assets/shaders/particle_frag.glsl
	src/main/resources/assets/shaders/particle_vert.glsl
	src/main/resources/assets/shaders/post_frag.glsl
	src/main/resources/assets/shaders/sky_frag.glsl
	src/main/resources/assets/shaders/sky_vert.glsl
	src/main/resources/assets/shapes/halfBlock.json
	src/main/resources/assets/shapes/pillar.json
	src/main/resources/assets/shapes/pillarBase.json
	src/main/resources/assets/shapes/pillarTop.json
	src/main/resources/assets/textures/custom_lava_flowing.png
	src/main/resources/assets/textures/foliagecolor.png
	src/main/resources/assets/textures/grasscolor.png
	src/main/resources/assets/textures/lavaStill.png
	src/main/resources/assets/textures/loadingBackground.png
	src/main/resources/assets/textures/menuBackground.png
	src/main/resources/assets/textures/waterNormal.json
	src/main/resources/assets/textures/water_normal.json
	src/main/resources/org/terasology/include/globalFunctionsFragIncl.glsl
	src/main/resources/org/terasology/include/globalFunctionsVertIncl.glsl
	src/template/VERSION
	src/test/java/org/terasology/math/Diamond3iIteratorTest.java
	src/test/java/org/terasology/testUtil/WorldProviderCoreStub.java
	src/test/java/org/terasology/world/ChunkGeneratorManagerTest.java
	src/test/java/org/terasology/world/LightPropagationTest.java
	src/test/java/org/terasology/world/WorldViewTest.java
	src/test/java/org/terasology/world/generator/InternalLightGeneratorTest.java
	src/test/java/org/terasology/world/liquid/LiquidSimulationTest.java