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/Utilities/Utils.lua
This commit is contained in:
Applevangelist 2023-11-25 18:31:18 +01:00
commit 57b55246a6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Moose Development/Moose/Utilities/Utils.lua
View File

@ -3328,7 +3328,7 @@ function UTILS.GetZoneProperties(zone_name)
for _, property in pairs(zone["properties"]) do for _, property in pairs(zone["properties"]) do
return_table[property["key"]] = property["value"] return_table[property["key"]] = property["value"]
end end
return return_table return return_table
else else
BASE:I(string.format("%s doesn't have any properties", zone_name)) BASE:I(string.format("%s doesn't have any properties", zone_name))
return {} return {}
@ -3629,4 +3629,3 @@ end
function UTILS.OctalToDecimal(Number) function UTILS.OctalToDecimal(Number)
return tonumber(Number,8) return tonumber(Number,8)
end end