Merge pull request #469 from kreghek/master

Слияние исправлений
kreghek · Aug 16, 2019 · 989babe · 989babe
2 parents 3d661e3 + 91ecc1b
commit 989babe
Show file tree

Hide file tree

Showing 95 changed files with 1,888 additions and 75 deletions.
diff --git a/Zilon.Client/Assets/Resources/Icons/props/fire-opal-necklace.png b/Zilon.Client/Assets/Resources/Icons/props/fire-opal-necklace.png
diff --git a/Zilon.Client/Assets/Resources/Icons/props/fire-opal-necklace.png.meta b/Zilon.Client/Assets/Resources/Icons/props/fire-opal-necklace.png.meta
diff --git a/Zilon.Client/Assets/Resources/Icons/props/higea-ring.png b/Zilon.Client/Assets/Resources/Icons/props/higea-ring.png
diff --git a/Zilon.Client/Assets/Resources/Icons/props/higea-ring.png.meta b/Zilon.Client/Assets/Resources/Icons/props/higea-ring.png.meta
diff --git a/Zilon.Client/Assets/Resources/Icons/props/hunger-moderator.png b/Zilon.Client/Assets/Resources/Icons/props/hunger-moderator.png
diff --git a/Zilon.Client/Assets/Resources/Icons/props/hunger-moderator.png.meta b/Zilon.Client/Assets/Resources/Icons/props/hunger-moderator.png.meta
diff --git a/Zilon.Client/Assets/Resources/Icons/props/iron-ring.png b/Zilon.Client/Assets/Resources/Icons/props/iron-ring.png
diff --git a/Zilon.Client/Assets/Resources/Icons/props/iron-ring.png.meta b/Zilon.Client/Assets/Resources/Icons/props/iron-ring.png.meta
diff --git a/Zilon.Client/Assets/Resources/Icons/props/law-codex.png b/Zilon.Client/Assets/Resources/Icons/props/law-codex.png