Merge remote-tracking branch 'origin/feature/3d-settlement' into test/3d-together

# Conflicts:
#	Docs/Modules/Core.md
#	Docs/Modules/Population.md
#	Docs/Modules/README.md
#	Docs/Modules/Settlement.md

Assets/Scripts/Meta/Panels/TroopsPanel.cs

@@ -46,6 +46,13 @@ public class TroopsPanel : BasePanel
             ProfilePanel.KV(army, "Раненые", hurt.WoundedTotal.ToString("N0") + "  (лечатся " + healingNow + ", ждут места " + waiting + ")");
             ProfilePanel.KV(army, "Госпиталь", "мест " + hurt.HospitalBeds + next);
         }
+        if (hurt.MissingTotal > 0)
+        {
+            long windowEnd = 0;
+            foreach (var m in hurt.Missing) windowEnd = System.Math.Max(windowEnd, m.EndMs);
+            ProfilePanel.KV(army, "Пропали без вести", hurt.MissingTotal.ToString("N0") + "  (могут вернуться ещё " +
+                GameData.FormatTime(System.Math.Max(0, windowEnd - GameClock.UnixNowMs) / 1000.0) + ")");
+        }
         ProfilePanel.KV(army, "Сила войск", GP.TroopsPower.ToString("N0"));
         ProfilePanel.KV(army, "Сила армии с героем", GP.ArmyPower.ToString("N0"));
         UIKit.Button(army, "Отправить армию на карте мира", UIKit.Theme.Green, () => OpenPanel("World"), -1, 80, 26);