balance
Bla
sd
particlar helena
comMerge remote-tracking branch 'origin/master' into Vulk

Conflicts:
	Assets/Resources/Objects/Trash/IceCream.prefab
	Assets/Resources/Objects/Trash/SpeedTrash.prefab
	Assets/Resources/Objects/Trash/StartTrashCatchFive.prefab
	Assets/Resources/Objects/Trash/StartTrashInLove.prefab
	Assets/Resources/Objects/Trash/StartTrashRain.prefab
	Assets/Resources/Objects/Trash/TruckTrash.prefab
	Assets/Resources/Scenes/Level2.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/16/1670af28a843cde488f9bf3b37dac4e6
	Library/metadata/37/373738b02dc0d044d8de6d0c5039a2d7
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/50/50e3b83fb0db77142833aa4f25792ef0
	Library/metadata/60/6097b7b77a5f2e74ab4f97996e09fdc5
	Library/metadata/ab/ab56dabcada17a946b3762d2b0ca04e3
	Library/metadata/ac/acbe615ff5d47fb47afe8b1564e94be2
	Library/metadata/b0/b07930c0ecd72af458f2093993ca6122
	Library/metadata/b7/b7a2e241dc00ecb4894ddc7bebd01af5
	Library/metadata/c3/c38690bdb9800d346a5f4ee21a1cfd76
	Library/metadata/d4/d4e034ca5c1bc9c4ebcb48b3fb02ddf3
	Library/metadata/f9/f99f10e1fcc9c9f41bcbcf3618914e93
	Temp/UnityTempFile-1c656086cf74b96429fca823d4b9ec29
	Temp/UnityTempFile-2b2bc1450a275624fb6b81d484d275bc
	Temp/UnityTempFile-cd74bfa3cb5611d419872a623559486f
	Temp/__EditModeScene
fix
none
Merge remote-tracking branch 'origin/master' into Vulk

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/16/1670af28a843cde488f9bf3b37dac4e6
	Library/metadata/64/645206e0e7e5fff43be5efbe7c84a79a
	Library/metadata/ab/ab56dabcada17a946b3762d2b0ca04e3
	Library/metadata/ac/acbe615ff5d47fb47afe8b1564e94be2
	Library/metadata/c3/c38690bdb9800d346a5f4ee21a1cfd76
	Library/metadata/f1/f1b0e437303b425438d9252ce69772de
	Library/metadata/fd/fdce001f9ddeefd4ab5fa33b3e88a4e0
	Trashmania.userprefs
fix
Menu
Map
shop
asd
Merge remote-tracking branch 'origin/master' into Helena

