FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Functional/Stratego.lua
#	Moose Development/Moose/Functional/Tiresias.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
This commit is contained in:
Applevangelist
2024-01-03 18:16:59 +01:00
parent 8910311c5c f57beab6d2
commit f8a3e7fc2e
26 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/EasyGCICAP.lua
View File

@@ -41,7 +41,7 @@
-- @field #number coalition
-- @field #string alias
-- @field #table wings
-- @field Ops.Intelligence#INTEL Intel
-- @field Ops.Intel#INTEL Intel
-- @field #number resurrection
-- @field #number capspeed
-- @field #number capalt