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

# Conflicts:
#	Moose Setup/Moose.files
This commit is contained in:
Applevangelist 2023-12-11 16:55:46 +01:00
commit 9eee7e8c9d

View File

@ -28,7 +28,10 @@ Core/Spot.lua
Core/MarkerOps_Base.lua Core/MarkerOps_Base.lua
Core/Astar.lua Core/Astar.lua
Core/Condition.lua Core/Condition.lua
Core/ClientMenu Core/Pathline.lua
Core/ClientMenu.lua
Core/Astar.lua
Core/MarkerOps_Base.lua
Wrapper/Object.lua Wrapper/Object.lua
Wrapper/Identifiable.lua Wrapper/Identifiable.lua
@ -67,6 +70,7 @@ Functional/Shorad.lua
Functional/Autolase.lua Functional/Autolase.lua
Functional/AICSAR.lua Functional/AICSAR.lua
Functional/AmmoTruck.lua Functional/AmmoTruck.lua
Functional/ZoneGoalCargo.lua
Ops/Airboss.lua Ops/Airboss.lua
Ops/RecoveryTanker.lua Ops/RecoveryTanker.lua
@ -95,6 +99,10 @@ Ops/FlightControl.lua
Ops/PlayerTask.lua Ops/PlayerTask.lua
Ops/PlayerRecce.lua Ops/PlayerRecce.lua
Ops/EasyGCICAP.lua Ops/EasyGCICAP.lua
Ops/OpsZone.lua
Ops/ArmyGroup.lua
Ops/OpsTransport.lua
Ops/Target.lua
Sound/UserSound.lua Sound/UserSound.lua
Sound/SoundOutput.lua Sound/SoundOutput.lua