Conflicts:
	Assets/Resources/Font/KBPlanetEarth.ttf.meta
	Assets/Resources/Font/font_original.mat
	Assets/Resources/Objects/Trash/IceCream.prefab
	Assets/Resources/Objects/Trash/SpeedTrash.prefab
	Assets/Resources/Objects/Trash/StartTrashCatchFive.prefab
	Assets/Resources/Objects/Trash/StartTrashInLove.prefab
	Assets/Resources/Objects/Trash/StartTrashRain.prefab
	Assets/Resources/Objects/Trash/TruckTrash.prefab
	Assets/Resources/Particles/particle_destroybad_parts.prefab
	Assets/Resources/Particles/particle_destroygood_stars.prefab
	Assets/Resources/Particles/particle_destroyneutral_parts.prefab
	Assets/Resources/Particles/particle_heartexplosion.prefab
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/04/04f45b410b363d248a5b75aa2f88f4f4
	Library/metadata/06/06e913341cd9683479ca9aac0634e41b
	Library/metadata/16/1670af28a843cde488f9bf3b37dac4e6
	Library/metadata/18/1840e2116f6b5394cb22e2c5293739de
	Library/metadata/1b/1b37f7352695c874caabc9da240a46c1
	Library/metadata/29/297aedcf07e8a1c44b6171a4b175b99b
	Library/metadata/30/30e0ca3291756b0488f71e94fa13145e
	Library/metadata/32/32255a3bb30bc8342bccad17add08d51
	Library/metadata/37/373738b02dc0d044d8de6d0c5039a2d7
	Library/metadata/3f/3ff13e4f09822504ab1ac5e080167c92
	Library/metadata/4a/4a8d1280735d2bb4ab5d1639ad3bb0cd
	Library/metadata/4a/4ac816855bd74d945bb6a9f52948bc9a
	Library/metadata/4d/4d13c20df509f2345a70c66da4945858
	Library/metadata/4d/4de5544f955bfc64e84f7265f1913cb6
	Library/metadata/50/50e3b83fb0db77142833aa4f25792ef0
	Library/metadata/51/51d3fa643522f5b489cef217c9540e4b
	Library/metadata/58/58cf475124a33704dbc3361638b11e6f
	Library/metadata/5d/5d6daeed427ebc44d804728ae123577d
	Library/metadata/60/6038004d2d1ee164abaf407241667df3
	Library/metadata/60/6097b7b77a5f2e74ab4f97996e09fdc5
	Library/metadata/61/61c0390d6b5277e4f962a1e0e0dfa5ff
	Library/metadata/63/638f252822a00f849953d9debab040c0
	Library/metadata/6c/6c4cee7c146fd5d4887ac1173087f543
	Library/metadata/70/7058cf92ecb3cd5438cdb6eea8d77f83
	Library/metadata/7c/7c60847f0b84baa4aaa04c31faee5896
	Library/metadata/7d/7df2cac22df9b9c4286e43d447640e24~HEAD
	Library/metadata/81/810365afb43386547b07459cea9ae7c7
	Library/metadata/86/86a1efa952a2430498d4435c466ae073
	Library/metadata/92/92f97bdae8ea24844800e9476f0a6851
	Library/metadata/93/93a06c8357daed54d858a0aa056e5d7e
	Library/metadata/94/94013499430a7e544a4ba19cd76e656c
	Library/metadata/96/96141d6d6fc69034d96b59b3ddfc44e2
	Library/metadata/9f/9f31eaf5f0c10764d9102d7636952ed2
	Library/metadata/a3/a3b9b69a54788414c8636b3affcae409
	Library/metadata/a5/a520e64836cdffd4ba9591320a010310
	Library/metadata/ab/ab18edbc627786f4ead4d614e7c1073c
	Library/metadata/ab/ab56dabcada17a946b3762d2b0ca04e3
	Library/metadata/ac/acbe615ff5d47fb47afe8b1564e94be2
	Library/metadata/b0/b07930c0ecd72af458f2093993ca6122
	Library/metadata/b0/b0b13b0fa430d7a41b2dbb126aa0ab10
	Library/metadata/b7/b7a2e241dc00ecb4894ddc7bebd01af5
	Library/metadata/b7/b7eee9c897476fd408aaa9104b7566cb
	Library/metadata/b9/b991df98edc533a41ad3104655ec82e5
	Library/metadata/b9/b9e64abe948120145bf3d754a47743b0
	Library/metadata/c3/c391873b73581c84d9c2cf31622b2439
	Library/metadata/c8/c8de9f0f44c49d74f80e48e12c02e1ad
	Library/metadata/c8/c8e3caefd7045304ba61e15f0189eef9
	Library/metadata/ce/ce39fb71c1194ad49b941057ab172da9
	Library/metadata/d0/d052a435e8c0d274eab59d4545c63448
	Library/metadata/d1/d1f609b62ce4236438f28b6d6ad4addf
	Library/metadata/d4/d4e034ca5c1bc9c4ebcb48b3fb02ddf3
	Library/metadata/ef/efdf528df52a4d24a98d4866b4d41f9e
	Library/metadata/f4/f4e47a840df9d18488e5455345f6456b
	Library/metadata/f9/f99f10e1fcc9c9f41bcbcf3618914e93
	Temp/UnityTempFile-788123149b237e94ab28927c734aa19a
	Temp/UnityTempFile-96b2d1e3b287bec4e97411c798ae837a
	Temp/UnityTempFile-cf4748f4c43bfa14b9e6ea6bd765a04b
	Temp/UnityTempFile-fe72f20ffddd3ac458dad3b31d4dbe8f
	Temp/__EditModeScene
	Trashmania.userprefs