Merge 3e0d100352 into 38a8351327

mods/default/README.txt

@@ -96,7 +96,7 @@ Zeg9 (CC BY-SA 3.0):
   default_coal_block.png
   default_steel_block.png
   default_copper_block.png
-  default_bronze_block.png
+  default_gnucydur_block.png
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
@@ -164,7 +164,7 @@ Neuromancer (CC BY-SA 3.0):
   default_furnace_*.png
 
 Gambit (WTFPL):
-  default_bronze_ingot.png
+  default_gnucydur_ingot.png
   default_copper_ingot.png
   default_copper_lump.png
   default_iron_lump.png

mods/default/crafting.lua

@@ -95,9 +95,9 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:pick_bronze',
+	output = 'default:pick_gnucydur',
 	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot', 'default:gnucydur_ingot'},
 		{'', 'group:stick', ''},
 		{'', 'group:stick', ''},
 	}
@@ -149,9 +149,9 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:shovel_bronze',
+	output = 'default:shovel_gnucydur',
 	recipe = {
-		{'default:bronze_ingot'},
+		{'default:gnucydur_ingot'},
 		{'group:stick'},
 		{'group:stick'},
 	}
@@ -203,10 +203,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:axe_bronze',
+	output = 'default:axe_gnucydur',
 	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot'},
-		{'default:bronze_ingot', 'group:stick'},
+		{'default:gnucydur_ingot', 'group:stick'},
 		{'', 'group:stick'},
 	}
 })
@@ -257,10 +257,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:axe_bronze',
+	output = 'default:axe_gnucydur',
 	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot'},
-		{'group:stick', 'default:bronze_ingot'},
+		{'group:stick', 'default:gnucydur_ingot'},
 		{'group:stick', ''},
 	}
 })
@@ -311,10 +311,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:sword_bronze',
+	output = 'default:sword_gnucydur',
 	recipe = {
-		{'default:bronze_ingot'},
+		{'default:gnucydur_ingot'},
-		{'default:bronze_ingot'},
+		{'default:gnucydur_ingot'},
 		{'group:stick'},
 	}
 })
@@ -375,7 +375,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "shapeless",
-	output = "default:bronze_ingot",
+	output = "default:gnucydur_ingot",
 	recipe = {"default:steel_ingot", "default:copper_ingot"},
 })
 
@@ -428,18 +428,18 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:bronzeblock',
+	output = 'default:gnucydurblock',
 	recipe = {
-		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot', 'default:gnucydur_ingot'},
-		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot', 'default:gnucydur_ingot'},
-		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:gnucydur_ingot', 'default:gnucydur_ingot', 'default:gnucydur_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = 'default:bronze_ingot 9',
+	output = 'default:gnucydur_ingot 9',
 	recipe = {
-		{'default:bronzeblock'},
+		{'default:gnucydurblock'},
 	}
 })
 

mods/default/craftitems.lua

@@ -164,9 +164,9 @@ minetest.register_craftitem("default:copper_ingot", {
 	inventory_image = "default_copper_ingot.png",
 })
 
-minetest.register_craftitem("default:bronze_ingot", {
+minetest.register_craftitem("default:gnucydur_ingot", {
-	description = "Bronze Ingot",
+	description = "Gnucydur Ingot",
-	inventory_image = "default_bronze_ingot.png",
+	inventory_image = "default_gnucydur_ingot.png",
 })
 
 minetest.register_craftitem("default:gold_ingot", {

mods/default/nodes.lua

@@ -94,7 +94,7 @@ default:steelblock
 
 default:stone_with_copper
 default:copperblock
-default:bronzeblock
+default:gnucydurblock
 
 default:stone_with_gold
 default:goldblock
@@ -803,9 +803,9 @@ minetest.register_node("default:copperblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:bronzeblock", {
+minetest.register_node("default:gnucydurblock", {
-	description = "Bronze Block",
+	description = "Gnucydur Block",
-	tiles = {"default_bronze_block.png"},
+	tiles = {"default_gnucydur_block.png"},
 	is_ground_content = false,
 	groups = {cracky = 1, level = 2},
 	sounds = default.node_sound_stone_defaults(),

mods/default/tools.lua

@@ -57,9 +57,9 @@ minetest.register_tool("default:pick_steel", {
 		damage_groups = {fleshy=4},
 	},
 })
-minetest.register_tool("default:pick_bronze", {
+minetest.register_tool("default:pick_gnucydur", {
-	description = "Bronze Pickaxe",
+	description = "Gnucydur Pickaxe",
-	inventory_image = "default_tool_bronzepick.png",
+	inventory_image = "default_tool_gnucydurpick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -137,10 +137,10 @@ minetest.register_tool("default:shovel_steel", {
 		damage_groups = {fleshy=3},
 	},
 })
-minetest.register_tool("default:shovel_bronze", {
+minetest.register_tool("default:shovel_gnucydur", {
-	description = "Bronze Shovel",
+	description = "Gnucydur Shovel",
-	inventory_image = "default_tool_bronzeshovel.png",
+	inventory_image = "default_tool_gnucydurshovel.png",
-	wield_image = "default_tool_bronzeshovel.png^[transformR90",
+	wield_image = "default_tool_gnucydurshovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.1,
 		max_drop_level=1,
@@ -217,9 +217,9 @@ minetest.register_tool("default:axe_steel", {
 		damage_groups = {fleshy=4},
 	},
 })
-minetest.register_tool("default:axe_bronze", {
+minetest.register_tool("default:axe_gnucydur", {
-	description = "Bronze Axe",
+	description = "Gnucydur Axe",
-	inventory_image = "default_tool_bronzeaxe.png",
+	inventory_image = "default_tool_gnucyduraxe.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -294,9 +294,9 @@ minetest.register_tool("default:sword_steel", {
 		damage_groups = {fleshy=6},
 	}
 })
-minetest.register_tool("default:sword_bronze", {
+minetest.register_tool("default:sword_gnucydur", {
-	description = "Bronze Sword",
+	description = "Gnucydur Sword",
-	inventory_image = "default_tool_bronzesword.png",
+	inventory_image = "default_tool_gnucydursword.png",
 	tool_capabilities = {
 		full_punch_interval = 0.8,
 		max_drop_level=1,

mods/farming/README.txt

@@ -31,7 +31,7 @@ Created by PilzAdam (License: WTFPL):
 Created by BlockMen (License: CC BY 3.0):
   farming_tool_diamondhoe.png
   farming_tool_mesehoe.png
-  farming_tool_bronzehoe.png
+  farming_tool_gnucydurhoe.png
   farming_tool_steelhoe.png
   farming_tool_stonehoe.png
   farming_tool_woodhoe.png

mods/farming/hoes.lua

@@ -19,11 +19,11 @@ farming.register_hoe(":farming:hoe_steel", {
 	material = "default:steel_ingot"
 })
 
-farming.register_hoe(":farming:hoe_bronze", {
+farming.register_hoe(":farming:hoe_gnucydur", {
-	description = "Bronze Hoe",
+	description = "Gnucydur Hoe",
-	inventory_image = "farming_tool_bronzehoe.png",
+	inventory_image = "farming_tool_gnucydurhoe.png",
 	max_uses = 220,
-	material = "default:bronze_ingot"
+	material = "default:gnucydur_ingot"
 })
 
 farming.register_hoe(":farming:hoe_mese", {