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

# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
This commit is contained in:
Applevangelist 2023-10-12 18:04:21 +02:00
commit 8dc601bf48

View File

@ -6705,8 +6705,6 @@ function AUFTRAG.CheckMissionCapabilityAll(MissionTypes, Capabilities)
return res return res
end end
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------