diff options
| author | Jeija <norrepli@gmail.com> | 2012-12-21 16:22:25 +0100 |
|---|---|---|
| committer | Jeija <norrepli@gmail.com> | 2012-12-21 16:22:25 +0100 |
| commit | 23bebfc054008d2b6796e3f10d3bc67bee8b31ed (patch) | |
| tree | 72b8a71d75b16cf0a8b5d82758d3269beedf50d9 /mesecons | |
| parent | 9019a4aff7a59bf5d6b4bc1efa177ffd45f6d125 (diff) | |
| parent | 973a9c650f72ce694bd31dfbc5d6030751ff7c05 (diff) | |
| download | mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.gz mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.bz2 mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.xz mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.zip | |
Merge branch 'master' into nextgen
Conflicts:
mesecons/internal.lua
mesecons/wires.lua
mesecons_pistons/init.lua
Diffstat (limited to 'mesecons')
| -rw-r--r-- | mesecons/internal.lua | 1 | ||||
| -rw-r--r-- | mesecons/wires.lua | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mesecons/internal.lua b/mesecons/internal.lua index 96e407e..3f2ceb3 100644 --- a/mesecons/internal.lua +++ b/mesecons/internal.lua @@ -134,6 +134,7 @@ function mesecon:receptor_get_rules(node) return rules end end + return mesecon.rules.default end diff --git a/mesecons/wires.lua b/mesecons/wires.lua index 6c5f6ef..d753120 100644 --- a/mesecons/wires.lua +++ b/mesecons/wires.lua @@ -243,3 +243,9 @@ minetest.register_craft({ {'"default:mese"'}, } }) + +minetest.register_craft({ + type = "cooking", + output = '"mesecons:wire_00000000_off" 16', + recipe = "default:mese_crystal", +}) |