Merge branch 'main' into update-file-subsystem

src/content/PacksManager.cpp

@@ -2,6 +2,7 @@
 
 #include <queue>
 #include <sstream>
+#include <algorithm>
 
 #include "util/listutil.hpp"
 
@@ -124,7 +125,9 @@ std::vector<std::string> PacksManager::assemble(
     std::queue<const ContentPack*> queue;
     std::queue<const ContentPack*> queue2;
 
-    for (auto& name : names) {
+    std::sort(allNames.begin(), allNames.end());
+
+    for (auto& name : allNames) {
         auto found = packs.find(name);
         if (found == packs.end()) {
             throw contentpack_error(name, io::path(), "pack not found");