Merge branch 'master' into dev

This commit is contained in:
MistEO
2022-03-21 11:28:27 +08:00
8 changed files with 14194 additions and 14906 deletions

View File

@@ -201,6 +201,7 @@ bool asst::InfrastConfiger::parse(const json::value& json)
}
group.optional.emplace_back(std::move(comb));
}
group.allow_external = group_json.get("allowExternal", false);
group_vec.emplace_back(std::move(group));
}
m_skills_groups.emplace(facility_name, std::move(group_vec));