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

# 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
26 changed files with 81 additions and 79 deletions

View File

@@ -82,10 +82,12 @@ __Moose.Include( 'Scripts/Moose/Functional/Sead.lua' )
__Moose.Include( 'Scripts/Moose/Functional/Shorad.lua' )
__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' )
__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' )
--__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
--__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
--__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' )
--__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )
__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' )
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )
__Moose.Include( 'Scripts/Moose/Functional/Tiresias.lua' )
__Moose.Include( 'Scripts/Moose/Functional/Stratego.lua' )
__Moose.Include( 'Scripts/Moose/Ops/Airboss.lua' )
__Moose.Include( 'Scripts/Moose/Ops/AirWing.lua' )