From 0e59cf799abf2b0c1b06a15dfc804c11a7e34242 Mon Sep 17 00:00:00 2001 From: Vanic Date: Fri, 3 Apr 2026 19:26:16 +0300 Subject: [PATCH] `CraftSystem`: change `table.merge` -> `table.join` --- .../CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua index da337cf..1c5ffbd 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua @@ -1,6 +1,6 @@ local extend = Class.extend -local tableInsert, tableSort, tableMerge = table.insert, table.sort, table.merge +local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require @@ -53,8 +53,7 @@ core.register_on_mods_loaded(function() if groupName ~= 'craft_group:UNDEFINED' then tableInsert(PrimitiveCraftHandler.groupedCrafts, crafts) else - -- TODO: поменять Merge на Join - PrimitiveCraftHandler.groupedCrafts = tableMerge(PrimitiveCraftHandler.groupedCrafts, crafts, false) + PrimitiveCraftHandler.groupedCrafts = tableJoin(PrimitiveCraftHandler.groupedCrafts, crafts, false) end end