Skip to content
Snippets Groups Projects
Commit 10cb794c authored by Peter Nerlich's avatar Peter Nerlich
Browse files

update patch for release-2.2.0

parent b7821c53
No related branches found
No related tags found
No related merge requests found
advtrains @ 6202c1cb
Subproject commit b616ae4425b26d0163e9d5f5cb98121fa103e003
Subproject commit 6202c1cb009d24342a8f59a5500178c41d746489
diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
--- advtrains/advtrains_luaautomation/chatcmds.lua 2021-10-12 19:04:17.221486017 +0200
+++ patched/chatcmds.lua 2021-10-12 22:43:01.077577672 +0200
+++ patched/chatcmds.lua 2021-10-20 23:46:54.111016528 +0200
@@ -4,6 +4,12 @@
--position helper.
--punching a node will result in that position being saved and inserted into a text field on the top of init form.
......@@ -100,7 +100,7 @@ diff -ruN advtrains/advtrains_luaautomation/chatcmds.lua patched/chatcmds.lua
end)
diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.lua
--- advtrains/advtrains_luaautomation/environment.lua 2021-10-12 19:04:17.221486017 +0200
+++ patched/environment.lua 2021-10-12 22:43:01.077577672 +0200
+++ patched/environment.lua 2021-10-20 23:46:54.111016528 +0200
@@ -1,6 +1,13 @@
-------------
-- lua sandboxed environment
......@@ -176,8 +176,8 @@ diff -ruN advtrains/advtrains_luaautomation/environment.lua patched/environment.
diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
--- advtrains/advtrains_luaautomation/init.lua 2021-10-12 19:04:17.221486017 +0200
+++ patched/init.lua 2021-10-12 22:43:01.077577672 +0200
--- advtrains/advtrains_luaautomation/init.lua 2021-10-20 23:44:07.351635846 +0200
+++ patched/init.lua 2021-10-20 23:49:32.240431167 +0200
@@ -12,7 +12,7 @@
--Privilege
--Only trusted players should be enabled to build stuff which can break the server.
......@@ -199,10 +199,10 @@ diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
end
dofile(mp.."/environment.lua")
dofile(mp.."/interrupt.lua")
@@ -97,6 +97,17 @@
@@ -99,6 +99,17 @@
return save_tbl
end
+local http = minetest.request_http_api()
+if http then
+ minetest.log("info", "advtrains_luaautomation_sync has http!")
......@@ -214,12 +214,12 @@ diff -ruN advtrains/advtrains_luaautomation/init.lua patched/init.lua
+end
+
+
--[[
-- globalstep for step code
local timer, step_int=0, 2
diff -ruN advtrains/advtrains_luaautomation/operation_panel.lua patched/operation_panel.lua
--- advtrains/advtrains_luaautomation/operation_panel.lua 2021-10-12 18:52:03.743798735 +0200
+++ patched/operation_panel.lua 2021-10-12 22:43:01.077577672 +0200
+++ patched/operation_panel.lua 2021-10-20 23:46:54.111016528 +0200
@@ -4,7 +4,7 @@
end
......@@ -231,7 +231,7 @@ diff -ruN advtrains/advtrains_luaautomation/operation_panel.lua patched/operatio
description = "LuaAutomation operation panel",
diff -ruN advtrains/advtrains_luaautomation/pcnaming.lua patched/pcnaming.lua
--- advtrains/advtrains_luaautomation/pcnaming.lua 2021-10-12 18:52:03.743798735 +0200
+++ patched/pcnaming.lua 2021-10-12 22:43:01.077577672 +0200
+++ patched/pcnaming.lua 2021-10-20 23:46:54.111016528 +0200
@@ -22,7 +22,7 @@
error("Invalid position supplied to " .. (func_name or "???")..": " .. dump(pos))
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment