diff --git a/.gitmodules b/.gitmodules index d00ac2a2..ff9fffa5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "mods/xdecor"] path = mods/xdecor url = https://git.tchncs.de/Illuna-Minetest/xdecor.git -[submodule "mods/caverealms"] - path = mods/caverealms - url = https://git.tchncs.de/Illuna-Minetest/caverealms.git [submodule "mods/wardrobe"] path = mods/wardrobe url = https://git.tchncs.de/Illuna-Minetest/wardrobe.git @@ -62,9 +59,6 @@ [submodule "mods/boats"] path = mods/boats url = https://git.tchncs.de/Illuna-Minetest/boats -[submodule "mods/technic_chests"] - path = mods/technic_chests - url = https://git.tchncs.de/Illuna-Minetest/technic_chests [submodule "mods/columnia"] path = mods/columnia url = https://git.tchncs.de/Illuna-Minetest/columnia @@ -78,3 +72,33 @@ [submodule "mods/bags"] path = mods/bags url = https://git.tchncs.de/Illuna-Minetest/bags +[submodule "mods/protector"] + path = mods/protector + url = https://github.com/tenplus1/protector +[submodule "mods/technic"] + path = mods/technic + url = https://github.com/minetest-technic/technic +[submodule "mods/playereffects"] + path = mods/playereffects + url = git://repo.or.cz/minetest_playereffects.git +[submodule "mods/homedecor_modpack"] + path = mods/homedecor_modpack + url = https://git.tchncs.de/Illuna-Minetest/homedecor_modpack +[submodule "mods/xban2"] + path = mods/xban2 + url = https://github.com/minetest-mods/xban2 +[submodule "mods/magical_potion"] + path = mods/magical_potion + url = https://git.tchncs.de/Illuna-Minetest/magical_potion +[submodule "mods/loud_walking"] + path = mods/loud_walking + url = https://git.tchncs.de/Illuna-Minetest/loud_walking +[submodule "mods/dragons"] + path = mods/dragons + url = https://git.tchncs.de/Illuna-Minetest/dragons +[submodule "mods/teleport-request"] + path = mods/tps_teleport + url = https://github.com/ChaosWormz/teleport-request +[submodule "mods/areas"] + path = mods/areas + url = https://github.com/ShadowNinja/areas diff --git a/mods/areas b/mods/areas new file mode 160000 index 00000000..289d0e62 --- /dev/null +++ b/mods/areas @@ -0,0 +1 @@ +Subproject commit 289d0e623c1d383f26cbc57c94ce9a8a184bf525 diff --git a/mods/caverealms b/mods/caverealms deleted file mode 160000 index be67d107..00000000 --- a/mods/caverealms +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be67d10792ce97dfddf29dfc0fb0180a24cfd955 diff --git a/mods/darkage b/mods/darkage index 3d7d76d4..bc70e874 160000 --- a/mods/darkage +++ b/mods/darkage @@ -1 +1 @@ -Subproject commit 3d7d76d4b4becaa00bb658769fa6dde4e2eafe96 +Subproject commit bc70e87480cf5568694d95c202a3e4011d28e485 diff --git a/mods/default/init.lua b/mods/default/init.lua index 594ea36a..0f1e2c68 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -11,7 +11,7 @@ default.LIGHT_MAX = 14 -- GUI related stuff default.gui_bg = "bgcolor[#080808BB;true]" default.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" -default.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" +default.gui_slots = "listcolors[#79777639;#8EACE542;#141318;#8EACE599;#8EACE521]" function default.get_hotbar_bg(x,y) local out = "" diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 0888077f..dd54722f 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -638,8 +638,8 @@ doors.register_trapdoor("doors:trapdoor_steel", { minetest.register_craft({ output = 'doors:trapdoor 2', recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, + {'group:wood', 'group:wood', ''}, + {'group:wood', 'group:wood', ''}, {'', '', ''}, } }) diff --git a/mods/dragons b/mods/dragons new file mode 160000 index 00000000..6a9a3189 --- /dev/null +++ b/mods/dragons @@ -0,0 +1 @@ +Subproject commit 6a9a3189cd3767e06984cf295e67c6b19ac9a7ab diff --git a/mods/farming b/mods/farming index de0e7dcc..36caba64 160000 --- a/mods/farming +++ b/mods/farming @@ -1 +1 @@ -Subproject commit de0e7dcc328df01e4934378efefb0cdd7a373e38 +Subproject commit 36caba64eea3a027a9f39f7cf22b5487543fdd17 diff --git a/mods/galaxybox/README.txt b/mods/galaxybox/README.txt new file mode 100644 index 00000000..7610478f --- /dev/null +++ b/mods/galaxybox/README.txt @@ -0,0 +1,12 @@ +Galaxy Skybox +Version 1.0.0 + +A mod for Minetest. + +This mod adds a simple skybox showing a galaxy. + + +License of skybox textures: +CC-BY and CC-BY-SA - From hackcraft.de . + +License of everything else: WTFPL diff --git a/mods/galaxybox/description.txt b/mods/galaxybox/description.txt new file mode 100644 index 00000000..127ddbb7 --- /dev/null +++ b/mods/galaxybox/description.txt @@ -0,0 +1 @@ +Adds a simple galaxy skybox. diff --git a/mods/galaxybox/init.lua b/mods/galaxybox/init.lua new file mode 100644 index 00000000..1930c169 --- /dev/null +++ b/mods/galaxybox/init.lua @@ -0,0 +1,17 @@ +minetest.register_on_joinplayer(function(player) + minetest.after(0,function() + player:set_sky( + {r=0x13, g=0x01, b=0x24}, + "skybox", + { + "galaxybox_1.png^[transform6", + "galaxybox_2.png", + "galaxybox_3.png^[transform7", + "galaxybox_4.png^[transform1", + "galaxybox_5.png^[transform4", + "galaxybox_6.png", + } + ) + --player:override_day_night_ratio(0.15) + end) +end) diff --git a/mods/galaxybox/screenshot.png b/mods/galaxybox/screenshot.png new file mode 100644 index 00000000..57aae7ba Binary files /dev/null and b/mods/galaxybox/screenshot.png differ diff --git a/mods/galaxybox/textures/galaxybox_1.png b/mods/galaxybox/textures/galaxybox_1.png new file mode 100644 index 00000000..01bc5c66 Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_1.png differ diff --git a/mods/galaxybox/textures/galaxybox_2.png b/mods/galaxybox/textures/galaxybox_2.png new file mode 100644 index 00000000..215f33cf Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_2.png differ diff --git a/mods/galaxybox/textures/galaxybox_3.png b/mods/galaxybox/textures/galaxybox_3.png new file mode 100644 index 00000000..12b64ba7 Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_3.png differ diff --git a/mods/galaxybox/textures/galaxybox_4.png b/mods/galaxybox/textures/galaxybox_4.png new file mode 100644 index 00000000..91892094 Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_4.png differ diff --git a/mods/galaxybox/textures/galaxybox_5.png b/mods/galaxybox/textures/galaxybox_5.png new file mode 100644 index 00000000..3e19085c Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_5.png differ diff --git a/mods/galaxybox/textures/galaxybox_6.png b/mods/galaxybox/textures/galaxybox_6.png new file mode 100644 index 00000000..c6c4794f Binary files /dev/null and b/mods/galaxybox/textures/galaxybox_6.png differ diff --git a/mods/give_initial_stuff/depends.txt b/mods/give_initial_stuff/depends.txt index d8a81cff..9457c1dc 100644 --- a/mods/give_initial_stuff/depends.txt +++ b/mods/give_initial_stuff/depends.txt @@ -3,3 +3,4 @@ bows xdecor 3d_armor shields +magical_potion diff --git a/mods/give_initial_stuff/init.lua b/mods/give_initial_stuff/init.lua index 4ad7a1bb..c412f1e3 100644 --- a/mods/give_initial_stuff/init.lua +++ b/mods/give_initial_stuff/init.lua @@ -7,7 +7,7 @@ minetest.register_on_newplayer(function(player) player:get_inventory():add_item('main', 'default:torch 99') player:get_inventory():add_item('main', 'default:chest_locked 1') player:get_inventory():add_item('main', 'xdecor:crafting_guide 1') - player:get_inventory():add_item('main', '') + player:get_inventory():add_item('main', 'magical_potion:fly_small 2') player:get_inventory():add_item('main', 'bows:bow_wood') player:get_inventory():add_item('main', 'bows:arrow 26') player:get_inventory():add_item('main', '3d_armor:helmet_steel') diff --git a/mods/homedecor_modpack b/mods/homedecor_modpack new file mode 160000 index 00000000..8638435b --- /dev/null +++ b/mods/homedecor_modpack @@ -0,0 +1 @@ +Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828 diff --git a/mods/hudbars b/mods/hudbars index 29cf605e..ce39f64e 160000 --- a/mods/hudbars +++ b/mods/hudbars @@ -1 +1 @@ -Subproject commit 29cf605e066240a7a83be6a54f9446d43b9e2672 +Subproject commit ce39f64ea7b3cfd1488f0da42dcaad934b04334c diff --git a/mods/illuna b/mods/illuna index 60fe9391..6ef3a208 160000 --- a/mods/illuna +++ b/mods/illuna @@ -1 +1 @@ -Subproject commit 60fe9391c2f7eb5970bc5640a62ddfd69e0283f3 +Subproject commit 6ef3a208e0415449e32e4d22c31bafc65be72d0d diff --git a/mods/loud_walking b/mods/loud_walking new file mode 160000 index 00000000..0437f389 --- /dev/null +++ b/mods/loud_walking @@ -0,0 +1 @@ +Subproject commit 0437f3899417a6ef8e283cabe94e8be629395d9d diff --git a/mods/magical_potion b/mods/magical_potion new file mode 160000 index 00000000..967f2d0d --- /dev/null +++ b/mods/magical_potion @@ -0,0 +1 @@ +Subproject commit 967f2d0d5c635836fa56bdbc0d62fa5d23556959 diff --git a/mods/mobs_redo b/mods/mobs_redo index 2aa6227f..03e96f30 160000 --- a/mods/mobs_redo +++ b/mods/mobs_redo @@ -1 +1 @@ -Subproject commit 2aa6227f0a03d20a6c4733f74c46612bd33e0be1 +Subproject commit 03e96f30175dfaf34a6635de0db3f566eb68f722 diff --git a/mods/pkarcs b/mods/pkarcs index 80f9ea5c..a0281ae2 160000 --- a/mods/pkarcs +++ b/mods/pkarcs @@ -1 +1 @@ -Subproject commit 80f9ea5c64d547b15978edcd09743a866d8fbf0c +Subproject commit a0281ae20225533c9b97c676dcde8c8f4382ddbc diff --git a/mods/playereffects b/mods/playereffects new file mode 160000 index 00000000..860358bc --- /dev/null +++ b/mods/playereffects @@ -0,0 +1 @@ +Subproject commit 860358bcd1b30cbf5888588fe50d1b02dadbea43 diff --git a/mods/protector b/mods/protector new file mode 160000 index 00000000..fdbb2415 --- /dev/null +++ b/mods/protector @@ -0,0 +1 @@ +Subproject commit fdbb2415182b699786b686c59e97f8dce34d97a5 diff --git a/mods/random_messages/init.lua b/mods/random_messages/init.lua index 056e9e00..55c267f5 100644 --- a/mods/random_messages/init.lua +++ b/mods/random_messages/init.lua @@ -27,9 +27,9 @@ function table.random( t ) end function random_messages.initialize() --Set the interval in minetest.conf. - minetest.setting_set("random_messages_interval",1800) + minetest.setting_set("random_messages_interval",3600) minetest.setting_save(); - return 1800 + return 3600 end function random_messages.set_interval() --Read the interval from minetest.conf(set it if it doesn'st exist) @@ -46,12 +46,19 @@ function random_messages.check_params(name,func,params) end function random_messages.read_messages() + local mc = core.colorize + local mcc = "#A3B5CB" random_messages.messages = { - "# Illuna-Notes: Soup is very useful to fight hunger, everyone should have some.", - "# Illuna-Notes: Meet your fellows on our Mumbleserver at tchncs.de", - "# Illuna-Notes: Enjoy Illuna? Invite your friends today!", - "# Illuna-Notes: Have something to share? Create and join discussion at the Illuna forum: https://forum.illuna-minetest.tk!", - "# Illuna-Notes: Sell and buy stuff on the Illuna marketplace. It is below the spawnhouse." + mc(mcc, "# Illuna-Notes: Soup is one of the most powerful hungerfighters."), + mc(mcc, "# Illuna-Notes: Actual talk with the players on our Mumbleserver at talk.illuna.rocks"), + mc(mcc, "# Illuna-Notes: Enjoy Illuna? Invite your friends today, and tell the people about us."), + mc(mcc, "# Illuna-Notes: Have something to share? Join the community https://meet.illuna.rocks today!"), + mc(mcc, "# Illuna-Notes: Please be nice to the players around you. :)"), + mc(mcc, "# Illuna-Notes: Did you know? The Illuna universe contains servers at port 30000 and 30002 too."), + mc(mcc, "# Illuna-Notes: Misplaced shadow or light? Stuck water or lava? Use /mapfix to fix it!"), + mc(mcc, "# Illuna-Notes: You can help keeping our servers fast by dropping a small donation at https://illuna.rocks/donate <3"), + mc(mcc, "# Illuna-Notes: You can help keeping our servers fast by using as less pipes on your machines as possible."), + mc(mcc, "# Illuna-Notes: You can help keeping our servers fast by avoinig loops and using trashcans on your pipeworks system."), } end diff --git a/mods/technic b/mods/technic new file mode 160000 index 00000000..32261554 --- /dev/null +++ b/mods/technic @@ -0,0 +1 @@ +Subproject commit 322615542e570f6363c7006b90f334e9ffd722c8 diff --git a/mods/technic_chests b/mods/technic_chests deleted file mode 160000 index 5c6baef9..00000000 --- a/mods/technic_chests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5c6baef96f7d9cb79ccc6c10b670bf0078d93d55 diff --git a/mods/tps_teleport b/mods/tps_teleport new file mode 160000 index 00000000..cf663c9e --- /dev/null +++ b/mods/tps_teleport @@ -0,0 +1 @@ +Subproject commit cf663c9e754f9bfe3c44f204f7a488dcd1d9ee88 diff --git a/mods/xban2 b/mods/xban2 new file mode 160000 index 00000000..974b47f8 --- /dev/null +++ b/mods/xban2 @@ -0,0 +1 @@ +Subproject commit 974b47f8f6f9f654e9ce3e0c2cb92e45ce743bcf diff --git a/mods/xdecor b/mods/xdecor index dbef5947..9c6da347 160000 --- a/mods/xdecor +++ b/mods/xdecor @@ -1 +1 @@ -Subproject commit dbef5947bf143986bd85083c3cf1b37ba076073e +Subproject commit 9c6da3477ce01c3c369c53507d36b1fa3d6a81b5