From 6be5f9555a75f40240899f7b798ec742a96b88cb Mon Sep 17 00:00:00 2001 From: Dirk Date: Thu, 31 Mar 2022 10:45:42 +0200 Subject: [PATCH] Fetch upstream --- .gitmodules | 3 --- 3d_armor | 2 +- basic_materials | 2 +- bonemeal | 2 +- farming | 2 +- i3 | 2 +- illuna_aestival/init.lua | 1 + illuna_aestival/mod.conf | 1 + illuna_aestival/src/awards.lua | 43 ++++++++++++++++++++++++++++++++++ illuna_aestival/src/nodes.lua | 2 ++ plantlife_modpack | 2 +- teleport-request | 2 +- wardrobe | 1 - 13 files changed, 54 insertions(+), 11 deletions(-) create mode 100755 illuna_aestival/src/awards.lua delete mode 160000 wardrobe diff --git a/.gitmodules b/.gitmodules index e59482f..213999f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,9 +61,6 @@ [submodule "irc"] path = irc url = ../../Illuna-Minetest/irc -[submodule "wardrobe"] - path = wardrobe - url = ../../Illuna-Minetest/wardrobe [submodule "wiki"] path = wiki url = ../../Illuna-Minetest/wiki diff --git a/3d_armor b/3d_armor index a9b8bc4..ac445a6 160000 --- a/3d_armor +++ b/3d_armor @@ -1 +1 @@ -Subproject commit a9b8bc4dddfc9c2739c3c02c40497bc7ba1a75b0 +Subproject commit ac445a6cd0e4db8ed0750b557830476ddc3c824e diff --git a/basic_materials b/basic_materials index 8631a26..800f740 160000 --- a/basic_materials +++ b/basic_materials @@ -1 +1 @@ -Subproject commit 8631a2670bbca0bf8dbc5c128cdf8cde02fbda52 +Subproject commit 800f7401613ca35d1b08e078bd79bdf100ab2343 diff --git a/bonemeal b/bonemeal index 79f9cb3..4c50a02 160000 --- a/bonemeal +++ b/bonemeal @@ -1 +1 @@ -Subproject commit 79f9cb329462d7154b974dc82e568293ddc0b0a3 +Subproject commit 4c50a02a0ee8f70aeeb3871a7a7d6bd4582ac34e diff --git a/farming b/farming index 2e90959..0b06c7c 160000 --- a/farming +++ b/farming @@ -1 +1 @@ -Subproject commit 2e90959a6c4116a99fca6915dcc7f3ccecaf4763 +Subproject commit 0b06c7cd450c5ec9a76b3c22a9c57f06e4f8a7c2 diff --git a/i3 b/i3 index 1dd742e..7e0feef 160000 --- a/i3 +++ b/i3 @@ -1 +1 @@ -Subproject commit 1dd742e88770a495867ee5d41f57d45bf46684d6 +Subproject commit 7e0feefc895950abfba9bf973688211354eb0776 diff --git a/illuna_aestival/init.lua b/illuna_aestival/init.lua index f780634..f4c6682 100755 --- a/illuna_aestival/init.lua +++ b/illuna_aestival/init.lua @@ -20,6 +20,7 @@ dofile(path .. "/portal.lua") dofile(path .. "/moreblocks.lua") dofile(path .. "/functions.lua") dofile(path .. "/farming.lua") +dofile(path .. "/awards.lua") -- to be refactored minetest.register_alias('hangglider:hangglider', 'hangglider_regular:hangglider') diff --git a/illuna_aestival/mod.conf b/illuna_aestival/mod.conf index 4921b88..f888184 100755 --- a/illuna_aestival/mod.conf +++ b/illuna_aestival/mod.conf @@ -1,2 +1,3 @@ name = illuna_aestival depends = default, hudbars, bonemeal, cloudlands, moretrees, signs_lib, shields, nether_mobs, nether, livingnether, obsidianstuff, other_worlds, sickles +optional_depends = awards, tmw_slimes, moreores diff --git a/illuna_aestival/src/awards.lua b/illuna_aestival/src/awards.lua new file mode 100755 index 0000000..1929402 --- /dev/null +++ b/illuna_aestival/src/awards.lua @@ -0,0 +1,43 @@ +-- Custom awards for the illuna_aestival server + +if minetest.get_modpath("awards") then + if minetest.get_modpath("tmw_slimes") then + awards.register_award("awards_slime_uber", { + title = "Master of slimes", + description = "Craft an uber slime.", + secret = true, + --icon = "uber_slime.png^[colorize:#FD0:200", + difficulty = 2.0, + trigger = { + type = "craft", + node = "tmw_slimes:uber_slime", + target = 1, + } + }) + -- awards.register_award("awards_slime_jungle", { + -- title = "Jungle slime", + -- description = "Craft a jungle slime.", + -- icon = "douglasie_wood.png", + -- --icon = "tmw_slime_inventory.png^[colorize:#0A1:180", + -- difficulty = 1.2, + -- trigger = { + -- type = "craft", + -- node = "tmw_slimes:jungle_slime", + -- target = 1, + -- } + -- }) + end + if minetest.get_modpath("moreores") then + awards.register_award("awards_mithril_mineral", { + title = "Mithril lays deep!", + description = "Mine your first mithril mineral.", + --icon = "awards_wow_i_am_diamonds.png^awards_level1.png", + difficulty = 1.4, + trigger = { + type = "dig", + node = "moreores:mineral_mithril", + target = 1 + } + }) + end +end diff --git a/illuna_aestival/src/nodes.lua b/illuna_aestival/src/nodes.lua index 2240d46..94c295d 100755 --- a/illuna_aestival/src/nodes.lua +++ b/illuna_aestival/src/nodes.lua @@ -394,3 +394,5 @@ minetest.register_node(":illuna:astroportal_block", { groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3}, sounds = default.node_sound_wood_defaults(), }) + +minetest.register_alias("wardrobe:wardrobe", "homedecor:wardrobe") diff --git a/plantlife_modpack b/plantlife_modpack index d3edfbe..1d71e2c 160000 --- a/plantlife_modpack +++ b/plantlife_modpack @@ -1 +1 @@ -Subproject commit d3edfbeace32e55820d82cf605439ed8abebf88f +Subproject commit 1d71e2c64ea1def5ec1b797a4d80ccb1876d7af1 diff --git a/teleport-request b/teleport-request index 40de576..c2b6f47 160000 --- a/teleport-request +++ b/teleport-request @@ -1 +1 @@ -Subproject commit 40de57687e2fcf612376ab21173fc0c9900547f0 +Subproject commit c2b6f474bf4eb982cbd8db99dbd9a80a01657ed6 diff --git a/wardrobe b/wardrobe deleted file mode 160000 index 369c088..0000000 --- a/wardrobe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 369c088067b35ee28c268ee390095db2dcf40dca