Merge remote-tracking branch 'upstream/master'

README.md

@@ -8,7 +8,7 @@ https://forum.minetest.net/viewtopic.php?id=8890
 
 Changelog:
 
-- 1.0 - Added glazed terracotta blocks when you cook baked clay in furnace (thanks D3monPixel)
+- 1.0 - Re-Added glazed terracotta blocks when you cook baked clay in furnace (thanks Amara2_MK), added support for sofar's flowerpot mod
 - 0.9 - Baked clay now works in the technic cnc machine
 - 0.8 - Cooking clay block in furnace gives natural baked clay which you can dye
 - 0.7 - Added support for stairsplus so that stairs are registered properly

depends.txt

@@ -3,3 +3,4 @@ stairs
 moreblocks?
 lucky_block?
 technic_cnc?
+flowerpot?

init.lua

@@ -131,24 +131,7 @@ for _, clay in pairs(clay) do
 	end
 end
 
--- special light blue glazed terracotta block
-local texture = "baked_clay_terracotta_light_blue.png"
-
-minetest.register_node("bakedclay:terracotta_light_blue", {
-	description = "Light Blue Glazed Terracotta",
-	tiles = {
-		texture .. "",
-		texture .. "",
-		texture .. "^[transformR180",
-		texture .. "",
-		texture .. "^[transformR270",
-		texture .. "^[transformR90",
-	},
-	paramtype2 = "facedir",
-	groups = {cracky = 3, terracotta = 1},
-	sounds = default.node_sound_stone_defaults(),
-	on_place = minetest.rotate_node
-})
+minetest.register_alias("bakedclay:terracotta_light_blue", "bakedclay:terracotta_cyan")
 
 -- cook clay block into white baked clay
 
@@ -335,7 +318,6 @@ p = "bakedclay:terracotta_"
 
 lucky_block:add_blocks({
 	{"nod", "default:chest", 0, {
-		{name = p.."light_blue", max = 20},
 		{name = p.."black", max = 20},
 		{name = p.."blue", max = 20},
 		{name = p.."brown", max = 20},
@@ -393,4 +375,14 @@ end
 
 end
 
+
+-- flowerpot mod
+
+if minetest.get_modpath("flowerpot") then
+	flowerpot.register_node("bakedclay:delphinium")
+	flowerpot.register_node("bakedclay:thistle")
+	flowerpot.register_node("bakedclay:lazarus")
+	flowerpot.register_node("bakedclay:mannagrass")
+end
+
 minetest.log("action", "[MOD] Baked Clay loaded.")

license.txt

@@ -21,5 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-Textures by D3monPixel (https://mcpedl.com/better-glazed-terracotta-pack)
+Textures by Amara2_MK (Creative Commons)
+https://www.curseforge.com/minecraft/texture-packs/glazed-terracotta-revamp
   baked_clay_terracotta*.png

mod.conf

@@ -1,4 +1,4 @@
 name = bakedclay
 depends = default
-optional_depends = stairs, moreblocks, lucky_block, technic_cnc
+optional_depends = stairs, moreblocks, lucky_block, technic_cnc, flowerpot
 description = Adds the ability to bake clay into blocks and colour them with dye.