{"push_id":1095611173,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"a67673f4a2de658ae3ce15c459126fd230b833ff","before":"e88e31c1d759af525da3114b6c2a4416a571b4a0","commits":[{"sha":"05ae5617f98514a20478b045237c8db773d38c87","author":{"email":"6c063f84e5e2c24c3fbe5d76fd04ada6a7927ccc@hotmail.com","name":"Garrett Keane"},"message":"0.0.0.0.11 2 Level Maps & Magnetic Door work\n\nSmall test map & large future map laid out...also progress on\nimplementation of magnetic door functions","distinct":true,"url":"https://api.github.com/repos/Jolternauts/Jolternauts/commits/05ae5617f98514a20478b045237c8db773d38c87"},{"sha":"a67673f4a2de658ae3ce15c459126fd230b833ff","author":{"email":"6c063f84e5e2c24c3fbe5d76fd04ada6a7927ccc@hotmail.com","name":"Garrett Keane"},"message":"Conflicts\n\n# Conflicts:\n#\tAssembly-CSharp-Editor.csproj\n#\tAssembly-CSharp-firstpass.csproj\n#\tAssembly-CSharp.csproj\n#\tAssets/Models/Latest_Models/Station Parts/Corridor_Straight_Medium.obj\n#\tAssets/Models/Latest_Models/Station Parts/Corridor_Straight_Short.obj\n\n#\tAssets/Prefabs/Prefabs_Improved/Objects/Lights/Light_Freestanding_01.prefab\n#\tAssets/Prefabs/Prefabs_Improved/StationParts/AirLock_Complete.prefab\n#\tAssets/Prefabs/obj/Fusebox.prefab\n#\tAssets/Scenes/Prototype Level.unity\n#\tAssets/Scripts/AngusMovement.cs\n#\tAssets/Scripts/CompassScript.cs\n#\tAssets/Scripts/Power Mngt/FuseBox.cs\n#\tAssets/Scripts/Power Mngt/PowerDrain.cs\n#\tAssets/Scripts/RoomScript.cs\n#\tJolternauts 25-4-16.userprefs\n#\tJolternauts 28-4-16.sln\n#\tLibrary/CurrentLayout.dwlt\n#\tLibrary/InspectorExpandedItems.asset\n#\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tLibrary/ScriptAssemblies/Assembly-CSharp.dll\n#\tLibrary/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tLibrary/assetDatabase3\n#\tLibrary/expandedItems\n#\tLibrary/metadata/00/00000000000000004000000000000000\n#\tLibrary/metadata/00/00000000000000006100000000000000\n#\tLibrary/metadata/0d/0d2dedf51228d2d419de31a96ce7c4da.info\n#\tLibrary/metadata/12/1223cae7ab1e12443a979f49e84e6aee\n#\tLibrary/metadata/6f/6ff8e12dfb5053b419749b915dade69a\n#\tLibrary/metadata/8f/8f9d8473efda4e94dbebd51fbffe3736.info\n#\tLibrary/metadata/97/97343116936fe884db1948b83bed5c68.info\n#\tLibrary/metadata/9e/9eb9db551d5d22c43b79d72d07eb0b95\n#\tLibrary/metadata/9e/9eb9db551d5d22c43b79d72d07eb0b95.info\n#\tLibrary/metadata/be/be43edb265f99bf42b42c0251f47302f\n#\tLibrary/metadata/f5/f5c4b890851ff994fb3ebee08e02baee\n#\tLibrary/metadata/f5/f5c4b890851ff994fb3ebee08e02baee.info\n#\tLibrary/metadata/fa/facfaa2edffe6c147bcae1b2904a6377","distinct":true,"url":"https://api.github.com/repos/Jolternauts/Jolternauts/commits/a67673f4a2de658ae3ce15c459126fd230b833ff"}]}