Merge remote-tracking branch 'origin/master' into develop

Moose Development/Moose/Core/Menu.lua

@@ -2,7 +2,7 @@
 --
 -- ===
 --
--- ### Features:
+-- ## Features:
 --
 --   * Setup mission sub menus.
 --   * Setup mission command menus.
@@ -44,7 +44,11 @@
 --   * @{Core.Menu#MENU_GROUP_COMMAND}: Manages command menus for GROUPs.
 --
 -- ===
---- 
+--
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_Demos/tree/master/Core/Menu)
+--
+-- ===
+--
 -- ### Author: **FlightControl**
 -- ### Contributions:
 --

Moose Development/Moose/Functional/Mantis.lua

@@ -638,7 +638,7 @@ do
     
     -- TODO Version
     -- @field #string version
-    self.version="0.8.16"
+    self.version="0.8.17"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
 
     --- FSM Functions ---
@@ -1264,7 +1264,7 @@ do
     end
     local friendlyset -- Core.Set#SET_GROUP
     if self.checkforfriendlies == true then
-      friendlyset = SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterOnce()
+      friendlyset = SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterFunction(function(grp) if grp and grp:InAir() then return true else return false end end):FilterOnce()
     end
     for _,_coord in pairs (set) do
       local coord = _coord  -- get current coord to check

Moose Development/Moose/Utilities/Utils.lua

@@ -1951,6 +1951,8 @@ function UTILS.GMTToLocalTimeDifference()
     return -3  -- Fireland is UTC-3 hours.
   elseif theatre==DCSMAP.Sinai then
     return 2   -- Currently map is +2 but should be +3 (DCS bug?)
+  elseif theatre==DCSMAP.Kola then
+    return 3   -- Currently map is +2 but should be +3 (DCS bug?)     
   else
     BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre)))
     return 0