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/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
This commit is contained in:
Applevangelist 2023-12-31 14:58:53 +01:00
commit 2d26c11ad7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Cargo/CargoGroup.lua
View File

@ -296,7 +296,7 @@ do -- CARGO_GROUP
if Destroyed then
self:Destroyed()
self:E( { "Cargo group destroyed" } )
self:T( { "Cargo group destroyed" } )
end
end

2
Moose Development/Moose/Cargo/CargoUnit.lua
View File

@ -348,7 +348,7 @@ do -- CARGO_UNIT
self.CargoObject:SetCommand( self.CargoObject:CommandStopRoute( true ) )
end
else
self:E("Something is wrong")
self:T("Something is wrong")
end
end

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

@ -3015,4 +3015,4 @@ function GROUP:IsAAA()
end
end
return issam
end
end