Merge branch 'main' into devtools

2024-05-12 20:07:55 +03:00
parent c63d350ad5 8054d4ba55
commit ee853aab4c
11 changed files with 114 additions and 19 deletions
@@ -266,7 +266,7 @@ void Engine::loadContent() {
    names = manager.assembly(names);
    contentPacks = manager.getAll(names);

-    std::vector<std::pair<std::string, fs::path>> resRoots;
+    std::vector<PathsRoot> resRoots;
    for (auto& pack : contentPacks) {
        resRoots.push_back({pack.id, pack.folder});