From 790118cf67e1132f1fa82c9eba2e740ad4e7c707 Mon Sep 17 00:00:00 2001 From: crabman77 Date: Mon, 9 May 2016 00:22:32 +0200 Subject: [PATCH 1/2] update quest submodule --- mods/quests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/quests b/mods/quests index 8f10e93b..b3a5eca1 160000 --- a/mods/quests +++ b/mods/quests @@ -1 +1 @@ -Subproject commit 8f10e93bc3ff4b82400627abf552b3a5a15aa33f +Subproject commit b3a5eca1b556d80e7bb8b5ea0d83216304523873 From 211b127223b5f25a42a3b8f491437cddbac1b155 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Mon, 9 May 2016 00:25:43 +0200 Subject: [PATCH 2/2] [3d_armor] Reactivate mithril armors --- mods/3d_armor/3d_armor/armor.conf.example | 2 +- mods/3d_armor/3d_armor/armor.lua | 5 +---- mods/3d_armor/3d_armor/crafting_guide.txt | 19 +++++++++---------- mods/3d_armor/shields/crafting_guide.txt | 2 +- mods/3d_armor/shields/init.lua | 2 -- mods/3d_armor/technic_armor/init.lua | 10 ++++------ 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/mods/3d_armor/3d_armor/armor.conf.example b/mods/3d_armor/3d_armor/armor.conf.example index c6122c56..2e1149a1 100755 --- a/mods/3d_armor/3d_armor/armor.conf.example +++ b/mods/3d_armor/3d_armor/armor.conf.example @@ -9,7 +9,7 @@ ARMOR_MATERIALS = { bronze = "default:bronze_ingot", diamond = "default:diamond", gold = "default:gold_ingot", - mithril = "moreores:mithril_ingot", + mithril = "default:mithril_ingot", crystal = "ethereal:crystal_ingot", } diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua index 79d7fa75..a2fac06f 100755 --- a/mods/3d_armor/3d_armor/armor.lua +++ b/mods/3d_armor/3d_armor/armor.lua @@ -20,7 +20,7 @@ ARMOR_MATERIALS = { bronze = "default:bronze_ingot", diamond = "default:diamond", gold = "default:gold_ingot", - mithril = "moreores:mithril_ingot", + mithril = "default:mithril_ingot", crystal = "ethereal:crystal_ingot", -- Hunter armors (A déc-ommenter quand activation de l'armure au total) hardenedleather = "3d_armor:hardenedleather", @@ -59,9 +59,6 @@ if input then input:close() input = nil end -if not minetest.get_modpath("moreores") then - ARMOR_MATERIALS.mithril = nil -end if not minetest.get_modpath("ethereal") then ARMOR_MATERIALS.crystal = nil end diff --git a/mods/3d_armor/3d_armor/crafting_guide.txt b/mods/3d_armor/3d_armor/crafting_guide.txt index abd1519b..2086f8cd 100755 --- a/mods/3d_armor/3d_armor/crafting_guide.txt +++ b/mods/3d_armor/3d_armor/crafting_guide.txt @@ -17,8 +17,8 @@ Helmets: [3d_armor:helmet_bronze] X = [default:bronze_ingot] [3d_armor:helmet_diamond] X = [default:diamond] [3d_armor:helmet_gold] X = [default:gold_ingot] -[3d_armor:helmet_mithril] X = [moreores:mithril_ingot] * -[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:helmet_mithril] X = [default:mithril_ingot] +[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] * Chestplates: @@ -36,8 +36,8 @@ Chestplates: [3d_armor:chestplate_bronze] X = [default:bronze_ingot] [3d_armor:chestplate_diamond] X = [default:diamond] [3d_armor:chestplate_gold] X = [default:gold_ingot] -[3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] * -[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:chestplate_mithril] X = [default:mithril_ingot] +[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] * Leggings: @@ -55,8 +55,8 @@ Leggings: [3d_armor:leggings_bronze] X = [default:bronze_ingot] [3d_armor:leggings_diamond] X = [default:diamond] [3d_armor:leggings_gold] X = [default:gold_ingot] -[3d_armor:leggings_mithril] X = [moreores:mithril_ingot] * -[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:leggings_mithril] X = [default:mithril_ingot] +[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] * Boots: @@ -72,8 +72,7 @@ Boots: [3d_armor:boots_bronze] X = [default:bronze_ingot [3d_armor:boots_diamond] X = [default:diamond] [3d_armor:boots_gold] X = [default:gold_ingot] -[3d_armor:boots_mithril] X = [moreores:mithril_ingot] * -[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] ** +[3d_armor:boots_mithril] X = [default:mithril_ingot] +[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] * - * Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549 -** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal + * Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal diff --git a/mods/3d_armor/shields/crafting_guide.txt b/mods/3d_armor/shields/crafting_guide.txt index 9b61dde2..651d94cf 100755 --- a/mods/3d_armor/shields/crafting_guide.txt +++ b/mods/3d_armor/shields/crafting_guide.txt @@ -15,7 +15,7 @@ Shields -- Crafting Guide [shields:shield_bronze] X = [default:bronze_ingot] [shields:shield_diamond] X = [default:diamond] [shields:shield_gold] X = [default:gold_ingot] -[shields:shield_mithril] X = [moreores:mithril_ingot] +[shields:shield_mithril] X = [default:mithril_ingot] [shields:shield_crystal] X = [ethereal:crystal_ingot] Enhanced Shields diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua index fb5e7bd3..a24d523f 100755 --- a/mods/3d_armor/shields/init.lua +++ b/mods/3d_armor/shields/init.lua @@ -1,5 +1,3 @@ -local use_moreores = minetest.get_modpath("moreores") - -- Regisiter Shields minetest.register_tool("shields:shield_admin", { diff --git a/mods/3d_armor/technic_armor/init.lua b/mods/3d_armor/technic_armor/init.lua index f08ecd91..96cc4999 100755 --- a/mods/3d_armor/technic_armor/init.lua +++ b/mods/3d_armor/technic_armor/init.lua @@ -11,12 +11,10 @@ if minetest.get_modpath("technic") then carbon="technic:carbon_steel_ingot", stainless="technic:stainless_steel_ingot", } - if minetest.get_modpath("moreores") then - stats.tin = { name="Tin", armor=1.6, heal=0, use=750 } - stats.silver = { name="Silver", armor=1.8, heal=0, use=650 } - mats.tin = "moreores:tin_ingot" - mats.silver = "moreores:silver_ingot" - end + stats.tin = { name="Tin", armor=1.6, heal=0, use=750 } + stats.silver = { name="Silver", armor=1.8, heal=0, use=650 } + mats.tin = "default:tin_ingot" + mats.silver = "default:silver_ingot" for k, v in pairs(stats) do minetest.register_tool("technic_armor:helmet_"..k, {