Merge remote-tracking branch 'upstream/master' into dev

2025-06-30 15:30:28 +02:00 · 2020-08-08 10:14:25 +02:00
parent 23b96b9db6 4d7508ae70
commit 6d278538a9
54 changed files with 671 additions and 914 deletions
--- a/moremesecons_luacontroller_tool/depends.txt
+++ b/moremesecons_luacontroller_tool/depends.txt
@ -1,2 +1,3 @@
 mesecons
+mesecons_luacontroller
 moremesecons_utils
--- a/moremesecons_luacontroller_tool/init.lua
+++ b/moremesecons_luacontroller_tool/init.lua
@ -1,7 +1,3 @@
--[[
-vector_extras there: https://github.com/HybridDog/vector_extras
-]]
-
 local templates = {MoreMesecons = {
 	logic = [[-- AND
 port.a = pin.b and pin.c
--- a/moremesecons_luacontroller_tool/textures/moremesecons_luacontroller_tool.png
+++ b/moremesecons_luacontroller_tool/textures/moremesecons_luacontroller_tool.png