From a364f64ab950ffe5e4c47d0a4af64c3638ece0cf Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Fri, 3 Jun 2016 21:52:52 +0200 Subject: [PATCH] Purge the repo's other mods from moreores --- minetestforfun_game/mods/default/crafting.lua | 2 +- minetestforfun_game/mods/doors/init.lua | 6 +++--- minetestforfun_game/mods/farming/hoes.lua | 4 ++-- minetestforfun_game/mods/screwdriver/init.lua | 2 +- mods/3d_armor_classes/blackmithril/init.lua | 2 +- mods/3d_armor_classes/reinforcedleather/init.lua | 2 +- mods/homedecor_modpack/homedecor/crafts.lua | 4 ++-- mods/mff/mff_pclasses/warrior.lua | 2 +- mods/mff/mff_quests/init.lua | 2 +- mods/mobs/pumpkins.lua | 2 +- mods/moretrees/init.lua | 4 ++-- mods/plantlife_modpack/ferns/fern.lua | 14 +++++++------- mods/runes/amulets.lua | 8 ++++---- mods/runes/glyphs.lua | 2 +- mods/sea/seawrecks/init.lua | 4 ++-- mods/spears/tools.lua | 2 +- mods/throwing/crafts.lua | 2 +- mods/throwing/standard_arrows.lua | 2 +- mods/throwing/tools.lua | 2 +- mods/trm_pyramids/more_trms.lua | 10 +++++----- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index c678bbd6..76321b74 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -531,7 +531,7 @@ minetest.register_craft({ -- Ultimate Warrior weapon recipe = { {"mobs:dungeon_master_blood", "nether:white", "mobs:dungeon_master_blood"}, {"mobs:dungeon_master_blood", "mobs:dungeon_master_diamond", "mobs:dungeon_master_blood"}, - {"moreores:mithril_block", "mobs:zombie_tibia", "moreores:mithril_block"}, + {"default:mithrilblock", "mobs:zombie_tibia", "default:mithril_block"}, } }) diff --git a/minetestforfun_game/mods/doors/init.lua b/minetestforfun_game/mods/doors/init.lua index 0f20e35f..5e244398 100755 --- a/minetestforfun_game/mods/doors/init.lua +++ b/minetestforfun_game/mods/doors/init.lua @@ -608,9 +608,9 @@ doors.register("door_tin", { sounds = default.node_sound_stone_defaults(), sunlight = false, recipe = { - {"moreores:tin_ingot", "moreores:tin_ingot"}, - {"moreores:tin_ingot", "moreores:tin_ingot"}, - {"moreores:tin_ingot", "moreores:tin_ingot"} + {"default:tin_ingot", "default:tin_ingot"}, + {"default:tin_ingot", "default:tin_ingot"}, + {"default:tin_ingot", "default:tin_ingot"} } }) diff --git a/minetestforfun_game/mods/farming/hoes.lua b/minetestforfun_game/mods/farming/hoes.lua index 880985fc..c66b681f 100755 --- a/minetestforfun_game/mods/farming/hoes.lua +++ b/minetestforfun_game/mods/farming/hoes.lua @@ -155,7 +155,7 @@ farming.register_hoe(":farming:hoe_silver", { description = "Silver Hoe", inventory_image = "farming_tool_silverhoe.png", max_uses = 300, - material = "moreores:silver_ingot" + material = "default:silver_ingot" }) farming.register_hoe(":farming:hoe_mese", { @@ -176,5 +176,5 @@ farming.register_hoe(":farming:hoe_mithril", { description = "Mithril Hoe", inventory_image = "farming_tool_mithrilhoe.png", max_uses = 1000, - material = "moreores:mithril_ingot" + material = "default:mithril_ingot" }) diff --git a/minetestforfun_game/mods/screwdriver/init.lua b/minetestforfun_game/mods/screwdriver/init.lua index d998923c..7853c7e8 100755 --- a/minetestforfun_game/mods/screwdriver/init.lua +++ b/minetestforfun_game/mods/screwdriver/init.lua @@ -131,7 +131,7 @@ minetest.register_craft({ minetest.register_craft({ output = "screwdriver:screwdriver_perfect", recipe = { - {"moreores:mithril_ingot"}, + {"default:mithril_ingot"}, {"group:stick"} } }) diff --git a/mods/3d_armor_classes/blackmithril/init.lua b/mods/3d_armor_classes/blackmithril/init.lua index 897a52ac..ca586ceb 100755 --- a/mods/3d_armor_classes/blackmithril/init.lua +++ b/mods/3d_armor_classes/blackmithril/init.lua @@ -40,7 +40,7 @@ minetest.register_craftitem(":3d_armor:blackmithril_ingot", { minetest.register_craft({ output = "3d_armor:blackmithril_ingot", recipe = { - {"moreores:mithril_ingot", "mobs:dungeon_master_blood", ""}, + {"default:mithril_ingot", "mobs:dungeon_master_blood", ""}, {"mobs:dungeon_master_diamond", "default:obsidian", ""}, {"", "", ""} } diff --git a/mods/3d_armor_classes/reinforcedleather/init.lua b/mods/3d_armor_classes/reinforcedleather/init.lua index 4340f4be..9ca4b9fb 100755 --- a/mods/3d_armor_classes/reinforcedleather/init.lua +++ b/mods/3d_armor_classes/reinforcedleather/init.lua @@ -39,7 +39,7 @@ minetest.register_craftitem(":3d_armor:reinforcedleather", { minetest.register_craft({ output = "3d_armor:reinforcedleather", recipe = { - {"moreores:mithril_ingot", "technic:brass_ingot", ""}, + {"default:mithril_ingot", "technic:brass_ingot", ""}, {"darkage:chain", "mobs:minotaur_eye", ""}, {"", "", ""} } diff --git a/mods/homedecor_modpack/homedecor/crafts.lua b/mods/homedecor_modpack/homedecor/crafts.lua index 5483bdca..a58874f0 100755 --- a/mods/homedecor_modpack/homedecor/crafts.lua +++ b/mods/homedecor_modpack/homedecor/crafts.lua @@ -155,12 +155,12 @@ if not minetest.get_modpath("technic") then inventory_image = "homedecor_brass_ingot.png", }) - if minetest.get_modpath("moreores") then + if minetest.get_modpath("default") then minetest.register_craft( { type = "shapeless", output = "technic:brass_ingot 2", recipe = { - "moreores:silver_ingot", + "default:silver_ingot", "default:copper_ingot", }, }) diff --git a/mods/mff/mff_pclasses/warrior.lua b/mods/mff/mff_pclasses/warrior.lua index 3585dcb6..8a0c9fa0 100755 --- a/mods/mff/mff_pclasses/warrior.lua +++ b/mods/mff/mff_pclasses/warrior.lua @@ -25,7 +25,7 @@ pclasses.api.register_class("warrior", { } }) -pclasses.api.reserve_item("warrior", "moreores:sword_mithril") +pclasses.api.reserve_item("warrior", "default:sword_mithril") pclasses.api.reserve_item("warrior", "default:dungeon_master_s_blood_sword") for _, i in pairs({"helmet", "chestplate", "boots", "leggings"}) do diff --git a/mods/mff/mff_quests/init.lua b/mods/mff/mff_quests/init.lua index 02053166..ae412155 100755 --- a/mods/mff/mff_quests/init.lua +++ b/mods/mff/mff_quests/init.lua @@ -48,7 +48,7 @@ mff.quests.quests = { description = "DAILY QUEST!\nGet two mithril ingot at the end!", repeating = 60*60*24, awards = { - ["moreores:mithril_ingot"] = 2 + ["default:mithril_ingot"] = 2 }, tasks = { diggy = { diff --git a/mods/mobs/pumpkins.lua b/mods/mobs/pumpkins.lua index df7de1da..e659e764 100755 --- a/mods/mobs/pumpkins.lua +++ b/mods/mobs/pumpkins.lua @@ -46,7 +46,7 @@ mobs:register_mob("mobs:pumpking", { -- Warrior drops {name = "3d_armor:helmet_mithril", chance = 10, min = 1, max = 1}, {name = "3d_armor:chestplate_mithril", chance = 10, min = 1, max = 1}, - {name = "moreores:sword_mithril", chance = 33, min = 1, max = 1}, + {name = "default:sword_mithril", chance = 33, min = 1, max = 1}, }, lifetimer = 300, -- 5 minutes --shoot_interval = 1000, -- (lifetimer - (lifetimer / 4)), borrowed for do_custom timer diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua index b8e82bc2..e5245b45 100755 --- a/mods/moretrees/init.lua +++ b/mods/moretrees/init.lua @@ -66,8 +66,8 @@ moretrees.cutting_tools = { "default:axe_steel", -- "glooptest:axe_alatro", -- "glooptest:axe_arol", - "moreores:axe_mithril", - "moreores:axe_silver", + "default:axe_mithril", + "default:axe_silver", -- "titanium:axe", } -- Cutting tools disabled. They are unknown //MFF(Mg|08/09/15) diff --git a/mods/plantlife_modpack/ferns/fern.lua b/mods/plantlife_modpack/ferns/fern.lua index 51cac8f5..2276cd79 100755 --- a/mods/plantlife_modpack/ferns/fern.lua +++ b/mods/plantlife_modpack/ferns/fern.lua @@ -133,8 +133,8 @@ if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a "default:mossycobble", "default:stone_with_coal", "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", + "default:stone_with_tin", + "default:stone_with_silver", "sumpf:sumpf" }, max_count = 1200,--1600, -- maybe too much? :D @@ -146,9 +146,9 @@ if abstract_ferns.config.lady_ferns_near_ores == true then -- this one causes a --"default:stone_with_mese", --"default:stone_with_gold", --"default:stone_with_diamond", - "moreores:mineral_tin", - "moreores:mineral_silver" - --"moreores:mineral_mithril" + "default:stone_with_tin", + "default:stone_with_silver" + --"default:mineral_mithril" }, near_nodes_size = 2, near_nodes_vertical = 4,--5,--6, @@ -171,8 +171,8 @@ if abstract_ferns.config.lady_ferns_in_groups == true then -- this one is meant "default:mossycobble", "default:stone_with_coal", "default:stone_with_iron", - "moreores:mineral_tin", - "moreores:mineral_silver", + "default:stone_with_tin", + "default:stone_with_silver", "sumpf:sumpf" }, max_count = 70, diff --git a/mods/runes/amulets.lua b/mods/runes/amulets.lua index acbd3942..07370d63 100755 --- a/mods/runes/amulets.lua +++ b/mods/runes/amulets.lua @@ -9,8 +9,8 @@ minetest.register_craft({ output = "runes:silver_cross_amulet", recipe = { {"", "farming:cotton", ""}, - {"moreores:silver_ingot", "moreores:silver_ingot", "moreores:silver_ingot"}, - {"", "moreores:silver_ingot", ""}, + {"default:silver_ingot", "default:silver_ingot", "default:silver_ingot"}, + {"", "default:silver_ingot", ""}, } }) @@ -37,7 +37,7 @@ minetest.register_craft({ recipe = { {"", "runes:hellfire_amulet", ""}, {"nether:white", "runes:black_magic_block", "nether:white"}, - {"", "moreores:mithril_block", ""}, + {"", "default:mithrilblock", ""}, } }) @@ -46,7 +46,7 @@ minetest.register_craft({ recipe = { {"nether:white", "runes:hellfire_amulet", "default:obsidian"}, {"default:nyancat", "nether:tree", "default:mese"}, - {"default:obsidian", "moreores:mithril_block", "nether:white"}, + {"default:obsidian", "default:mithrilblock", "nether:white"}, } }) diff --git a/mods/runes/glyphs.lua b/mods/runes/glyphs.lua index 40669c00..0d64c6e9 100644 --- a/mods/runes/glyphs.lua +++ b/mods/runes/glyphs.lua @@ -57,7 +57,7 @@ minetest.register_tool("runes:stylus", { minetest.register_craft({ output = "runes:stylus", recipe = { - {"", "default:obsidian_shard", "moreores:mithril_ingot"}, + {"", "default:obsidian_shard", "default:mithril_ingot"}, {"default:obsidian_shard", "default:nyancat_rainbow", "default:obsidian_shard"}, {"default:obsidian_shard", "default:obsidian_shard", ""}, }, diff --git a/mods/sea/seawrecks/init.lua b/mods/sea/seawrecks/init.lua index fd1bcb76..375e1327 100755 --- a/mods/sea/seawrecks/init.lua +++ b/mods/sea/seawrecks/init.lua @@ -34,7 +34,7 @@ minetest.register_node("seawrecks:woodshipchest", { local kind_of_price = math.random(0,2) local amount_of_price = math.random(1, 5) - local ingot_price = {"default:steel_ingot","default:copper_ingot","default:gold_ingot","moreores:tin_ingot","moreores:silver_ingot"} + local ingot_price = {"default:steel_ingot","default:copper_ingot","default:gold_ingot","default:tin_ingot","default:silver_ingot"} local price_group = {"",""} local choosen_ingot = math.random(1, #ingot_price) price_group[1] = ingot_price[choosen_ingot].." "..amount_of_price @@ -101,7 +101,7 @@ minetest.register_node("seawrecks:ubootchest", { local kind_of_price = math.random(0,2) local amount_of_price = math.random(1, 20) - local ingot_price = {"default:steel_ingot","default:copper_ingot","default:gold_ingot","moreores:tin_ingot","moreores:silver_ingot"} + local ingot_price = {"default:steel_ingot","default:copper_ingot","default:gold_ingot","default:tin_ingot","default:silver_ingot"} local price_group = {"",""} local choosen_ingot = math.random(1, #ingot_price) price_group[1] = ingot_price[choosen_ingot].." "..amount_of_price diff --git a/mods/spears/tools.lua b/mods/spears/tools.lua index e30350d9..12a870f2 100755 --- a/mods/spears/tools.lua +++ b/mods/spears/tools.lua @@ -58,6 +58,6 @@ if not DISABLE_OBSIDIAN_SPEAR then end if not DISABLE_MITHRIL_SPEAR then - spears_register_spear('mithril', 'Mithril (Hunter)', 8, 200, 'moreores:mithril_ingot') --MFF crabman(28/09/2015) damage and wear + spears_register_spear('mithril', 'Mithril (Hunter)', 8, 200, 'default:mithril_ingot') --MFF crabman(28/09/2015) damage and wear end diff --git a/mods/throwing/crafts.lua b/mods/throwing/crafts.lua index 3298a1e5..9d74db4e 100755 --- a/mods/throwing/crafts.lua +++ b/mods/throwing/crafts.lua @@ -4,7 +4,7 @@ minetest.register_craft({ description = "Mithril String", inventory_image = "string_mithril.png", type = "shapeless", - recipe = {"moreores:mithril_ingot", "farming:string"}, + recipe = {"default:mithril_ingot", "farming:string"}, }) minetest.register_craftitem("throwing:string_mithril", { diff --git a/mods/throwing/standard_arrows.lua b/mods/throwing/standard_arrows.lua index f3681276..49b50b3b 100755 --- a/mods/throwing/standard_arrows.lua +++ b/mods/throwing/standard_arrows.lua @@ -130,5 +130,5 @@ if not DISABLE_DIAMOND_ARROW then end if not DISABLE_MITHRIL_ARROW then - throwing_register_arrow_standard ('mithril', 'Mithril (Hunter)', 8, 0.80, 'moreores:mithril_ingot') + throwing_register_arrow_standard ('mithril', 'Mithril (Hunter)', 8, 0.80, 'default:mithril_ingot') end diff --git a/mods/throwing/tools.lua b/mods/throwing/tools.lua index 54331630..9489bd45 100755 --- a/mods/throwing/tools.lua +++ b/mods/throwing/tools.lua @@ -42,7 +42,7 @@ end if not DISABLE_MINOTAUR_HORN_BOW then throwing_register_bow ('bow_minotaur_horn', 'Minotaur Horn Bow (Hunter)', {x=1, y=1.5, z=0.5}, 35, 1.2, 1000, false, { {'farming:string', 'mobs:minotaur_horn', 'mobs:minotaur_horn'}, - {'farming:string', '', 'moreores:mithril_ingot'}, + {'farming:string', '', 'default:mithril_ingot'}, {'farming:string', 'mobs:minotaur_horn', 'mobs:minotaur_horn'}, }) end diff --git a/mods/trm_pyramids/more_trms.lua b/mods/trm_pyramids/more_trms.lua index 9855d4f7..d8ad4ba9 100755 --- a/mods/trm_pyramids/more_trms.lua +++ b/mods/trm_pyramids/more_trms.lua @@ -112,7 +112,7 @@ treasurer.register_treasure("farming:rhubarb_pie", 0.02, 5, {1,5}, nil, raw_food treasurer.register_treasure("nether:sword_sywtonic", 0.05, 8, 1, nil, melee_weapons) --rare treasurer.register_treasure("default:sword_nyan", 0.05, 6, nil, melee_weapons) --rare treasurer.register_treasure("nether:sword_netherrack_blue", 0.075, 6, nil, melee_weapons) --uncommon -treasurer.register_treasure("moreores:sword_silver", 0.075, 5, nil, melee_weapons) --uncommon +treasurer.register_treasure("default:sword_silver", 0.075, 5, nil, melee_weapons) --uncommon treasurer.register_treasure("default:sword_bronze", 0.075, 5, nil, melee_weapons) --uncommon treasurer.register_treasure("default:sword_steel", 0.15, 4, nil, melee_weapons) --common treasurer.register_treasure("nether:sword_netherrack", 0.15, nil, melee_weapons) --common @@ -121,7 +121,7 @@ treasurer.register_treasure("default:sword_stone", 0.15, 3, nil, melee_weapons) treasurer.register_treasure("nether:sword_sywtonic", 0.1, 8, 1, nil, ranged_weapon) --rare treasurer.register_treasure("default:sword_nyan", 0.1, 6, 1, nil, ranged_weapon) --rare treasurer.register_treasure("nether:sword_netherrack_blue", 0.1, 6, 1, nil, ranged_weapon) --uncommon -treasurer.register_treasure("moreores:sword_silver", 0.1, 5, 1, nil, ranged_weapon) --uncommon +treasurer.register_treasure("default:sword_silver", 0.1, 5, 1, nil, ranged_weapon) --uncommon treasurer.register_treasure("default:sword_bronze", 0.1, 5, 1, nil, ranged_weapon) --uncommon treasurer.register_treasure("default:sword_steel", 0.1, 4, 1, nil, ranged_weapon) --common treasurer.register_treasure("nether:sword_netherrack", 0.1, 1, nil, ranged_weapon) --common @@ -135,9 +135,9 @@ treasurer.register_treasure("default:shovel_mese", 0.025, 6, 1, nil, minetool) treasurer.register_treasure("farming:hoe_mese", 0.05, 6, 1, nil, minetool) --uncommon treasurer.register_treasure("default:pick_nyan", 0.05, 6, 1, nil, minetool) --uncommon treasurer.register_treasure("default:axe_nyan", 0.05, 6, 1, nil, minetool) --uncommon -treasurer.register_treasure("moreores:pick_silver", 0.05, 5, 1, nil, minetool) --uncommon -treasurer.register_treasure("moreores:axe_silver", 0.05, 5, 1, nil, minetool) --uncommon -treasurer.register_treasure("moreores:shovel_silver", 0.05, 5, 1, nil, minetool) --uncommon +treasurer.register_treasure("default:pick_silver", 0.05, 5, 1, nil, minetool) --uncommon +treasurer.register_treasure("default:axe_silver", 0.05, 5, 1, nil, minetool) --uncommon +treasurer.register_treasure("default:shovel_silver", 0.05, 5, 1, nil, minetool) --uncommon treasurer.register_treasure("farming:hoe_bronze", 0.1, 5, 1, nil, minetool) --common treasurer.register_treasure("default:axe_steel", 0.1, 4, 1, nil, minetool) --common treasurer.register_treasure("default:shovel_stone", 0.1, 3, 1, nil, minetool) --common