resolve mergeconflicts

2020-08-17 22:07:15 +02:00 · 2020-08-17 22:07:15 +02:00 · 029ab5aa0c
commit 029ab5aa0c
parent f0b62e1c7b 686fdb5c06
488 changed files with 9848 additions and 2154 deletions
--- a/mods/give_initial_stuff/depends.txt
+++ b/mods/give_initial_stuff/depends.txt
@ -1,3 +0,0 @@
-default
-illuna
-magical_potion
--- a/mods/give_initial_stuff/init.lua
+++ b/mods/give_initial_stuff/init.lua
@ -1,3 +1,5 @@
+-- gave_initial_stuff/init.lua
+
 local stuff_string = minetest.settings:get("initial_stuff") or
 		"illuna:noobcoin 42,magical_potion:fly_small 2"

--- a/mods/give_initial_stuff/mod.conf
+++ b/mods/give_initial_stuff/mod.conf
@ -0,0 +1,3 @@
+name = give_initial_stuff
+description = Minetest Game mod: give_initial_stuff
+depends = default, illuna, magical_potion