From 147a983956037a7210624ebbfbd2bdf564605509 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 1 Feb 2017 18:51:26 +0100
Subject: [PATCH] Add flower pot craft, rename brick stuff

---
 mods/craftingpack/crafting/creative.lua | 2 +-
 mods/mcl_core/crafting.lua              | 8 ++++----
 mods/mcl_core/craftitems.lua            | 2 +-
 mods/mcl_core/nodes.lua                 | 5 +++--
 mods/mcl_flowers/init.lua               | 8 ++++++++
 mods/mcstair/init.lua                   | 2 +-
 mods/stairs/init.lua                    | 8 +++++---
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/mods/craftingpack/crafting/creative.lua b/mods/craftingpack/crafting/creative.lua
index f6b6dbfd5a..d69d894e7a 100644
--- a/mods/craftingpack/crafting/creative.lua
+++ b/mods/craftingpack/crafting/creative.lua
@@ -75,7 +75,7 @@ local function set_inv(filter, player)
 	table.sort(creative_list)
 	inv:set_size("main", #creative_list)
 	for _,itemstring in ipairs(creative_list) do
-		inv:add_item("main", ItemStack(itemstring))
+		inv:add_item("main", ItemStack(itemstring .. " " .. minetest.registered_items[itemstring].stack_max))
 	end
 	crafting.creative_inventory_size = #creative_list
 end
diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua
index 1af8db6232..f6119118d5 100644
--- a/mods/mcl_core/crafting.lua
+++ b/mods/mcl_core/crafting.lua
@@ -577,10 +577,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'mcl_core:brick',
+	output = 'mcl_core:brick_block',
 	recipe = {
-		{'mcl_core:clay_brick', 'mcl_core:clay_brick'},
-		{'mcl_core:clay_brick', 'mcl_core:clay_brick'},
+		{'mcl_core:brick', 'mcl_core:brick'},
+		{'mcl_core:brick', 'mcl_core:brick'},
 	}
 })
 
@@ -817,7 +817,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "cooking",
-	output = "mcl_core:clay_brick",
+	output = "mcl_core:brick",
 	recipe = "mcl_core:clay_lump",
 	cooktime = 10,
 })
diff --git a/mods/mcl_core/craftitems.lua b/mods/mcl_core/craftitems.lua
index c78a353f00..f57cf93fc2 100644
--- a/mods/mcl_core/craftitems.lua
+++ b/mods/mcl_core/craftitems.lua
@@ -90,7 +90,7 @@ minetest.register_craftitem("mcl_core:emerald", {
 	groups = { craftitem=1 },
 })
 
-minetest.register_craftitem("mcl_core:clay_brick", {
+minetest.register_craftitem("mcl_core:brick", {
 	description = "Brick",
 	inventory_image = "default_clay_brick.png",
 	stack_max = 64,
diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua
index 0b5d8a170b..aefe475033 100644
--- a/mods/mcl_core/nodes.lua
+++ b/mods/mcl_core/nodes.lua
@@ -411,8 +411,9 @@ minetest.register_node("mcl_core:clay", {
 	}),
 })
 
-minetest.register_node("mcl_core:brick", {
-	description = "Bricks",
+minetest.register_node("mcl_core:brick_block", {
+	-- Original name: “Bricks”
+	description = "Brick Block",
 	tiles = {"default_brick.png"},
 	is_ground_content = false,
 	stack_max = 64,
diff --git a/mods/mcl_flowers/init.lua b/mods/mcl_flowers/init.lua
index 27d2610241..2cbd3de2f7 100644
--- a/mods/mcl_flowers/init.lua
+++ b/mods/mcl_flowers/init.lua
@@ -331,6 +331,14 @@ minetest.register_node("mcl_flowers:pot",{
 	end,
 })
 
+minetest.register_craft({
+	output = "mcl_flowers:pot",
+	recipe = {
+		{ "mcl_core:brick", "", "mcl_core:brick", },
+		{ "", "mcl_core:brick", "" },
+	},
+})
+
 -- Lily Pad
 minetest.register_node("mcl_flowers:waterlily", {
 	description = "Lily Pad",
diff --git a/mods/mcstair/init.lua b/mods/mcstair/init.lua
index 9284c21071..38ad35ff89 100644
--- a/mods/mcstair/init.lua
+++ b/mods/mcstair/init.lua
@@ -662,7 +662,7 @@ end
 for _,v in ipairs({
 	"stone",
 	"cobble",
-	"brick",
+	"brick_block",
 	"sandstone",
 	"redsandstone",
 	"stonebrick",
diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 70d453084e..ce13f9a5c2 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -277,11 +277,13 @@ stairs.register_stair_and_slab("cobble", "mcl_core:cobble",
 		"Cobblestone Slab",
 		mcl_core.node_sound_stone_defaults())
 
-stairs.register_stair_and_slab("brick", "mcl_core:brick",
+stairs.register_stair_and_slab("brick_block", "mcl_core:brick_block",
 		{cracky=3},
 		{"default_brick.png"},
-		"Bricks Stairs",
-		"Bricks Slab",
+		-- Original name: Bricks Stairs
+		"Brick Block Stairs",
+		-- Original name: Bricks Slab
+		"Brick Block Slab",
 		mcl_core.node_sound_stone_defaults())
 
 stairs.register_stair_and_slab("sandstone", "group:sandstone",