Merge remote-tracking branch 'upstream/master'

Merge branch 'm_disable_print_message' into 'master'
Log the "Pipeworks loaded!" message to infostream instead of printing it See merge request VanessaE/pipeworks!30
2020-10-18 02:13:58 +02:00 · 2020-10-17 18:55:24 +00:00 · 2020-10-17 18:55:01 +00:00 · 2020-10-17 20:50:20 +02:00 · 2020-10-17 20:46:44 +02:00
2 changed files with 4 additions and 5 deletions
--- a/common.lua
+++ b/common.lua
@ -86,10 +86,9 @@ function pipeworks.table_contains(tbl, element)
 end

 function pipeworks.table_extend(tbl, tbl2)
-	local index = #tbl + 1
-	for _, elt in ipairs(tbl2) do
-		tbl[index] = elt
-		index = index + 1
+	local oldlength = #tbl
+	for i = 1,#tbl2 do
+		tbl[oldlength + i] = tbl2[i]
 	end
 end

--- a/init.lua
+++ b/init.lua
@ -150,4 +150,4 @@ end

 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")

-print("Pipeworks loaded!")
+minetest.log("info", "Pipeworks loaded!")
Author	SHA1	Message	Date
sys4	946da11206	Merge remote-tracking branch 'upstream/master'	2020-10-18 02:13:58 +02:00
Vanessa Dannenberg	9a63d17e4a	Merge branch 'm_disable_print_message' into 'master' Log the "Pipeworks loaded!" message to infostream instead of printing it See merge request VanessaE/pipeworks!30	2020-10-17 18:55:24 +00:00
Vanessa Dannenberg	d814357ddf	Merge branch 'm_table_extends_clean' into 'master' Make pipeworks.table_extend easier to read See merge request VanessaE/pipeworks!29	2020-10-17 18:55:01 +00:00
HybridDog	c2fe5fe956	Make pipeworks.table_extend easier to read In my opinion this clarifies that tbl2 is attached at the end of tbl	2020-10-17 20:50:20 +02:00
HybridDog	9dbaa5f4f6	Log the "Pipeworks loaded!" message to infostream instead of printing it	2020-10-17 20:46:44 +02:00