Merge branch 'master' into port-field

2020-09-12 23:25:36 +03:00
parent 484f50d630 e5ff429241
commit 700ccf4d0a
393 changed files with 16934 additions and 14818 deletions
--- a/core/assets-raw/sprites/blocks/environment/ignarock1.png
+++ b/core/assets-raw/sprites/blocks/environment/ignarock1.png
--- a/core/assets-raw/sprites/blocks/environment/ignarock2.png
+++ b/core/assets-raw/sprites/blocks/environment/ignarock2.png
--- a/core/assets-raw/sprites/blocks/environment/ignarock3.png
+++ b/core/assets-raw/sprites/blocks/environment/ignarock3.png
--- a/core/assets-raw/sprites/blocks/environment/dacite-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/dacite-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/dacite-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/dacite1.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite1.png
--- a/core/assets-raw/sprites/blocks/environment/dacite2.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite2.png
--- a/core/assets-raw/sprites/blocks/environment/dacite3.png
+++ b/core/assets-raw/sprites/blocks/environment/dacite3.png
--- a/core/assets-raw/sprites/blocks/environment/dirt-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/dirt-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/dirt-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/dirt1.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt1.png
--- a/core/assets-raw/sprites/blocks/environment/dirt2.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt2.png
--- a/core/assets-raw/sprites/blocks/environment/dirt3.png
+++ b/core/assets-raw/sprites/blocks/environment/dirt3.png
--- a/core/assets-raw/sprites/blocks/environment/dune-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/dune-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/dune-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/dune-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/dune-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/dune-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/holostone1.png
+++ b/core/assets-raw/sprites/blocks/environment/holostone1.png
--- a/core/assets-raw/sprites/blocks/environment/holostone2.png
+++ b/core/assets-raw/sprites/blocks/environment/holostone2.png
--- a/core/assets-raw/sprites/blocks/environment/holostone3.png
+++ b/core/assets-raw/sprites/blocks/environment/holostone3.png
--- a/core/assets-raw/sprites/blocks/environment/ice-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/ice-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/ice-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/ice-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/ice-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/ice-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/salt-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/salt-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/salt-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/salt-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/salt-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/salt-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/sand-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/sand-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/sand-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/sand-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/sand-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/sand-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/shale-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/shale-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/shale-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/shale-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/shale-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/shale-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/snow-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/snow-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/snow-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/snow-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/snow-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/snow-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/spore-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/spore-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/spore-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/spore-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/spore-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/spore-wall2.png
--- a/core/assets-raw/sprites/blocks/environment/stone-wall-large.png
+++ b/core/assets-raw/sprites/blocks/environment/stone-wall-large.png
--- a/core/assets-raw/sprites/blocks/environment/stone-wall1.png
+++ b/core/assets-raw/sprites/blocks/environment/stone-wall1.png
--- a/core/assets-raw/sprites/blocks/environment/stone-wall2.png
+++ b/core/assets-raw/sprites/blocks/environment/stone-wall2.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator-cap.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator-cap.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator-turbine0.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator-turbine1.png
--- a/core/assets-raw/sprites/blocks/power/turbine-generator.png
+++ b/core/assets-raw/sprites/blocks/power/turbine-generator.png
--- a/core/assets-raw/sprites/blocks/props/boulder1.png
+++ b/core/assets-raw/sprites/blocks/props/boulder1.png
--- a/core/assets-raw/sprites/blocks/props/boulder2.png
+++ b/core/assets-raw/sprites/blocks/props/boulder2.png
--- a/core/assets-raw/sprites/blocks/props/dacite-boulder1.png
+++ b/core/assets-raw/sprites/blocks/props/dacite-boulder1.png
--- a/core/assets-raw/sprites/blocks/props/dacite-boulder2.png
+++ b/core/assets-raw/sprites/blocks/props/dacite-boulder2.png
--- a/core/assets-raw/sprites/blocks/props/snow-boulder1.png
+++ b/core/assets-raw/sprites/blocks/props/snow-boulder1.png
--- a/core/assets-raw/sprites/blocks/props/snow-boulder2.png
+++ b/core/assets-raw/sprites/blocks/props/snow-boulder2.png
--- a/core/assets-raw/sprites/blocks/units/command-center.png
+++ b/core/assets-raw/sprites/blocks/units/command-center.png
--- a/core/assets-raw/sprites/units/bryde.png
+++ b/core/assets-raw/sprites/units/bryde.png
--- a/core/assets-raw/sprites/units/chaos-array-cell.png
+++ b/core/assets-raw/sprites/units/chaos-array-cell.png
--- a/core/assets-raw/sprites/units/chaos-array.png
+++ b/core/assets-raw/sprites/units/chaos-array.png
--- a/core/assets-raw/sprites/units/eradicator-base.png
+++ b/core/assets-raw/sprites/units/eradicator-base.png
--- a/core/assets-raw/sprites/units/eradicator-cell.png
+++ b/core/assets-raw/sprites/units/eradicator-cell.png
--- a/core/assets-raw/sprites/units/eradicator-leg.png
+++ b/core/assets-raw/sprites/units/eradicator-leg.png
--- a/core/assets-raw/sprites/units/eradicator.png
+++ b/core/assets-raw/sprites/units/eradicator.png
--- a/core/assets-raw/sprites/units/reign-base.png
+++ b/core/assets-raw/sprites/units/reign-base.png
--- a/core/assets-raw/sprites/units/reign-cell.png
+++ b/core/assets-raw/sprites/units/reign-cell.png
--- a/core/assets-raw/sprites/units/reign-leg.png
+++ b/core/assets-raw/sprites/units/reign-leg.png
--- a/core/assets-raw/sprites/units/reign.png
+++ b/core/assets-raw/sprites/units/reign.png
--- a/core/assets-raw/sprites/units/chaos-array-base.png
+++ b/core/assets-raw/sprites/units/chaos-array-base.png
--- a/core/assets-raw/sprites/units/scepter-cell.png
+++ b/core/assets-raw/sprites/units/scepter-cell.png
--- a/core/assets-raw/sprites/units/chaos-array-leg.png
+++ b/core/assets-raw/sprites/units/chaos-array-leg.png
--- a/core/assets-raw/sprites/units/scepter.png
+++ b/core/assets-raw/sprites/units/scepter.png
--- a/core/assets-raw/sprites/units/toxopid-cannon.png
+++ b/core/assets-raw/sprites/units/toxopid-cannon.png
--- a/core/assets-raw/sprites/units/toxopid-cell.png
+++ b/core/assets-raw/sprites/units/toxopid-cell.png
--- a/core/assets-raw/sprites/units/toxopid-foot.png
+++ b/core/assets-raw/sprites/units/toxopid-foot.png
--- a/core/assets-raw/sprites/units/toxopid-joint-base.png
+++ b/core/assets-raw/sprites/units/toxopid-joint-base.png
--- a/core/assets-raw/sprites/units/toxopid-leg-base.png
+++ b/core/assets-raw/sprites/units/toxopid-leg-base.png
--- a/core/assets-raw/sprites/units/toxopid-leg.png
+++ b/core/assets-raw/sprites/units/toxopid-leg.png
--- a/core/assets-raw/sprites/units/toxopid.png
+++ b/core/assets-raw/sprites/units/toxopid.png
--- a/core/assets-raw/sprites/units/weapons/chaos.png
+++ b/core/assets-raw/sprites/units/weapons/chaos.png
--- a/core/assets-raw/sprites/units/weapons/eradication.png
+++ b/core/assets-raw/sprites/units/weapons/eradication.png
--- a/core/assets-raw/sprites/units/weapons/reign-weapon.png
+++ b/core/assets-raw/sprites/units/weapons/reign-weapon.png
--- a/core/assets-raw/sprites/units/weapons/scepter-weapon.png
+++ b/core/assets-raw/sprites/units/weapons/scepter-weapon.png
--- a/core/assets/baseparts/1591385575600.msch
+++ b/core/assets/baseparts/1591385575600.msch
--- a/core/assets/baseparts/1599594352859.msch
+++ b/core/assets/baseparts/1599594352859.msch
--- a/core/assets/baseparts/4125616123544.msch
+++ b/core/assets/baseparts/4125616123544.msch
--- a/core/assets/baseparts/752911659508695080.msch
+++ b/core/assets/baseparts/752911659508695080.msch
@@ -0,0 +1,2 @@
+mschxœE’}r›@Åµ|Ã.0ÉôÜ%ôÄÞºLlp×<70>4éiz47Cß[eÚa˜Z==ieËé<>dóxñò°N>|ý¼ZÞð5†NúÃ2ž‡ƒŸ×0}ÛN^Úóôc›ŽÃmÙÂ!Ö¬ã<m—á°Ì¯þ}	bÃ²Žá}¸n—ë?yX¶Õi¯Ûùæ©=nÓ*ö3‹i®ì:ÌËÑKÿ¦ãÉÿ7íßFÔþçÆÃÊ.·å<†á:ÎþŒ`P¯4ÀH[xžf?œüìÃHqñÙ^dÄ+•ty&‰IÄH#VáDRIðò'9P#DeBIr	àhšJ+&E‰0—!–¥˜‘Ò}<7D>¦Éþgÿ@e&®Zj{˜<ºFdŠ\Q+…U81Ð2*tÀ‚’
+på¾ï¿ðþž¶L–ô.<2E>¼ªb_#é~ß?ðÜ1ZiÃýY¢²’×Ë00FË…Þi
--- a/core/assets/baseparts/752912199781056583.msch
+++ b/core/assets/baseparts/752912199781056583.msch
--- a/core/assets/baseparts/752912460620496957.msch
+++ b/core/assets/baseparts/752912460620496957.msch
--- a/core/assets/baseparts/752915237476368385.msch
+++ b/core/assets/baseparts/752915237476368385.msch
--- a/core/assets/baseparts/752915746673131550.msch
+++ b/core/assets/baseparts/752915746673131550.msch
--- a/core/assets/baseparts/752918895291007041.msch
+++ b/core/assets/baseparts/752918895291007041.msch
--- a/core/assets/baseparts/752918896331456582.msch
+++ b/core/assets/baseparts/752918896331456582.msch
--- a/core/assets/baseparts/752919619894902997.msch
+++ b/core/assets/baseparts/752919619894902997.msch
--- a/core/assets/baseparts/752921320802746461.msch
+++ b/core/assets/baseparts/752921320802746461.msch
--- a/core/assets/baseparts/752923816967012442.msch
+++ b/core/assets/baseparts/752923816967012442.msch
@@ -0,0 +1 @@
+mschxś5Í[ŽĂ ĐkôĄiŐ5ô;‹B4EĘK„Tęî{]k>ĐÁćÚŕG<>źÓ”qJµ•qĚőáź©Ś¸·ŇŇ\ö©–ů•ßKĹőŻ¦őYZî×š·
--- a/core/assets/baseparts/752926963076694047.msch
+++ b/core/assets/baseparts/752926963076694047.msch
--- a/core/assets/baseparts/752927009641857205.msch
+++ b/core/assets/baseparts/752927009641857205.msch
--- a/core/assets/baseparts/752930133874049034.msch
+++ b/core/assets/baseparts/752930133874049034.msch
--- a/core/assets/baseparts/752930845685448825.msch
+++ b/core/assets/baseparts/752930845685448825.msch
@@ -0,0 +1,4 @@
+mschxś-ÎMnÄ `ţŇÉbÔt5»ŠI\‰$# jŹ?~q<>˘đ32Mt3äö´1}ţpĺž—TľVţć˝q¤Ř–Ô;W
+ő8á´ćÖk~žý¨tí|nIzćµćRčţ›$4ó_ŻiAbjGIu~ĄťMąó6·ă¬ŃC~dÉ€ąÎ‚SFĚ0Ŕ’A‰<41>X4 2<C2A0>“2úp
+˛FD<"FĐçĺÚ8ÁéeŔÓ^łH^
+AG
--- a/core/assets/baseparts/752932257538506823.msch
+++ b/core/assets/baseparts/752932257538506823.msch
--- a/core/assets/baseparts/752937073991745554.msch
+++ b/core/assets/baseparts/752937073991745554.msch
@@ -0,0 +1 @@
+mschxœ-ÍkÂ à)[‹¶úËSôPHI$¡mB©‰·w×5°ùL´¸70«_"ú=øZc™¼·èÂ¶¾ãg+¸-1¼üš‚ÏÓ\RÎhÿA¸9íµ¤çQ)çR<C3A7>Ë´oG	ÀƒÐ#´¢ƒ¢EÐåïÄ£$¢8¢¡åAÃÐÐ¶ÂIh…N8½à„‹p®5\ÄÆrƒ¡;K½êø¥%
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`mschxś5Í[ŽĂ ĐkôĄiŐ5ô;‹B4EĘK„Tęî{]k>ĐÁćÚŕG<>źÓ”qJµ•qĚőáź©Ś¸·ŇŇ\ö©–ů•ßKĹőŻ¦őYZî×š·`
				`@@ -0,0 +1 @@`
				`mschxœ-ÍkÂ à)[‹¶úËSôPHI$¡mB©‰·w×5°ùL´¸70«_"ú=øZc™¼·èÂ¶¾ãg+¸-1¼üš‚ÏÓ\RÎhÿA¸9íµ¤çQ)çR<C3A7>Ë´oG ÀƒÐ#´¢ƒ¢EÐåïÄ£$¢8¢¡åAÃÐÐ¶ÂIh…N8½à„‹p®5\ÄÆrƒ¡;K½êø¥%`