{"push_id":856608318,"size":8,"distinct_size":1,"ref":"refs/heads/merge_master","head":"7c64bc73b110e6e13f4f5eea190c86ed059d4bec","before":"9ae98d34430c1d885508bb100004777a56290abf","commits":[{"sha":"55b70d0b8fc5cb559050d98dc627cae7dacba9c3","author":{"email":"54a42b79e8ed3a44a884c66eab4184f172c54bb6@gmail.com","name":"LSchuster"},"message":"I know what I am doing. Trust me.","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/55b70d0b8fc5cb559050d98dc627cae7dacba9c3"},{"sha":"b0b6a3bfec881e59ce30e6d73a8568c85da22749","author":{"email":"55ab180abfe8ba6f59a90a6ccbd305f9773cfb8a","name":"unknown"},"message":"ads","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/b0b6a3bfec881e59ce30e6d73a8568c85da22749"},{"sha":"dbd88becf800c728f0525aaa115f4749c7782374","author":{"email":"55ab180abfe8ba6f59a90a6ccbd305f9773cfb8a","name":"unknown"},"message":"Merge branch 'master' of https://github.com/Xellss/StrangeRituals\n\nConflicts:\n\tStrangeRituals/Library/CurrentLayout.dwlt\n\tStrangeRituals/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tStrangeRituals/Library/assetDatabase3\n\tStrangeRituals/Library/metadata/00/00000000000000004000000000000000\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956.info\n\tStrangeRituals/Library/metadata/d3/d32d8d7a7ad3c9044bf0142cc481956d.info\n\tStrangeRituals/Library/shadercompiler-32bit-1.log\n\tStrangeRituals/Library/shadercompiler-64bit-1.log\n\tStrangeRituals/StrangeRituals.sln\n\tStrangeRituals/StrangeRituals.v12.suo\n\tStrangeRituals/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/dbd88becf800c728f0525aaa115f4749c7782374"},{"sha":"1c1568e67aecee13e532e4cd98d250b437cf5cba","author":{"email":"54a42b79e8ed3a44a884c66eab4184f172c54bb6@gmail.com","name":"LSchuster"},"message":"Edit Scripts","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/1c1568e67aecee13e532e4cd98d250b437cf5cba"},{"sha":"310b7002b61689ec08a038598bac88a057a58c82","author":{"email":"54a42b79e8ed3a44a884c66eab4184f172c54bb6@gmail.com","name":"LSchuster"},"message":"Merge branch 'master' of https://github.com/Xellss/StrangeRituals\n\nConflicts:\n\tStrangeRituals/Assembly-CSharp.csproj\n\tStrangeRituals/Assets/Meshes.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/GBV1.mb.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert1.mat\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert1.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert2.mat\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert2.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_V3.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v1.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v2.fbx.meta\n\tStrangeRituals/Library/CurrentLayout.dwlt\n\tStrangeRituals/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tStrangeRituals/Library/assetDatabase3\n\tStrangeRituals/Library/expandedItems\n\tStrangeRituals/Library/metadata/00/00000000000000004000000000000000\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956.info\n\tStrangeRituals/Library/shadercompiler-32bit-1.log\n\tStrangeRituals/Library/shadercompiler-64bit-1.log\n\tStrangeRituals/StrangeRituals.sln\n\tStrangeRituals/StrangeRituals.v12.suo","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/310b7002b61689ec08a038598bac88a057a58c82"},{"sha":"d601eda5a86761761792b083889e8b80ad79dd0b","author":{"email":"4b631f69842530d659306c8f06dbad594a6b1807@daniel-lause.de","name":"DanielLause"},"message":"meta","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/d601eda5a86761761792b083889e8b80ad79dd0b"},{"sha":"cb38b7913dd6af3bc0637c7cd4e317bf74d551ea","author":{"email":"4b631f69842530d659306c8f06dbad594a6b1807@daniel-lause.de","name":"DanielLause"},"message":"Merge branch 'master' of https://github.com/Xellss/StrangeRituals\n\nConflicts:\n\tStrangeRituals/Assembly-CSharp.csproj\n\tStrangeRituals/Assets/Materials/Textures.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Broken+Dirt.png.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Broken+Dirt.psd.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Normal.png.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Normal.psd.meta\n\tStrangeRituals/Assets/Meshes.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/GBV1.mb.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert1.mat\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert1.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert2.mat\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert2.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_V3.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v1.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v2.fbx.meta\n\tStrangeRituals/Library/CurrentLayout.dwlt\n\tStrangeRituals/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tStrangeRituals/Library/assetDatabase3\n\tStrangeRituals/Library/expandedItems\n\tStrangeRituals/Library/metadata/00/00000000000000004000000000000000\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956.info\n\tStrangeRituals/Library/shadercompiler-32bit-1.log\n\tStrangeRituals/Library/shadercompiler-64bit-1.log\n\tStrangeRituals/StrangeRituals.sln\n\tStrangeRituals/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache","distinct":false,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/cb38b7913dd6af3bc0637c7cd4e317bf74d551ea"},{"sha":"7c64bc73b110e6e13f4f5eea190c86ed059d4bec","author":{"email":"5dfde5070b99bc10093af60d3c3b3da1ce3e2ff0@gmail.com","name":"LudusExtremus"},"message":"Merge branch 'master' into merge_master\n\nConflicts:\n\tStrangeRituals/Assembly-CSharp.csproj\n\tStrangeRituals/Assets/Materials/Textures.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Broken+Dirt.png.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Broken+Dirt.psd.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Normal.png.meta\n\tStrangeRituals/Assets/Materials/Textures/Stone_Pannel_Normal.psd.meta\n\tStrangeRituals/Assets/Meshes.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/GBV1.mb.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert1.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/Materials/lambert2.mat.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_V3.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v1.fbx.meta\n\tStrangeRituals/Assets/Meshes/Lebkuchenman/gingerbreadman_v2.fbx.meta\n\tStrangeRituals/Library/CurrentLayout.dwlt\n\tStrangeRituals/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tStrangeRituals/Library/assetDatabase3\n\tStrangeRituals/Library/expandedItems\n\tStrangeRituals/Library/metadata/00/00000000000000002000000000000000\n\tStrangeRituals/Library/metadata/00/00000000000000004000000000000000\n\tStrangeRituals/Library/metadata/06/06d97cf57fbc778449651e02b0210956.info\n\tStrangeRituals/Library/metadata/f2/f2dd3a7b2cf4fa34dbaed260eb66a9bb.info\n\tStrangeRituals/Library/shadercompiler-32bit-1.log\n\tStrangeRituals/Library/shadercompiler-64bit-1.log\n\tStrangeRituals/StrangeRituals.sln","distinct":true,"url":"https://api.github.com/repos/Xellss/StrangeRituals/commits/7c64bc73b110e6e13f4f5eea190c86ed059d4bec"}]}