Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scripts/MainGameEventScheduler.cs
	Cooking_clone-csharp.sln
	Cooking_clone.sln
	Cooking_clone.userprefs
	Library/AssetServerCacheV3
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/38/3854736570c93d542ad9105fb772ef09
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/65/65f07609a45012d4fa3e7330a695a071
	Library/metadata/de/deab8430372f0c1409dbc4820c065737
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
commit
no message
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Assets/Materials/Bronze.mat.meta~origin_nick.meta~HEAD.meta~fcb9866d3ae61f703ca19776f0c778c0d1081e5b
	Assets/Materials/Bronze.mat.meta~origin_nick.meta~HEAD.meta~fcb9866d3ae61f703ca19776f0c778c0d1081e5b.meta
	Assets/Materials/Bronze.mat.meta~origin_nick.meta~bbec227b439ad999ab64e6d4e12ca8189b8ae63a.meta~fcb9866d3ae61f703ca19776f0c778c0d1081e5b
	Assets/Materials/Bronze.mat.meta~origin_nick.meta~bbec227b439ad999ab64e6d4e12ca8189b8ae63a.meta~fcb9866d3ae61f703ca19776f0c778c0d1081e5b.meta
	Assets/Scenes/Test_Main_GreyBox_M1.unity
	Assets/Scripts/MainGameEventScheduler.cs
	Library/AnnotationManager
	Library/AssetServerCacheV3
	Library/BuildSettings.asset
	Library/EditorUserBuildSettings.asset
	Library/EditorUserSettings.asset
	Library/InspectorExpandedItems.asset
	Library/MonoManager.asset
	Library/ScriptMapper
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/006a5f739d1105f6a000538a2aef8c59
	Library/metadata/02/02875f5287cee40f395d29d134038590
	Library/metadata/02/02f6951ce320d08459d4ce7639bc6f04
	Library/metadata/03/0311d48814ed4c241a460b6b5797830a
	Library/metadata/04/040b7938bb5c24dbd8a426d6fb8c6f48
	Library/metadata/04/047330f39d11745ad0004adb8d76c639
	Library/metadata/06/062039008903b2841a72bee08353dbde
	Library/metadata/06/068e8e3d0ced7441a85a339bada5f721
	Library/metadata/06/06e450212506e4505898021067da2380
	Library/metadata/08/084a58e1a35cb400198b8b97e49de9e1
	Library/metadata/0c/0c3b55a616eba49058cb1d1a35d4667b
	Library/metadata/0d/0d2f50a8e0bb841a5aaa90ae55db8849
	Library/metadata/0f/0f34e28c8056cc049924042cdf2d546d
	Library/metadata/0f/0faf5a7d017a84c4cb50f7d5a4ea463b
	Library/metadata/1a/1a403ea9a249c334cb5d246afee8871f
	Library/metadata/1b/1bd1800093b934d40b840aff21acc560
	Library/metadata/1f/1f7d732783b7049c98c99c5026e52092
	Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Library/metadata/25/25bc932f1fdaf4ade8f2ca6a512e4b88
	Library/metadata/26/26437d5c4e88b4f6ead4f5e4be72cb6f
	Library/metadata/27/277f3af517b514f7b9126bbe785f0c45
	Library/metadata/29/291f29a6d8def364b976149df6013481
	Library/metadata/29/2920719e9565f41c292ab1f0e2610ecc
	Library/metadata/29/299384ce29b7c4ac498872eaf684d8c7
	Library/metadata/29/29b0bd4c50e04496cba03519cb7bfcbd
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/2f/2f457cf94713dad4f85995c3b9f51264
	Library/metadata/2f/2fd60b04f7c434a4dafd253d09bfa783
	Library/metadata/30/30abebfd9bf1c49d8a2d26e61e66bc15
	Library/metadata/31/31552b1c0d52b6f408ec6ab482889532
	Library/metadata/32/32e511596130644909746ed350aaead6
	Library/metadata/33/337624ac623eb1d459f4c198b4e2fad5
	Library/metadata/33/33850b67ffcaa4b6c9a7146e4be0b917
	Library/metadata/35/351c8343661c6e5468075ed8ed47e759
	Library/metadata/37/37061ce92f8a5416fb306063bfd1e326
	Library/metadata/38/3854736570c93d542ad9105fb772ef09
	Library/metadata/39/393d9f1a51ff2402ab76ada2d32db26c
	Library/metadata/39/3986d080d3d4e4c1597d7c25ce91bef0
	Library/metadata/3c/3cf6b035ee986a7469715d0791dd783e
	Library/metadata/40/40b01469ebddf42bc84870ba2f3d8c4c
	Library/metadata/42/424f5c9fe16ab4cfab7f82ef0d264732
	Library/metadata/43/43d80f088fa7b454089ed22aacfd5f0b
	Library/metadata/43/43e80dab98ed9ec48a80b37c489709f0
	Library/metadata/43/43ed8fb586d1c2b4f91818d74f95a13b
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/45/458ec11542fca4776a3c1878c3533e51
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/47/47e6c1fe757284b3cbc0413df7d9c080
	Library/metadata/48/48c683a67d845c649a11c97b07c790e6
	Library/metadata/4a/4ae0280787c3d1d449e05e0faad1b529
	Library/metadata/4e/4e70f2ec91814a74e8db27e5285ef569
	Library/metadata/52/526b1fa52a5995d40aed1ba89b80c84d
	Library/metadata/52/52a59e5669a60504f9442219d5be5a01
	Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	Library/metadata/56/560445ac7a7204e4d9ee84d4b7b09cbc
	Library/metadata/57/57df178e3dac2c64c93e843b10b6207f
	Library/metadata/59/59999d2a3e8a240ffa0f3fdfd73d8a5b
	Library/metadata/5a/5aaacb273c65e2a489f66ab07916cb3f
	Library/metadata/5a/5af082de7425cbd4691b2fcaee8e999f
	Library/metadata/5b/5b28786e755dd844cbd78e69ddd019c3
	Library/metadata/60/602e24fe884473d4a90208efc03e35bd
	Library/metadata/60/606a397055700a94e97c7b99fe2bcf51
	Library/metadata/62/6237a6d86aac15141927df51d269ecb2
	Library/metadata/65/654cc3bd0796c4855b3e0e9f26f7e061
	Library/metadata/65/65f07609a45012d4fa3e7330a695a071
	Library/metadata/66/667c39c35c27e4b23989fbf5f77a7e8f
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/6a/6ac3370411e7b4ba1a3413a0b6f7ff89
	Library/metadata/6b/6b436d069d11415d1100ab9b44295342
	Library/metadata/6b/6b56533e641a12a4ca76c7c8f657f0bc
	Library/metadata/70/706eadfad28bc4c1c9bb137b31052b14
	Library/metadata/70/70a4c3571f5624280bd8605def97056d
	Library/metadata/71/71709fbfa7cc5144c8aab57ed9afdf56
	Library/metadata/77/77139b2489f841147b80469226b685cf
	Library/metadata/7b/7b9189305cbc2407780cc3b9b42a6c00
	Library/metadata/7d/7d422b60e6cb19e41a6aaf739cbeeac7
	Library/metadata/7d/7ded7bccb1de843038f8920b3a9daf12
	Library/metadata/7e/7ea23a47c3f954392b4dfd57b6585449
	Library/metadata/7e/7eaecb5cfab0748a7b87d318a5888f63
	Library/metadata/7f/7f2e1b36244097849b98989644ff586f
	Library/metadata/80/807077cf5e027434ea583b091520821c
	Library/metadata/84/8403d3349d112ba4d000be1be39e7c39
	Library/metadata/84/843bd9066a6c0418abea186399b7901a
	Library/metadata/85/85394e1a71ca64fa5b37bf34bdd57127
	Library/metadata/85/85c97102b862e42489742d71c52ab9bd
	Library/metadata/87/879e33cfcf5149942926b9140e2415aa
	Library/metadata/88/88fbae352204d8b46b9adec2a01bf62b
	Library/metadata/89/89fd6757bb689449dba6cd874fe0f067
	Library/metadata/8b/8be1c6b15752e4d4fa234a1ac402e2ec
	Library/metadata/8c/8c5d8b5a10ce04da6bd4b2b070d3efa8
	Library/metadata/8f/8f121cf0dc82d4fc78aeb80eb1f6b33e
	Library/metadata/90/90650bc864af043178522b1b3bff8229
	Library/metadata/91/9118239b43053aa4abae7336476b3d46
	Library/metadata/91/91e30ca9d6cce8c44affaa6f186c8060
	Library/metadata/92/92222e2084e69ad46978e554b3085847
	Library/metadata/92/9298dd7ec88903e47886fe0fa23f2860
	Library/metadata/92/92fd89d19843a4b5580b1f050fc3ea7c
	Library/metadata/93/93086f4acc00e964d80f712c083e1548
	Library/metadata/94/9485b0c79d11e2e4d0007da98d76c639
	Library/metadata/94/94861d69195721e4380cd10badf4c257
	Library/metadata/98/98c330f39d11745ad0004adb8d76c639
	Library/metadata/9d/9dccc8e8f0da4494991c26ef59019551
	Library/metadata/9e/9e1f8c28a04c43d4aa990f32e28a411c
	Library/metadata/9e/9e6367a8ec4b34edf9d688622b683c57
	Library/metadata/9f/9f5e69be417c02a4e8a24c1b4eb411cc
	Library/metadata/9f/9f95fac843a1b4bc2afd926a49b031e2
	Library/metadata/a2/a21fa8952fc154441b7478c2d12d3895
	Library/metadata/a2/a291371c993734443a6bfaa27d872a91
	Library/metadata/a3/a3e359d596a6987498f1f11be09d5609
	Library/metadata/a4/a467d2491ff32724ba9a2965e9edf548
	Library/metadata/a4/a4b1e2681ce5c41e485e4a51fb9c8abc
	Library/metadata/a5/a53cf5449d11a15d1100a04b44295342
	Library/metadata/a6/a6c98a18794054f82927a8b64e8dbd6f
	Library/metadata/a8/a891291b294ee40ffbae0f51df6f48da
	Library/metadata/aa/aab777056650a424fb0a1705972a7f75
	Library/metadata/aa/aad50dfea933440408e60ccd16926575
	Library/metadata/ac/ac85670a1b2274f22905d6a43940371a
	Library/metadata/af/af36d6f17bea9314ca781407b5eed7e1
	Library/metadata/af/afe53cba7abc30f45a8e4f209b6731fc
	Library/metadata/b1/b14b0e83e910d4d168c3875582280bbc
	Library/metadata/b1/b1a477ffd9d7eec4d93ba513b6e3bec0
	Library/metadata/b3/b37f1da4fea7c4b23adfcf51dfb7e2ee
	Library/metadata/b4/b4421849ad06e4b4284a9fce215ebb3a
	Library/metadata/b4/b44e7ccb2711c43dd9f7b79ac408ed44
	Library/metadata/b4/b469267ead97d0f43b9c0ff54767ff30
	Library/metadata/b4/b499f1575135c485fb4670bef4a24e6b
	Library/metadata/b7/b72691fe752add04ab27716be6f587c3
	Library/metadata/b7/b7d6b78099bed2848b27f1fca43a7098
	Library/metadata/ba/baaf49ae73549f445a40f1de0e3e2696
	Library/metadata/bc/bc000835a44d93e4ab0087689bc22aed
	Library/metadata/be/beecdc51f59754d84b62dea77fbb2ba7
	Library/metadata/c2/c2ef94ff9d11915d1100a04b44295342
	Library/metadata/c4/c4cde6a229f9e384881481aae46a8212
	Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	Library/metadata/c8/c8a7c4dea5859483d8ea9c74d5bafd8c
	Library/metadata/c8/c8e96a067d1ef4982b454cf5a686f648
	Library/metadata/cc/cc826e7ccd03898448e63aff3e5d7f4b
	Library/metadata/cd/cd048489737fee34d8e1e669282fb93d
	Library/metadata/ce/ce8d79c79d11b8f9d00076e98d76c639
	Library/metadata/d0/d07830da85707b4498075300cf513cde
	Library/metadata/d2/d2c9b1375898348c6a9340512550cfd1
	Library/metadata/d2/d2d204ed95ce00441970542257ea9d28
	Library/metadata/d3/d36a95cca63c14447ae8870058a12245
	Library/metadata/d6/d6c9f0f62a78c684ea7ab92810056167
	Library/metadata/d8/d8765f5bf5bd9462999e400bb4d9dc1d
	Library/metadata/d9/d960366646406d94e8edaac8e2953fe7
	Library/metadata/da/da80bd77605717b43a02f787c2ade4d3
	Library/metadata/dc/dc6901346dfb94e558a4ed1cd8fc90e3
	Library/metadata/dc/dc7abfa0435174ded902b073322d67cc
	Library/metadata/dd/dd5ebe1ed035b41ac9a6bc9e50b5f856
	Library/metadata/de/de1a747261eb17d41a28a4acfa3ba899
	Library/metadata/df/df06dafc8a58846808b2525d40bead92
	Library/metadata/e0/e07cc1fb2cbc24f4bb3bc2ef3408cc92
	Library/metadata/e3/e34e523a4633c4063a07af93860460f5
	Library/metadata/e5/e5f210d19adf73f4790e8ab536b563b7
	Library/metadata/ec/ec245bb0f88172d4fb5f01e8bb53c958
	Library/metadata/ec/ec9ab7461e0db42ab94e82f5db0fd745
	Library/metadata/ec/ecf0e68d71b25426cafbdd3c0b538eeb
	Library/metadata/ed/ed1008f2b481c47f38e0ef87a9f6d1fc
	Library/metadata/ee/eea7641cea4b1d740bba40615d9f9596
	Library/metadata/f1/f1451be7fc56abc4da66d32724fe208e
	Library/metadata/f3/f3222cace8c79411cb37336e2fd317af
	Library/metadata/f5/f5ac6b42d3232e4499cd0bf3b882a8f2
	Library/metadata/f6/f6b7e5baae6dccc4d9e0d4065a83b581
	Library/metadata/f8/f8a8d95d7779e544288a52a83713fc21
	Library/metadata/fa/fa65c7980a29642d0b59d2f322c604ef
	Library/metadata/fb/fbb5510e854b97444bd53b34640fa8e5
