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

2020-06-20 15:47:46 +02:00
parent 23b96b9db6 67875f9c6e
commit e7533b8724
21 changed files with 672 additions and 915 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