From be0781340ae5521d4f17320b7ac9715c3f256061 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Fri, 28 Feb 2025 23:16:17 +0100 Subject: [PATCH] Rename `table.concat` to `table.concatTables` to resolve conflict --- cf-lib/changelog.txt | 5 +++++ cf-lib/info.json | 2 +- cf-lib/util/table.lua | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cf-lib/changelog.txt b/cf-lib/changelog.txt index 4b31875..b9642fa 100644 --- a/cf-lib/changelog.txt +++ b/cf-lib/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.9 +Date: 28.02.2025 + Bug Fixes: + - Rename `table.concat` to `table.concatTables` to resolve conflict +--------------------------------------------------------------------------------------------------- Version: 0.0.8 Date: 28.02.2025 Changes: diff --git a/cf-lib/info.json b/cf-lib/info.json index 0eb9de6..652f221 100644 --- a/cf-lib/info.json +++ b/cf-lib/info.json @@ -1,6 +1,6 @@ { "name": "cf-lib", - "version": "0.0.8", + "version": "0.0.9", "title": "cackling fiends library", "description": "Because I'd like to have my own library :-)", "author": "cackling fiend", diff --git a/cf-lib/util/table.lua b/cf-lib/util/table.lua index 0e8f32b..e44b559 100644 --- a/cf-lib/util/table.lua +++ b/cf-lib/util/table.lua @@ -74,7 +74,7 @@ end --- @param table1 table The first table --- @param table2 table The second table --- @return table The concatenated table -function table.concat(table1, table2) +function table.concatTables(table1, table2) local result = {} for _, v in pairs(table1) do table.insert(result, v)