merge no-moreblocks recipes back into crafts.lua

as these are now the preferred recipes.

homedecor/crafts.lua

@@ -53,6 +53,11 @@ minetest.register_craftitem("homedecor:motor", {
 	inventory_image = "homedecor_motor.png",
 })
 
+minetest.register_craftitem("homedecor:power_crystal", {
+	description = S("Power Crystal"),
+	inventory_image = "homedecor_power_crystal.png",
+})
+
 -- alternate craftitem for silicon if mesecons isn't installed.
 
 if ( minetest.get_modpath("mesecons") ) == nil then
@@ -90,6 +95,21 @@ minetest.register_craft( {
     },
 })
 
+minetest.register_craft({
+	--type = "shapeless",
+	output = "homedecor:power_crystal 2",
+	recipe = {
+		{ "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" },
+		{ "default:diamond", "default:gold_ingot", "default:diamond" }
+	},
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:power_crystal",
+	burntime = 50,
+})
+
 minetest.register_craft( {
 	type = "shapeless",
         output = "homedecor:terracotta_base 8",
@@ -101,8 +121,6 @@ minetest.register_craft( {
 	replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, },
 })
 
-
-
 minetest.register_craft({
         type = "cooking",
         output = "homedecor:roof_tile_terracotta",
@@ -734,6 +752,15 @@ minetest.register_craft( {
 	},
 })
 
+minetest.register_craft( {
+	output = "homedecor:television",
+	recipe = {
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" },
+		{ "homedecor:ic", "homedecor:power_crystal", "homedecor:ic" },
+	},
+})
+
 minetest.register_craft( {
 	output = "homedecor:stereo",
 	recipe = {
@@ -941,6 +968,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "homedecor:oven_steel",
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
+		{"default:steel_ingot", "default:glass", "default:steel_ingot", },
+		{"default:steel_ingot", "default:copper_ingot", "default:steel_ingot", },
+	}
+})
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "homedecor:oven",
@@ -960,6 +996,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+        output = "homedecor:microwave_oven 2",
+        recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
+		{"default:steel_ingot", "default:glass", "homedecor:ic", },
+		{"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", },
+	}
+})
+
 minetest.register_craft({
 	output = "homedecor:refrigerator_steel",
 	recipe = {
@@ -1049,8 +1094,15 @@ minetest.register_craft({
 -- yellow
 
 minetest.register_craft({
-        output = "homedecor:glowlight_half_yellow 6",
+	output = "homedecor:glowlight_half_yellow 6",
-        recipe = {
+	recipe = {
+		{"default:glass", "homedecor:power_crystal", "default:glass", },
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:glowlight_half_yellow 6",
+	recipe = {
 		{"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", },
 	}
 })
@@ -1062,6 +1114,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "homedecor:glowlight_small_cube_yellow 16",
+	recipe = {
+		{"default:glass" },
+		{"homedecor:power_crystal" },
+	}
+})
+
 minetest.register_craft({
         output = "homedecor:glowlight_small_cube_yellow 16",
         recipe = {
@@ -1087,6 +1147,14 @@ minetest.register_craft({
 
 -- white
 
+minetest.register_craft({
+	output = "homedecor:glowlight_half_white 6",
+	recipe = {
+		{ "dye:white", "dye:white", "dye:white" },
+		{ "default:glass", "homedecor:power_crystal", "default:glass", },
+	}
+})
+
 minetest.register_craft({
         output = "homedecor:glowlight_half_white 6",
         recipe = {
@@ -1112,6 +1180,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "homedecor:glowlight_small_cube_white 8",
+	recipe = {
+		{ "dye:white" },
+		{ "default:glass" },
+		{ "homedecor:power_crystal" },
+	}
+})
+
 minetest.register_craft({
         output = "homedecor:glowlight_small_cube_white 8",
         recipe = {

homedecor/crafts_nomoreblocks.lua

@@ -1,98 +0,0 @@
--- ================ Alternaitve crafts that do not require the moreblocks mod
-
--- Crafting for homedecor mod (includes folding) by Vanessa Ezekowitz
--- 2012-06-12
---
--- Mostly my own code; overall template borrowed from game default
---
--- License: GPL
---
-
--- Zeno-, 2014-05-10, Modifications to remove moreblocks deps
--- VanessaE, 2014-06-18, rewritten slightly, some recipes changes, incorporated upstream.
-
-local S = homedecor.gettext
-
--- ================ Additional crafts for replacing moreblocks requirements (Zeno)
-
-minetest.register_craftitem("homedecor:power_crystal", {
-	description = S("Power Crystal"),
-	inventory_image = "homedecor_power_crystal.png",
-})
-
-minetest.register_craft({
-	--type = "shapeless",
-	output = "homedecor:power_crystal 2",
-	recipe = {
-		{ "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" },
-		{ "default:diamond", "default:gold_ingot", "default:diamond" }
-	},
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:power_crystal",
-	burntime = 50,
-})
-
--- ================ Alternative crafts
-
-minetest.register_craft( {
-	output = "homedecor:television",
-	recipe = {
-		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-		{ "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" },
-		{ "homedecor:ic", "homedecor:power_crystal", "homedecor:ic" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:oven",
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
-		{"default:steel_ingot", "default:glass", "default:steel_ingot", },
-		{"default:steel_ingot", "default:copper_ingot", "default:steel_ingot", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:microwave_oven 2",
-        recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
-		{"default:steel_ingot", "default:glass", "homedecor:ic", },
-		{"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", },
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:glowlight_half_yellow 6",
-	recipe = {
-		{"default:glass", "homedecor:power_crystal", "default:glass", },
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:glowlight_small_cube_yellow 16",
-	recipe = {
-		{"default:glass" },
-		{"homedecor:power_crystal" },
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:glowlight_half_white 6",
-	recipe = {
-		{ "dye:white", "dye:white", "dye:white" },
-		{ "default:glass", "homedecor:power_crystal", "default:glass", },
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:glowlight_small_cube_white 8",
-	recipe = {
-		{ "dye:white" },
-		{ "default:glass" },
-		{ "homedecor:power_crystal" },
-	}
-})
-

homedecor/init.lua

@@ -94,7 +94,6 @@ dofile(homedecor.modpath.."/paintings.lua")
 dofile(homedecor.modpath.."/window_treatments.lua")
 
 dofile(homedecor.modpath.."/crafts.lua")
-dofile(homedecor.modpath.."/crafts_nomoreblocks.lua")
 
 dofile(homedecor.modpath.."/furniture.lua")
 dofile(homedecor.modpath.."/furniture_medieval.lua")