From: Ezhh <owlecho@live.com>
Date: Sat, 22 Jul 2017 14:11:40 +0000 (+0100)
Subject: Correct farming/stairs dependency (#1838)
X-Git-Tag: 5.0.0~207
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2f3c99cad9c9a5c090ab76e653fa6b90b08215c;p=oweals%2Fminetest_game.git

Correct farming/stairs dependency (#1838)
---

diff --git a/mods/farming/depends.txt b/mods/farming/depends.txt
index 470ec30b..301d9719 100644
--- a/mods/farming/depends.txt
+++ b/mods/farming/depends.txt
@@ -1,2 +1,3 @@
 default
 wool
+stairs
diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua
index c969d31b..1e746ecd 100644
--- a/mods/farming/nodes.lua
+++ b/mods/farming/nodes.lua
@@ -98,6 +98,16 @@ minetest.register_node("farming:straw", {
 	sounds = default.node_sound_leaves_defaults(),
 })
 
+stairs.register_stair_and_slab(
+	"straw",
+	"farming:straw",
+	{snappy = 3, flammable = 4},
+	{"farming_straw.png"},
+	"Straw Stair",
+	"Straw Slab",
+	default.node_sound_leaves_defaults()
+)
+
 minetest.register_abm({
 	label = "Farming soil",
 	nodenames = {"group:field"},
diff --git a/mods/stairs/depends.txt b/mods/stairs/depends.txt
index d77ba253..4ad96d51 100644
--- a/mods/stairs/depends.txt
+++ b/mods/stairs/depends.txt
@@ -1,2 +1 @@
 default
-farming
diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 782b24a9..6d1a6e0d 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -712,16 +712,6 @@ stairs.register_stair_and_slab(
 	default.node_sound_stone_defaults()
 )
 
-stairs.register_stair_and_slab(
-	"straw",
-	"farming:straw",
-	{snappy = 3, flammable = 4},
-	{"farming_straw.png"},
-	"Straw Stair",
-	"Straw Slab",
-	default.node_sound_leaves_defaults()
-)
-
 stairs.register_stair_and_slab(
 	"steelblock",
 	"default:steelblock",