resolve mergeconflicts
This commit is contained in:
@@ -1,3 +0,0 @@
|
||||
default
|
||||
illuna
|
||||
magical_potion
|
@@ -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"
|
||||
|
||||
|
3
mods/give_initial_stuff/mod.conf
Normal file
3
mods/give_initial_stuff/mod.conf
Normal file
@@ -0,0 +1,3 @@
|
||||
name = give_initial_stuff
|
||||
description = Minetest Game mod: give_initial_stuff
|
||||
depends = default, illuna, magical_potion
|
Reference in New Issue
Block a user