dddushesss 2c2fae3b58 Merge remote-tracking branch 'origin/Alexei' into Alexei
# Conflicts:
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Assets/Resources/Data/ItemData.asset
#	Assets/Scripts/Items/Bonus.cs.meta
#	Assets/Scripts/Items/Building.cs.meta
2022-01-13 22:59:27 +03:00
..
2021-12-15 16:29:44 +03:00
2022-01-13 22:58:54 +03:00
2022-01-03 00:41:09 +03:00
2021-12-17 17:15:18 +03:00
2022-01-13 22:58:54 +03:00
2022-01-13 22:58:54 +03:00
2022-01-13 22:58:54 +03:00
2021-12-17 17:15:18 +03:00
2022-01-13 22:58:54 +03:00
2022-01-13 22:58:54 +03:00
2022-01-13 22:58:54 +03:00
2022-01-13 22:58:54 +03:00
2021-12-21 21:23:10 +03:00