Merge branch 'main' into release-0.26

res/content/base/block_materials/snow.json

@@ -0,0 +1,5 @@
+{
+    "steps-sound": "steps/snow",
+    "place-sound": "blocks/snow_place",
+    "break-sound": "blocks/snow_break"
+}

res/scripts/stdlib.lua

@@ -194,8 +194,8 @@ function gui.template(name, params)
     text = text:gsub("if%s*=%s*'%%{%w+}'", "if=''")
     text = text:gsub("if%s*=%s*\"%%{%w+}\"", "if=\"\"")
     -- remove unsolved properties: attr='%{var}'
-    text = text:gsub("%w+%s*=%s*'%%{%w+}'%s?", "")
-    text = text:gsub("%w+%s*=%s*\"%%{%w+}\"%s?", "")
+    text = text:gsub("%s*%S+='%%{[^}]+}'%s*", " ")
+    text = text:gsub('%s*%S+="%%{[^}]+}"%s*', " ")
     return text
 end
 

src/logic/scripting/lua/libs/libcore.cpp

@@ -148,7 +148,13 @@ static int l_reconfig_packs(lua::State* L) {
         lua::pop(L);
     }
     auto engineController = engine->getController();
+    try {
         engineController->reconfigPacks(controller, addPacks, remPacks);
+    } catch (const contentpack_error& err) {
+        throw std::runtime_error(
+            std::string(err.what()) + " [" + err.getPackId() + " ]"
+        );
+    }
     return 0;
 }
 

src/logic/scripting/lua/libs/libpack.cpp

@@ -231,7 +231,13 @@ static int l_pack_assemble(lua::State* L) {
     }
     auto manager = engine->createPacksManager(worldFolder);
     manager.scan();
+    try {
         ids = std::move(manager.assemble(ids));
+    } catch (const contentpack_error& err) {
+        throw std::runtime_error(
+            std::string(err.what()) + " [" + err.getPackId() + "]"
+        );
+    }
 
     lua::createtable(L, ids.size(), 0);
     for (size_t i = 0; i < ids.size(); i++) {