Merge branch 'main' into devtools

This commit is contained in:
MihailRis 2024-05-12 20:07:55 +03:00
commit ee853aab4c
11 changed files with 114 additions and 19 deletions

View file

@ -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});