From b7dc1d45a270878929cd160fa232216d045566bb Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 28 Aug 2022 00:18:29 +0300 Subject: [PATCH] Revert "Fixed castle:straw warning "overwriting stair node" :rotating_light:" (#742) fixes #741 This reverts commit 44143db2450aa3df3ebb05ce4e9cae4aee32b2a9. --- mods/_various/castle/mod.conf | 2 +- mods/_various/castle/town_item.lua | 4 +++- mods/lord/_overwrites/MTG/farming/init.lua | 8 -------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mods/_various/castle/mod.conf b/mods/_various/castle/mod.conf index 5cac997d3..d74e2ceba 100644 --- a/mods/_various/castle/mod.conf +++ b/mods/_various/castle/mod.conf @@ -1,3 +1,3 @@ name = castle -depends = default, stairs, doors, lord_overwrites_mtg_farming, lottores, lottblocks, lottmapgen, lordlib +depends = default, stairs, doors, farming, lottores, lottblocks, lottmapgen, lordlib optional_depends = building_blocks, asphalt, streets, moreblocks diff --git a/mods/_various/castle/town_item.lua b/mods/_various/castle/town_item.lua index e2b352b49..e8063ab79 100644 --- a/mods/_various/castle/town_item.lua +++ b/mods/_various/castle/town_item.lua @@ -297,7 +297,9 @@ minetest.register_craft({ } }) -stairs.register_stair_and_slab("straw", "castle:straw", +stairs.register_stair_and_slab( + "straw", + "castle:straw", {choppy = 3, flammable = 1, oddly_breakable_by_hand = 3, grass = 1}, {"castle_straw.png"}, SL("Castle Straw Stair"), diff --git a/mods/lord/_overwrites/MTG/farming/init.lua b/mods/lord/_overwrites/MTG/farming/init.lua index f2a6f5b52..6e9988c06 100644 --- a/mods/lord/_overwrites/MTG/farming/init.lua +++ b/mods/lord/_overwrites/MTG/farming/init.lua @@ -89,11 +89,3 @@ minetest.clear_craft({output = "farming:hoe_mese"}) minetest.unregister_item("farming:hoe_mese") minetest.clear_craft({output = "farming:hoe_diamond"}) minetest.unregister_item("farming:hoe_diamond") - --- Удаляем farming:straw (вместо него castle:straw) -minetest.unregister_item("farming:straw") -minetest.unregister_item("stairs:stair_straw") -minetest.unregister_item("stairs:stair_inner_straw") -minetest.unregister_item("stairs:stair_outer_straw") -minetest.unregister_item("stairs:slab_straw") -minetest.register_alias("farming:straw", "castle:straw") -- на всякий случай