timers for minigames
Merge branch 'master' of https://github.com/s00tie/cooking

Conflicts:
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/metadata/04/040b7938bb5c24dbd8a426d6fb8c6f48
	Library/metadata/06/06e450212506e4505898021067da2380
	Library/metadata/0c/0cf00f5ff3e2d4e1c839a14d527dfde4
	Library/metadata/1a/1a403ea9a249c334cb5d246afee8871f
	Library/metadata/1b/1bd1800093b934d40b840aff21acc560
	Library/metadata/2b/2bad404cd815cfa4f8c9cf91235fa2fe
	Library/metadata/31/31552b1c0d52b6f408ec6ab482889532
	Library/metadata/32/32e511596130644909746ed350aaead6
	Library/metadata/39/3986d080d3d4e4c1597d7c25ce91bef0
	Library/metadata/43/43d80f088fa7b454089ed22aacfd5f0b
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/46/46eca1da5ce4a004ebe9e2c5b986d84c
	Library/metadata/56/560445ac7a7204e4d9ee84d4b7b09cbc
	Library/metadata/5d/5d07bb4ebd4ee419d8246d9f2f257e80
	Library/metadata/65/65f07609a45012d4fa3e7330a695a071
	Library/metadata/7b/7b9189305cbc2407780cc3b9b42a6c00
	Library/metadata/7d/7ded7bccb1de843038f8920b3a9daf12
	Library/metadata/84/843bd9066a6c0418abea186399b7901a
	Library/metadata/92/92fd89d19843a4b5580b1f050fc3ea7c
	Library/metadata/9d/9dbb42f1a748449cab3150d35c3d9a1a
	Library/metadata/9f/9f95fac843a1b4bc2afd926a49b031e2
	Library/metadata/a2/a291371c993734443a6bfaa27d872a91
	Library/metadata/a6/a6c98a18794054f82927a8b64e8dbd6f
	Library/metadata/b1/b14b0e83e910d4d168c3875582280bbc
	Library/metadata/b3/b37f1da4fea7c4b23adfcf51dfb7e2ee
	Library/metadata/b4/b4421849ad06e4b4284a9fce215ebb3a
	Library/metadata/b4/b44e7ccb2711c43dd9f7b79ac408ed44
	Library/metadata/b4/b469267ead97d0f43b9c0ff54767ff30
	Library/metadata/ba/baaf49ae73549f445a40f1de0e3e2696
	Library/metadata/d8/d8765f5bf5bd9462999e400bb4d9dc1d
	Library/metadata/d9/d960366646406d94e8edaac8e2953fe7
	Library/metadata/e0/e07cc1fb2cbc24f4bb3bc2ef3408cc92
	Library/metadata/ec/ec9ab7461e0db42ab94e82f5db0fd745
	Library/metadata/f1/f1451be7fc56abc4da66d32724fe208e
	Library/metadata/fa/fa65c7980a29642d0b59d2f322c604ef
FOR NEXT ITERATION
Merge branch 'master' of https://github.com/s00tie/cooking