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 branch 'develop-2' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Modules_local.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Wrapper/Group.lua
This commit is contained in:
Applevangelist 2023-09-09 12:29:26 +02:00
commit 0a812d8283
3 changed files with 1 additions and 2360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Modules.lua
View File

@ -1,7 +1,6 @@
__Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' )
__Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' )
__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' )
__Moose.Include( 'Scripts/Moose/Utilities/Routines.lua' )
__Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' )
__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' )
--__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' ) --__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' )

2358
Moose Development/Moose/Utilities/Routines.lua
View File

File diff suppressed because it is too large Load Diff

2
Moose Development/Moose/Wrapper/Group.lua
View File

@ -37,7 +37,7 @@
-- @module Wrapper.Group -- @module Wrapper.Group
-- @image Wrapper_Group.JPG -- @image Wrapper_Group.JPG
---
-- @type GROUP -- @type GROUP
-- @extends Wrapper.Controllable#CONTROLLABLE -- @extends Wrapper.Controllable#CONTROLLABLE
-- @field #string GroupName The name of the group. -- @field #string GroupName The name of the group.