From 87e517d3861b576cb908503d96363d4992378889 Mon Sep 17 00:00:00 2001 From: tchncs Date: Sun, 6 Nov 2016 20:56:35 +0100 Subject: [PATCH 01/18] update submodule homedecor_modpack --- mods/homedecor_modpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/homedecor_modpack b/mods/homedecor_modpack index 6b396cf1..8638435b 160000 --- a/mods/homedecor_modpack +++ b/mods/homedecor_modpack @@ -1 +1 @@ -Subproject commit 6b396cf1506b3a294bf476a61955ffa37eb25706 +Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828 From 4acf7e7adf267b23b2e11d26740d0b7fbcc2702e Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 8 Nov 2016 11:02:02 +0100 Subject: [PATCH 02/18] add submodule another_charcoal --- .gitmodules | 3 +++ mods/another_charcoal | 1 + 2 files changed, 4 insertions(+) create mode 160000 mods/another_charcoal diff --git a/.gitmodules b/.gitmodules index d04bd023..9eb607c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -101,3 +101,6 @@ [submodule "mods/ranks"] path = mods/ranks url = https://git.tchncs.de/Illuna-Minetest/ranks +[submodule "mods/another_charcoal"] + path = mods/another_charcoal + url = https://github.com/cx384/another_charcoal diff --git a/mods/another_charcoal b/mods/another_charcoal new file mode 160000 index 00000000..b0101ba3 --- /dev/null +++ b/mods/another_charcoal @@ -0,0 +1 @@ +Subproject commit b0101ba333c71c9c1eec850918159173e78b66f9 From 01d543f37712f75275ce0f89ff982cd786c143e5 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 8 Nov 2016 23:19:56 +0100 Subject: [PATCH 03/18] add bone and bonemeal --- mods/bonemeal/depends.txt | 2 + mods/bonemeal/init.lua | 195 ++++++++++++++++++++++++++++ mods/bonemeal/textures/bonemeal.png | Bin 0 -> 186 bytes mods/default/craftitems.lua | 5 + mods/default/nodes.lua | 8 ++ 5 files changed, 210 insertions(+) create mode 100644 mods/bonemeal/depends.txt create mode 100644 mods/bonemeal/init.lua create mode 100644 mods/bonemeal/textures/bonemeal.png diff --git a/mods/bonemeal/depends.txt b/mods/bonemeal/depends.txt new file mode 100644 index 00000000..2717befb --- /dev/null +++ b/mods/bonemeal/depends.txt @@ -0,0 +1,2 @@ +default +dye diff --git a/mods/bonemeal/init.lua b/mods/bonemeal/init.lua new file mode 100644 index 00000000..272e35bb --- /dev/null +++ b/mods/bonemeal/init.lua @@ -0,0 +1,195 @@ +-- This mod cutted out from ethereal: https://github.com/tenplus1/ethereal +-- + +minetest.register_craft({ + type = "shapeless", + output = 'default:bonemeal 4', + recipe = { + {'default:bone'}, + {'default:mese_crystal_fragment'}, + } +}) + +minetest.register_craft( { + type = "shapeless", + output = "dye:white 2", + recipe = {"default:bonemeal"}, +}) + +local plants = { + "flowers:dandelion_white", + "flowers:dandelion_yellow", + "flowers:geranium", + "flowers:rose", + "flowers:tulip", + "flowers:viola", +} + + +local crops = { + {"farming:cotton_", 8}, + {"farming:wheat_", 8}, + {"farming:tomato_", 8}, + {"farming:corn_", 8}, + {"farming:melon_", 8}, + {"farming:pumpkin_", 8}, + {"farming:beanpole_", 5}, + {"farming:blueberry_", 4}, + {"farming:raspberry_", 4}, + {"farming:carrot_", 8}, + {"farming:cocoa_", 3}, + {"farming:coffee_", 5}, + {"farming:cucumber_", 4}, + {"farming:potato_", 4}, + {"farming:grapes_", 8}, + {"farming:rhubarb_", 3}, + {"farming:barley_", 7}, +} + +-- check if sapling has enough height room to grow +local function enough_height(pos, height) + + local nod = minetest.line_of_sight( + {x = pos.x, y = pos.y + 1, z = pos.z}, + {x = pos.x, y = pos.y + height, z = pos.z}) + + if not nod then + return false -- obstructed + else + return true -- can grow + end +end + +-- growing routine +local function growth(pointed_thing) + + local pos = pointed_thing.under + local node = minetest.get_node(pos) + + if node.name == "ignore" then + return + end + + minetest.add_particlespawner({ + amount = 4, + time = 0.15, + minpos = pos, + maxpos = pos, + minvel = {x = -1, y = 2, z = -1}, + maxvel = {x = 1, y = 4, z = 1}, + minacc = {x = -1, y = -1, z = -1}, + maxacc = {x = 1, y = 1, z = 1}, + minexptime = 1, + maxexptime = 1, + minsize = 1, + maxsize = 3, + texture = "bonemeal_particle.png", + }) + + -- 50/50 chance of growing a sapling + if minetest.get_item_group(node.name, "sapling") > 0 then + + if math.random(1, 2) == 1 then + return + end + + local under = minetest.get_node({ + x = pos.x, + y = pos.y - 1, + z = pos.z + }) + + local height = minetest.registered_nodes[node.name].grown_height + + -- do we have enough height to grow sapling into tree? + if height and not enough_height(pos, height) then + return + end + + -- check for soil under sapling + if minetest.get_item_group(under.name, "soil") == 0 then + return + end + + -- grow default tree + elseif node.name == "default:sapling" + and enough_height(pos, 7) then + default.grow_new_apple_tree(pos) + + elseif node.name == "default:junglesapling" + and enough_height(pos, 15) then + default.grow_new_jungle_tree(pos) + + elseif node.name == "default:pine_sapling" + and enough_height(pos, 11) then + + if minetest.find_node_near(pos, 1, + {"default:snow", "default:snowblock", "default:dirt_with_snow"}) then + + default.grow_new_snowy_pine_tree(pos) + else + default.grow_new_pine_tree(pos) + end + + elseif node.name == "default:acacia_sapling" + and under.name == "default:sand" then + default.grow_new_acacia_tree(pos) + + elseif node.name == "default:aspen_sapling" + and enough_height(pos, 11) then + default.grow_new_aspen_tree(pos) + end + + return + end + + local stage = "" + + -- grow registered crops + for n = 1, #crops do + + if string.find(node.name, crops[n][1]) then + + stage = tonumber( node.name:split("_")[2] ) + stage = math.min(stage + math.random(1, 4), crops[n][2]) + + minetest.set_node(pos, {name = crops[n][1] .. stage}) + + return + + end + + end + + -- grow grass and flowers + if minetest.get_item_group(node.name, "soil") > 0 then + + local dirt = minetest.find_nodes_in_area_under_air( + {x = pos.x - 2, y = pos.y - 1, z = pos.z - 2}, + {x = pos.x + 2, y = pos.y + 1, z = pos.z + 2}, + {"group:soil"}) + + for _,n in pairs(dirt) do + + local pos2 = n + + pos2.y = pos2.y + 1 + + if math.random(0, 5) > 3 then + + minetest.swap_node(pos2, + {name = plants[math.random(1, #plants)]}) + else + + if node.name == "default:dirt_with_dry_grass" then + minetest.swap_node(pos2, + {name = "default:dry_grass_" .. math.random(1, 5)}) + else + minetest.swap_node(pos2, + {name = "default:grass_" .. math.random(1, 5)}) + end + + end + end + end +end diff --git a/mods/bonemeal/textures/bonemeal.png b/mods/bonemeal/textures/bonemeal.png new file mode 100644 index 0000000000000000000000000000000000000000..f141263050deb0b33da6e60aa72dc8be63378ebb GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO)b$43CSocZaRDR=BKY8 z9cn*#0;L#Bg8YIR9G=}s19BogT^vI=uKS+5&D&tW!Fu5~ufkiVB=H418m9eCpET)* zLd~25s*FFnHa9+s=@FV-yYS~q{ Date: Tue, 8 Nov 2016 23:21:45 +0100 Subject: [PATCH 04/18] default: add bone texture :cat2: --- mods/default/textures/bone.png | Bin 0 -> 148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/default/textures/bone.png diff --git a/mods/default/textures/bone.png b/mods/default/textures/bone.png new file mode 100644 index 0000000000000000000000000000000000000000..d86e7bea632b7f989a10ad21ba29f4debbe53c6a GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$66~#q=|NZvhey9x; zWGo5t3ubV5b|VeQvGjCt4B@z*oY26qj7`9h(W5|@QBb?F Date: Tue, 8 Nov 2016 23:29:54 +0100 Subject: [PATCH 05/18] bonemeal: typofix, and add missing craftitem :cat2: --- mods/bonemeal/init.lua | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/mods/bonemeal/init.lua b/mods/bonemeal/init.lua index 272e35bb..13a5e5d4 100644 --- a/mods/bonemeal/init.lua +++ b/mods/bonemeal/init.lua @@ -112,7 +112,7 @@ local function growth(pointed_thing) end -- grow default tree - elseif node.name == "default:sapling" + if node.name == "default:sapling" and enough_height(pos, 7) then default.grow_new_apple_tree(pos) @@ -193,3 +193,34 @@ local function growth(pointed_thing) end end end + +-- bonemeal item +minetest.register_craftitem("ethereal:bonemeal", { + description = S("Bone Meal"), + inventory_image = "bonemeal.png", + + on_use = function(itemstack, user, pointed_thing) + + if pointed_thing.type == "node" then + + -- Check if node protected + if minetest.is_protected(pointed_thing.under, user:get_player_name()) then + return + end + + if not minetest.setting_getbool("creative_mode") then + + local item = user:get_wielded_item() + + item:take_item() + user:set_wielded_item(item) + end + + growth(pointed_thing) + + itemstack:take_item() + + return itemstack + end + end, +}) From 432d463f0f61a0dc739b574e73d261ace1b4dce3 Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 8 Nov 2016 23:32:34 +0100 Subject: [PATCH 06/18] bonemeal: no intllib support for now --- mods/bonemeal/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/bonemeal/init.lua b/mods/bonemeal/init.lua index 13a5e5d4..30e871cd 100644 --- a/mods/bonemeal/init.lua +++ b/mods/bonemeal/init.lua @@ -195,8 +195,8 @@ local function growth(pointed_thing) end -- bonemeal item -minetest.register_craftitem("ethereal:bonemeal", { - description = S("Bone Meal"), +minetest.register_craftitem("default:bonemeal", { + description = "Bone Meal", inventory_image = "bonemeal.png", on_use = function(itemstack, user, pointed_thing) From 05123247cb59cd619321634205ac6a40944c6efd Mon Sep 17 00:00:00 2001 From: tchncs Date: Tue, 8 Nov 2016 23:40:10 +0100 Subject: [PATCH 07/18] bonemeal: add bonemeal_particle texture --- mods/bonemeal/textures/bonemeal_particle.png | Bin 0 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/bonemeal/textures/bonemeal_particle.png diff --git a/mods/bonemeal/textures/bonemeal_particle.png b/mods/bonemeal/textures/bonemeal_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..71ef90f8155d14b78236a1bb3ad25e4cdd145f8d GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1p#0(_&p3JWWQak}ZA+D*q>9!@d=~vU={e4$t zq)-PGXDkWw3ubV5b|VeQ5%Y9$4B@z*{2(ELLCKV@Z6~jS&>2<+feOa1E{1(xKotz0 Lu6{1-oD!M Date: Sat, 8 Oct 2016 18:02:14 +0100 Subject: [PATCH 08/18] creative: update to github.com/minetest/minetest_game state --- mods/creative/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/creative/init.lua b/mods/creative/init.lua index cc7f81c8..5688a7f4 100644 --- a/mods/creative/init.lua +++ b/mods/creative/init.lua @@ -125,7 +125,8 @@ creative.set_creative_formspec = function(player, start_i) tooltip[creative_clear;Reset] listring[current_player;main] ]] .. - "field[0.3,3.5;2.2,1;creative_filter;;" .. minetest.formspec_escape(inv.filter) .. ";false]" .. + "field[0.3,3.5;2.2,1;creative_filter;;" .. minetest.formspec_escape(inv.filter) .. "]" .. + "field_close_on_enter[creative_filter;false]" .. "listring[detached:creative_" .. player_name .. ";main]" .. "tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;" .. tostring(inv.tab_id) .. ";true;false]" .. "list[detached:creative_" .. player_name .. ";main;0,0;8,3;" .. tostring(start_i) .. "]" .. From 6157cfca59e0315cad160684be4c88677df272a6 Mon Sep 17 00:00:00 2001 From: tchncs Date: Thu, 10 Nov 2016 18:21:29 +0100 Subject: [PATCH 09/18] screwdriver: add diamond and mithril --- mods/screwdriver/init.lua | 48 +++++++++++++++++- .../textures/screwdriver_diamond.png | Bin 0 -> 377 bytes .../textures/screwdriver_mithril.png | Bin 0 -> 354 bytes 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 mods/screwdriver/textures/screwdriver_diamond.png create mode 100644 mods/screwdriver/textures/screwdriver_mithril.png diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index e73b618f..17c1ce16 100644 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -88,7 +88,7 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) return itemstack end --- Screwdriver +-- Screwdriver Steel minetest.register_tool("screwdriver:screwdriver", { description = "Screwdriver (left-click rotates face, right-click rotates axis)", inventory_image = "screwdriver.png", @@ -102,6 +102,33 @@ minetest.register_tool("screwdriver:screwdriver", { end, }) +-- Screwdriver Diamond +minetest.register_tool("screwdriver:screwdriver_diamond", { + description = "Screwdriver (left-click rotates face, right-click rotates axis)", + inventory_image = "screwdriver_diamond.png", + on_use = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 800) + return itemstack + end, + on_place = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS, 800) + return itemstack + end, +}) + +-- Screwdriver Mithril +minetest.register_tool("screwdriver:screwdriver_mithril", { + description = "Screwdriver (left-click rotates face, right-click rotates axis)", + inventory_image = "screwdriver_mithril.png", + on_use = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 1400) + return itemstack + end, + on_place = function(itemstack, user, pointed_thing) + screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS, 1400) + return itemstack + end, +}) minetest.register_craft({ output = "screwdriver:screwdriver", @@ -111,6 +138,25 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "screwdriver:screwdriver_diamond", + recipe = { + {"default:diamond"}, + {"group:stick"} + } +}) + +if minetest.get_modpath("moreores") then + minetest.register_craft({ + output = "screwdriver:screwdriver_mithril", + recipe = { + {"moreores:mithril_ingot"}, + {"group:stick"} + } + }) +end + + minetest.register_alias("screwdriver:screwdriver1", "screwdriver:screwdriver") minetest.register_alias("screwdriver:screwdriver2", "screwdriver:screwdriver") minetest.register_alias("screwdriver:screwdriver3", "screwdriver:screwdriver") diff --git a/mods/screwdriver/textures/screwdriver_diamond.png b/mods/screwdriver/textures/screwdriver_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe385828629465dc8b2b0c15b3187f8e8c954a5 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)2#X*k2S6pp2S=8gO65JzE@-eg0}hb`zF0%b$enUFnLmn!1a*S9echD z9R4>)%WV>mgZYcAo1eQ#9%|9sV86WUBap+B_3Ri=U+}GezgK+vtA3JUhT?X=d8r!z z>$)AILz@&22K=!1WHSJQ0{=G&KR&#&Y+k%rw7GAc6|>&-4G)YGPQUfEak-aXLAnfhlq8um3zxz?AUy z`Tza<6nze5ef|I1idkac-yeqqu1h*>@}6<;URFwu*8Kw@@Zs%odA6=SiIes|s{j4z z@_$V}{>g7dr${puclK+^$2CiQl-y+URq^n@zsDuw?CMW%c9u#p3Z)D5a`M0z1_&j4C|NQvm n4Eu*(bzNTrpDNEV^I&3lBw5)hbk)EV=ye89S3j3^P6 Date: Thu, 10 Nov 2016 23:01:37 +0100 Subject: [PATCH 10/18] update messages --- mods/random_messages/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/random_messages/init.lua b/mods/random_messages/init.lua index 6a37e39c..f042c6ba 100644 --- a/mods/random_messages/init.lua +++ b/mods/random_messages/init.lua @@ -54,6 +54,8 @@ function random_messages.read_messages() mc(mcc, "# Illuna-Notes: Enjoy Illuna? Invite your friends today!"), mc(mcc, "# Illuna-Notes: Have something to share? Join https://community.illuna-minetest.tk today!"), mc(mcc, "# Illuna-Notes: Sell and buy stuff on the Illuna marketplace. It is below the spawnhouse."), + mc(mcc, "# Illuna-Notes: Did you know? The Illuna universe contains also worlds at port 30001 and 30002."), + mc(mcc, "# Illuna-Notes: Misplaced shadow or light? Stucking water or lava? Use /mapfix to fix it!"), } end From 98987f57dc7fc3c81aa70a3444f7df089c631a33 Mon Sep 17 00:00:00 2001 From: tchncs Date: Thu, 10 Nov 2016 23:02:54 +0100 Subject: [PATCH 11/18] update submodule homedecor_modpack --- mods/homedecor_modpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/homedecor_modpack b/mods/homedecor_modpack index 8638435b..6b396cf1 160000 --- a/mods/homedecor_modpack +++ b/mods/homedecor_modpack @@ -1 +1 @@ -Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828 +Subproject commit 6b396cf1506b3a294bf476a61955ffa37eb25706 From 09b7047cde16a0d402ffeea3e8abc3ad1415ad81 Mon Sep 17 00:00:00 2001 From: tchncs Date: Thu, 10 Nov 2016 23:03:22 +0100 Subject: [PATCH 12/18] typofix :cat2: --- mods/bonemeal/init.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mods/bonemeal/init.lua b/mods/bonemeal/init.lua index 30e871cd..28f9faca 100644 --- a/mods/bonemeal/init.lua +++ b/mods/bonemeal/init.lua @@ -2,8 +2,7 @@ -- minetest.register_craft({ - type = "shapeless", - output = 'default:bonemeal 4', + output = "bonemeal:bonemeal 4", recipe = { {'default:bone'}, {'default:mese_crystal_fragment'}, @@ -195,7 +194,7 @@ local function growth(pointed_thing) end -- bonemeal item -minetest.register_craftitem("default:bonemeal", { +minetest.register_craftitem("bonemeal:bonemeal", { description = "Bone Meal", inventory_image = "bonemeal.png", From 4cbef55586d9208a60741ece3847e3c195b77b2d Mon Sep 17 00:00:00 2001 From: tchncs Date: Mon, 14 Nov 2016 10:01:31 +0100 Subject: [PATCH 13/18] update submodule mobs_redo --- mods/mobs_redo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/mobs_redo b/mods/mobs_redo index 31db77ba..9990b12a 160000 --- a/mods/mobs_redo +++ b/mods/mobs_redo @@ -1 +1 @@ -Subproject commit 31db77bab3ef8cd3f63fe1e30d301d9dd944c964 +Subproject commit 9990b12a1237e95bbf68ebc0abdf633403a64178 From 8fdd3f40e582e47fdd8b8e2feaf190cdf5b0c8fa Mon Sep 17 00:00:00 2001 From: tchncs Date: Mon, 14 Nov 2016 11:47:09 +0100 Subject: [PATCH 14/18] fix stupid cherry-pick conflict --- .gitmodules | 27 +++++++++++++++++++++++++++ mods/golems | 1 + 2 files changed, 28 insertions(+) create mode 160000 mods/golems diff --git a/.gitmodules b/.gitmodules index 9eb607c9..81bb16b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -98,9 +98,36 @@ [submodule "mods/mobs_monster"] path = mods/mobs_monster url = https://git.tchncs.de/Illuna-Minetest/mobs_monster +<<<<<<< HEAD [submodule "mods/ranks"] path = mods/ranks url = https://git.tchncs.de/Illuna-Minetest/ranks [submodule "mods/another_charcoal"] path = mods/another_charcoal url = https://github.com/cx384/another_charcoal +======= +[submodule "mods/protector"] + path = mods/protector + url = https://github.com/tenplus1/protector +[submodule "mods/irc"] + path = mods/irc + url = https://github.com/minetest-mods/irc +[submodule "mods/ethereal"] + path = mods/ethereal + url = https://git.tchncs.de/Illuna-Minetest/ethereal +[submodule "mods/technic"] + path = mods/technic + url = https://git.tchncs.de/Illuna-Minetest/technic +[submodule "mods/markers"] + path = mods/markers + url = https://github.com/Sokomine/markers +[submodule "mods/areas"] + path = mods/areas + url = https://github.com/ShadowNinja/areas +[submodule "mods/pipeworks"] + path = mods/pipeworks + url = https://github.com/minetest-mods/pipeworks/ +[submodule "mods/golems"] + path = mods/golems + url = https://git.tchncs.de/Illuna-Minetest/golems +>>>>>>> d8502f7... add submodule golems diff --git a/mods/golems b/mods/golems new file mode 160000 index 00000000..b39a9c79 --- /dev/null +++ b/mods/golems @@ -0,0 +1 @@ +Subproject commit b39a9c79f7d3cb40d285a0d9c496b1b5d62f6cad From 618af2fef549d35aed467e50a800d308b5bde181 Mon Sep 17 00:00:00 2001 From: tchncs Date: Mon, 14 Nov 2016 11:50:35 +0100 Subject: [PATCH 15/18] really fix stupid cherry-pick conflict on adding submodule golems --- .gitmodules | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.gitmodules b/.gitmodules index 81bb16b4..53cd107e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -98,36 +98,12 @@ [submodule "mods/mobs_monster"] path = mods/mobs_monster url = https://git.tchncs.de/Illuna-Minetest/mobs_monster -<<<<<<< HEAD [submodule "mods/ranks"] path = mods/ranks url = https://git.tchncs.de/Illuna-Minetest/ranks [submodule "mods/another_charcoal"] path = mods/another_charcoal url = https://github.com/cx384/another_charcoal -======= -[submodule "mods/protector"] - path = mods/protector - url = https://github.com/tenplus1/protector -[submodule "mods/irc"] - path = mods/irc - url = https://github.com/minetest-mods/irc -[submodule "mods/ethereal"] - path = mods/ethereal - url = https://git.tchncs.de/Illuna-Minetest/ethereal -[submodule "mods/technic"] - path = mods/technic - url = https://git.tchncs.de/Illuna-Minetest/technic -[submodule "mods/markers"] - path = mods/markers - url = https://github.com/Sokomine/markers -[submodule "mods/areas"] - path = mods/areas - url = https://github.com/ShadowNinja/areas -[submodule "mods/pipeworks"] - path = mods/pipeworks - url = https://github.com/minetest-mods/pipeworks/ [submodule "mods/golems"] path = mods/golems url = https://git.tchncs.de/Illuna-Minetest/golems ->>>>>>> d8502f7... add submodule golems From d249c7dd9d7af290fbf843a7a24144b52f9e2a39 Mon Sep 17 00:00:00 2001 From: tchncs Date: Mon, 14 Nov 2016 12:57:16 +0100 Subject: [PATCH 16/18] update submodule golems --- mods/golems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/golems b/mods/golems index b39a9c79..a9a7d96b 160000 --- a/mods/golems +++ b/mods/golems @@ -1 +1 @@ -Subproject commit b39a9c79f7d3cb40d285a0d9c496b1b5d62f6cad +Subproject commit a9a7d96bf40c8ba25777eed977356d631bb8f53c From 69923324fd9f410563110b3860cc1d700dc19c83 Mon Sep 17 00:00:00 2001 From: tchncs Date: Sun, 27 Nov 2016 00:35:38 +0100 Subject: [PATCH 17/18] update submodule illuna --- .gitmodules | 3 +++ mods/illuna | 2 +- mods/shadow | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 mods/shadow diff --git a/.gitmodules b/.gitmodules index 53cd107e..f26764bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -107,3 +107,6 @@ [submodule "mods/golems"] path = mods/golems url = https://git.tchncs.de/Illuna-Minetest/golems +[submodule "mods/shadow"] + path = mods/shadow + url = https://git.tchncs.de/Illuna-Minetest/shadow diff --git a/mods/illuna b/mods/illuna index 283c9f6b..6d207c93 160000 --- a/mods/illuna +++ b/mods/illuna @@ -1 +1 @@ -Subproject commit 283c9f6b143d44c3ed46f7aafc5c8e560417dc0a +Subproject commit 6d207c93d72413d17c7a952fb912d556d5bd4dbd diff --git a/mods/shadow b/mods/shadow new file mode 160000 index 00000000..2801de7a --- /dev/null +++ b/mods/shadow @@ -0,0 +1 @@ +Subproject commit 2801de7a72438b2bfbd21c476b4b386fe7b893c7 From 530b601709f0ebdca493d59ade3db9e696b25b6e Mon Sep 17 00:00:00 2001 From: tchncs Date: Sun, 4 Dec 2016 23:38:54 +0100 Subject: [PATCH 18/18] experimental: add submodule chat_bubbles :o --- .gitmodules | 3 +++ mods/chat_bubbles | 1 + 2 files changed, 4 insertions(+) create mode 160000 mods/chat_bubbles diff --git a/.gitmodules b/.gitmodules index f26764bc..d8501ade 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,3 +110,6 @@ [submodule "mods/shadow"] path = mods/shadow url = https://git.tchncs.de/Illuna-Minetest/shadow +[submodule "mods/chat_bubbles"] + path = mods/chat_bubbles + url = https://github.com/jordan4ibanez/Chat-Bubbles diff --git a/mods/chat_bubbles b/mods/chat_bubbles new file mode 160000 index 00000000..48fb8b16 --- /dev/null +++ b/mods/chat_bubbles @@ -0,0 +1 @@ +Subproject commit 48fb8b16b297d3742205ad8f430d8eb8b39cee8d