Merge 426e491d1c into c4f2bee9a6

mods/default/init.lua

@@ -259,7 +259,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'default:pick_mese',
 	recipe = {
-		{'default:mese', 'default:mese', 'default:mese'},
+		{'default:mese_ingot', 'default:mese_ingot', 'default:mese_ingot'},
 		{'', 'default:stick', ''},
 		{'', 'default:stick', ''},
 	}
@@ -470,6 +470,32 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:meseblock',
+	recipe = {
+		{'default:mese_ingot', 'default:mese_ingot', 'default:mese_ingot'},
+		{'default:mese_ingot', 'default:mese_ingot', 'default:mese_ingot'},
+		{'default:mese_ingot', 'default:mese_ingot', 'default:mese_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:mese_ingot 9',
+	recipe = {
+		{'default:meseblock'},
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'default:stone_with_mese',
+	recipe = {
+		'default:mese_lump',
+		'default:stone',
+	}
+})
+
+
 --
 -- Crafting (tool repair)
 --
@@ -500,6 +526,12 @@ minetest.register_craft({
 	recipe = "default:iron_lump",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:mese_ingot 3",
+	recipe = "default:mese_lump"
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:clay_brick",
@@ -566,7 +598,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:mese",
+	recipe = "default:mese_lump",
 	burntime = 30,
 })
 
@@ -745,6 +777,17 @@ minetest.register_node("default:stone_with_iron", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stone_with_mese", {
+	description = "Mese Ore",
+	tiles = {"default_stone.png^default_mineral_mese.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	drop = "default:mese_lump",
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_alias("default:mese", "default:stone_with_mese")
+
 minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with Grass",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
@@ -990,14 +1033,6 @@ minetest.register_node("default:wood", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("default:mese", {
-	description = "Mese",
-	tiles = {"default_mese.png"},
-	is_ground_content = true,
-	groups = {cracky=1},
-	sounds = default.node_sound_defaults(),
-})
-
 minetest.register_node("default:cloud", {
 	description = "Cloud",
 	tiles = {"default_cloud.png"},
@@ -1515,6 +1550,14 @@ minetest.register_node("default:steelblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:meseblock", {
+	description = "Mese Block",
+	tiles = {"default_mese_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	sounds = default.node_sound_defaults(),
+})
+
 minetest.register_node("default:nyancat", {
 	description = "Nyan Cat",
 	tiles = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
@@ -1613,6 +1656,11 @@ minetest.register_craftitem("default:iron_lump", {
 	inventory_image = "default_iron_lump.png",
 })
 
+minetest.register_craftitem("default:mese_lump", {
+	description = "Mese Lump",
+	inventory_image = "default_mese_lump.png",
+})
+
 minetest.register_craftitem("default:clay_lump", {
 	description = "Clay Lump",
 	inventory_image = "default_clay_lump.png",
@@ -1623,6 +1671,11 @@ minetest.register_craftitem("default:steel_ingot", {
 	inventory_image = "default_steel_ingot.png",
 })
 
+minetest.register_craftitem("default:mese_ingot", {
+	description = "Mese Ingot",
+	inventory_image = "default_mese_ingot.png",
+})
+
 minetest.register_craftitem("default:clay_brick", {
 	description = "Clay Brick",
 	inventory_image = "default_steel_ingot.png",