Impulse
/
MineClone2
forked from VoxeLibre/VoxeLibre
0
0
Fork 0
Code Pull Requests Activity

Rename *steel* itemstrings to *iron*

This commit is contained in:
Wuzzy 2017-02-11 21:14:40 +01:00
parent b5a4adc2e3
commit f905c32289
20 changed files with 80 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/bucket/init.lua
View File

@ -10,8 +10,8 @@ minetest.register_alias("bucket_lava", "bucket:bucket_lava")
minetest.register_craft({
output = 'bucket:bucket_empty 1',
recipe = {
{'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'},
{'', 'mcl_core:steel_ingot', ''},
{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
{'', 'mcl_core:iron_ingot', ''},
}
})

2
mods/craftingpack/crafting/creative.lua
View File

@ -259,7 +259,7 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
"item_image_button[-0.1,8.37;1,1;mcl_core:apple;food;]".. --foodstuff
tab(name, "food") ..
"tooltip[food;Foodstuffs]"..
"item_image_button[1.15,8.37;1,1;mcl_core:axe_steel;tools;]".. --tools
"item_image_button[1.15,8.37;1,1;mcl_core:axe_iron;tools;]".. --tools
tab(name, "tools") ..
"tooltip[tools;Tools]"..
"item_image_button[2.415,8.37;1,1;mcl_core:sword_gold;combat;]".. --combat

14
mods/doors/init.lua
View File

@ -440,7 +440,7 @@ minetest.register_craft({
})
--- Door in Iron ---
doors:register_door("doors:door_steel", {
doors:register_door("doors:door_iron", {
description = "Iron Door",
inventory_image = "door_steel.png",
groups = {snappy=1,cracky=1,level=2,door=1,mesecon_effector_on=1},
@ -450,11 +450,11 @@ doors:register_door("doors:door_steel", {
})
minetest.register_craft({
output = "doors:door_steel 3",
output = "doors:door_iron 3",
recipe = {
{"mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:steel_ingot", "mcl_core:steel_ingot"}
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"}
}
})
@ -696,8 +696,8 @@ minetest.register_node("doors:iron_trapdoor_open", {
minetest.register_craft({
output = 'doors:iron_trapdoor',
recipe = {
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
}
})

6
mods/mcl_compass/init.lua
View File

@ -66,9 +66,9 @@ end
minetest.register_craft({
output = 'mcl_compass:'..stereotype_frame,
recipe = {
{'', 'mcl_core:steel_ingot', ''},
{'mcl_core:steel_ingot', 'mesecons:redstone', 'mcl_core:steel_ingot'},
{'', 'mcl_core:steel_ingot', ''}
{'', 'mcl_core:iron_ingot', ''},
{'mcl_core:iron_ingot', 'mesecons:redstone', 'mcl_core:iron_ingot'},
{'', 'mcl_core:iron_ingot', ''}
}
})

66
mods/mcl_core/crafting.lua
View File

@ -192,9 +192,9 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'mcl_core:pick_steel',
output = 'mcl_core:pick_iron',
recipe = {
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'', 'mcl_core:stick', ''},
{'', 'mcl_core:stick', ''},
}
@ -237,9 +237,9 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'mcl_core:shovel_steel',
output = 'mcl_core:shovel_iron',
recipe = {
{'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot'},
{'mcl_core:stick'},
{'mcl_core:stick'},
}
@ -298,18 +298,18 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'mcl_core:axe_steel',
output = 'mcl_core:axe_iron',
recipe = {
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', 'mcl_core:stick'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:stick'},
{'', 'mcl_core:stick'},
}
})
minetest.register_craft({
output = 'mcl_core:axe_steel',
output = 'mcl_core:axe_iron',
recipe = {
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:stick', 'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'mcl_core:stick', 'mcl_core:iron_ingot'},
{'mcl_core:stick', ''},
}
})
@ -367,10 +367,10 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'mcl_core:sword_steel',
output = 'mcl_core:sword_iron',
recipe = {
{'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot'},
{'mcl_core:stick'},
}
})
@ -396,24 +396,24 @@ minetest.register_craft({
minetest.register_craft({
output = 'mcl_core:shears',
recipe = {
{ 'mcl_core:steel_ingot', '' },
{ '', 'mcl_core:steel_ingot', },
{ 'mcl_core:iron_ingot', '' },
{ '', 'mcl_core:iron_ingot', },
}
})
minetest.register_craft({
output = 'mcl_core:shears',
recipe = {
{ '', 'mcl_core:steel_ingot', },
{ 'mcl_core:steel_ingot', '' },
{ '', 'mcl_core:iron_ingot', },
{ 'mcl_core:iron_ingot', '' },
}
})
minetest.register_craft({
output = 'mcl_core:rail 16',
recipe = {
{'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', 'mcl_core:stick', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:stick', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', '', 'mcl_core:iron_ingot'},
}
})
@ -485,18 +485,18 @@ minetest.register_craft({
})
minetest.register_craft({
output = 'mcl_core:steelblock',
output = 'mcl_core:ironblock',
recipe = {
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
{'mcl_core:iron_ingot', 'mcl_core:iron_ingot', 'mcl_core:iron_ingot'},
}
})
minetest.register_craft({
output = 'mcl_core:steel_ingot 9',
output = 'mcl_core:iron_ingot 9',
recipe = {
{'mcl_core:steelblock'},
{'mcl_core:ironblock'},
}
})
@ -523,7 +523,7 @@ minetest.register_craft({
minetest.register_craft({
output = "mcl_core:iron_nugget 9",
recipe = {{"mcl_core:steel_ingot"}},
recipe = {{"mcl_core:iron_ingot"}},
})
minetest.register_craft({
@ -536,7 +536,7 @@ minetest.register_craft({
})
minetest.register_craft({
output = "mcl_core:steel_ingot",
output = "mcl_core:iron_ingot",
recipe = {
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
@ -723,7 +723,7 @@ minetest.register_craft({
minetest.register_craft({
type = "cooking",
output = "mcl_core:steel_ingot",
output = "mcl_core:iron_ingot",
recipe = "mcl_core:stone_with_iron",
cooktime = 10,
})
@ -815,28 +815,28 @@ minetest.register_craft({
minetest.register_craft({
type = "cooking",
output = "mcl_core:iron_nugget",
recipe = "mcl_core:sword_steel",
recipe = "mcl_core:sword_iron",
cooktime = 10,
})
minetest.register_craft({
type = "cooking",
output = "mcl_core:iron_nugget",
recipe = "mcl_core:axe_steel",
recipe = "mcl_core:axe_iron",
cooktime = 10,
})
minetest.register_craft({
type = "cooking",
output = "mcl_core:iron_nugget",
recipe = "mcl_core:shovel_steel",
recipe = "mcl_core:shovel_iron",
cooktime = 10,
})
minetest.register_craft({
type = "cooking",
output = "mcl_core:iron_nugget",
recipe = "mcl_core:pick_steel",
recipe = "mcl_core:pick_iron",
cooktime = 10,
})

4
mods/mcl_core/craftitems.lua
View File

@ -62,7 +62,7 @@ minetest.register_craftitem("mcl_core:clay_lump", {
groups = { craftitem=1 },
})
minetest.register_craftitem("mcl_core:steel_ingot", {
minetest.register_craftitem("mcl_core:iron_ingot", {
description = "Iron Ingot",
inventory_image = "default_steel_ingot.png",
stack_max = 64,
@ -150,5 +150,3 @@ minetest.register_craftitem("mcl_core:apple_gold", {
on_use = minetest.item_eat(8),
groups = { food = 2 },
})
minetest.register_alias("mcl_core:iron_ingot", "mcl_core:steel_ingot")

2
mods/mcl_core/nodes.lua
View File

@ -1264,7 +1264,7 @@ minetest.register_node("mcl_core:coalblock", {
sounds = mcl_sounds.node_sound_stone_defaults(),
})
minetest.register_node("mcl_core:steelblock", {
minetest.register_node("mcl_core:ironblock", {
description = "Block of Iron",
tiles = {"default_steel_block.png"},
is_ground_content = false,

8
mods/mcl_core/tools.lua
View File

@ -62,7 +62,7 @@ minetest.register_tool("mcl_core:pick_stone", {
damage_groups = {fleshy=3},
},
})
minetest.register_tool("mcl_core:pick_steel", {
minetest.register_tool("mcl_core:pick_iron", {
description = "Iron Pickaxe",
inventory_image = "default_tool_steelpick.png",
groups = { tool=1 },
@ -157,7 +157,7 @@ minetest.register_tool("mcl_core:shovel_stone", {
},
on_place = make_grass_path,
})
minetest.register_tool("mcl_core:shovel_steel", {
minetest.register_tool("mcl_core:shovel_iron", {
description = "Iron Shovel",
inventory_image = "default_tool_steelshovel.png",
wield_image = "default_tool_steelshovel.png^[transformR90",
@ -230,7 +230,7 @@ minetest.register_tool("mcl_core:axe_stone", {
damage_groups = {fleshy=9},
},
})
minetest.register_tool("mcl_core:axe_steel", {
minetest.register_tool("mcl_core:axe_iron", {
description = "Iron Axe",
inventory_image = "default_tool_steelaxe.png",
groups = { tool=1 },
@ -298,7 +298,7 @@ minetest.register_tool("mcl_core:sword_stone", {
damage_groups = {fleshy=5},
}
})
minetest.register_tool("mcl_core:sword_steel", {
minetest.register_tool("mcl_core:sword_iron", {
description = "Iron Sword",
inventory_image = "default_tool_steelsword.png",
groups = { weapon=1 },

2
mods/mcl_farming/README.txt
View File

@ -14,7 +14,7 @@ For further information or help see:
http://wiki.minetest.com/wiki/Installing_Mods
How to use the mod:
Craft a wood/stone/steel hoe:
Craft a wood/stone/iron/gold/diamond hoe:
material material
stick
stick

12
mods/mcl_farming/hoes.lua
View File

@ -96,7 +96,7 @@ minetest.register_craft({
}
})
minetest.register_tool("mcl_farming:hoe_steel", {
minetest.register_tool("mcl_farming:hoe_iron", {
description = "Iron Hoe",
inventory_image = "farming_tool_steelhoe.png",
on_place = function(itemstack, user, pointed_thing)
@ -116,17 +116,17 @@ minetest.register_tool("mcl_farming:hoe_steel", {
})
minetest.register_craft({
output = "mcl_farming:hoe_steel",
output = "mcl_farming:hoe_iron",
recipe = {
{"mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"", "mcl_core:stick"},
{"", "mcl_core:stick"}
}
})
minetest.register_craft({
output = "mcl_farming:hoe_steel",
output = "mcl_farming:hoe_iron",
recipe = {
{"mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:stick", ""},
{"mcl_core:stick", ""}
}
@ -135,7 +135,7 @@ minetest.register_craft({
minetest.register_craft({
type = "cooking",
output = "mcl_core:iron_nugget",
recipe = "mcl_farming:hoe_steel",
recipe = "mcl_farming:hoe_iron",
cooktime = 10,
})

2
mods/mcl_fire/flint_and_steel.lua
View File

@ -26,5 +26,5 @@ minetest.register_tool("mcl_fire:flint_and_steel", {
minetest.register_craft({
type = 'shapeless',
output = 'mcl_fire:flint_and_steel',
recipe = { 'mcl_core:steel_ingot', 'mcl_core:flint'},
recipe = { 'mcl_core:iron_ingot', 'mcl_core:flint'},
})

6
mods/mcl_hoppers/init.lua
View File

@ -527,8 +527,8 @@ minetest.register_craftitem("mcl_hoppers:hopper_item", {
minetest.register_craft({
output = "mcl_hoppers:hopper_item",
recipe = {
{"mcl_core:steel_ingot","","mcl_core:steel_ingot"},
{"mcl_core:steel_ingot","mcl_chests:chest","mcl_core:steel_ingot"},
{"","mcl_core:steel_ingot",""},
{"mcl_core:iron_ingot","","mcl_core:iron_ingot"},
{"mcl_core:iron_ingot","mcl_chests:chest","mcl_core:iron_ingot"},
{"","mcl_core:iron_ingot",""},
}
})

4
mods/mcl_minecarts/init.lua
View File

@ -282,7 +282,7 @@ minetest.register_craftitem("mcl_minecarts:minecart", {
minetest.register_craft({
output = "mcl_minecarts:minecart",
recipe = {
{"mcl_core:steel_ingot", "", "mcl_core:steel_ingot"},
{"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:iron_ingot", "", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot"},
},
})

6
mods/minetest-3d_armor/3d_armor/armor.conf
View File

@ -1,10 +1,10 @@
-- Armor Configuration
ARMOR_MATERIALS = {
leather = "mcl_mobitems:leather",
iron = "default:steel_ingot",
iron = "mcl_core:iron_ingot",
chain = nil,
gold = "default:gold_ingot",
diamond = "default:diamond",
gold = "mcl_core:gold_ingot",
diamond = "mcl_core:diamond",
}
ARMOR_FIRE_PROTECT = false

2
mods/minetest-3d_armor/3d_armor/armor.lua
View File

@ -10,7 +10,7 @@ ARMOR_RADIATION_MULTIPLIER = 1
ARMOR_MATERIALS = {
wood = "group:wood",
cactus = "mcl_core:cactus",
steel = "mcl_core:steel_ingot",
iron = "mcl_core:iron_ingot",
bronze = "mcl_core:bronze_ingot",
diamond = "mcl_core:diamond",
gold = "mcl_core:gold_ingot",

10
mods/minetest-3d_armor/3d_armor/init.lua
View File

@ -9,7 +9,7 @@ minetest.register_tool("3d_armor:helmet_leather", {
wear = 0,
})
minetest.register_tool("3d_armor:helmet_steel", {
minetest.register_tool("3d_armor:helmet_iron", {
description = "Iron Helmet",
inventory_image = "3d_armor_inv_helmet_steel.png",
groups = {armor_head=10, armor_heal=5, armor_use=250},
@ -46,7 +46,7 @@ minetest.register_tool("3d_armor:chestplate_leather", {
wear = 0,
})
minetest.register_tool("3d_armor:chestplate_steel", {
minetest.register_tool("3d_armor:chestplate_iron", {
description = "Iron Chestplate",
inventory_image = "3d_armor_inv_chestplate_steel.png",
groups = {armor_torso=20, armor_heal=5, armor_use=250},
@ -83,7 +83,7 @@ minetest.register_tool("3d_armor:leggings_leather", {
wear = 0,
})
minetest.register_tool("3d_armor:leggings_steel", {
minetest.register_tool("3d_armor:leggings_iron", {
description = "Iron Leggings",
inventory_image = "3d_armor_inv_leggings_steel.png",
groups = {armor_legs=15, armor_heal=5, armor_use=250},
@ -119,7 +119,7 @@ minetest.register_tool("3d_armor:boots_leather", {
wear = 0,
})
minetest.register_tool("3d_armor:boots_steel", {
minetest.register_tool("3d_armor:boots_iron", {
description = "Iron Boots",
inventory_image = "3d_armor_inv_boots_steel.png",
groups = {armor_feet=10, armor_heal=5, armor_use=250},
@ -151,7 +151,7 @@ minetest.register_tool("3d_armor:boots_chain", {
local craft_ingreds = {
leather = { "mcl_mobitems:leather" },
steel = { "mcl_core:steel_ingot", "mcl_core:iron_nugget" },
iron = { "mcl_core:iron_ingot", "mcl_core:iron_nugget" },
gold = { "mcl_core:gold_ingot", "mcl_core:gold_nugget" },
diamond = { "mcl_core:diamond" },
chain = { nil, "mcl_core:iron_nugget"} ,

15
mods/minetest-3d_armor/3d_armor_stand/README.txt
View File

@ -4,18 +4,3 @@
Depends: 3d_armor
Adds a chest-like armor stand for armor storage and display.
Crafting
--------
F = Wooden Fence [default:fence_wood]
S = Steel Ingot [default:steel_ingot]
+---+---+---+
| | F | |
+---+---+---+
| | F | |
+---+---+---+
| S | S | S |
+---+---+---+

6
mods/mobs_mc/zombie.lua
View File

@ -36,17 +36,17 @@ mobs:register_mob("mobs_mc:zombie", {
chance = 1,
min = 0,
max = 2,},
{name = "mcl_core:steel_ingot",
{name = "mcl_core:iron_ingot",
-- approximation to 8.5%
chance = 11,
min = 1,
max = 1,},
{name = "mcl_core:shovel_steel",
{name = "mcl_core:shovel_iron",
-- approximation to 8.5%
chance = 11,
min = 1,
max = 1,},
{name = "mcl_core:sword_steel",
{name = "mcl_core:sword_iron",
-- approximation to 8.5%
chance = 11,
min = 1,

2
mods/redstone/mesecons_pistons/init.lua
View File

@ -750,7 +750,7 @@ minetest.register_craft({
output = 'mesecons_pistons:piston_normal_off',
recipe = {
{"group:wood", "group:wood", "group:wood"},
{"mcl_core:cobble", "mcl_core:steel_ingot", "mcl_core:cobble"},
{"mcl_core:cobble", "mcl_core:iron_ingot", "mcl_core:cobble"},
{"mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble"},
}
})

4
mods/xpanes/init.lua
View File

@ -170,8 +170,8 @@ xpanes.register_pane("bar", {
groups = {cracky=2},
sounds = mcl_sounds.node_sound_metal_defaults(),
recipe = {
{"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"},
{"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"}
{"mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot"},
{"mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot"},
}
})