merge upstream

master
tchncs 2016-10-03 13:34:24 +02:00
commit 71d8d37133
5 changed files with 10 additions and 1 deletions

6
.gitmodules vendored
View File

@ -81,3 +81,9 @@
[submodule "mods/homedecor_modpack"]
path = mods/homedecor_modpack
url = https://git.tchncs.de/Illuna-Minetest/homedecor_modpack
[submodule "mods/magical_potion"]
path = mods/magical_potion
url = https://git.tchncs.de/Illuna-Minetest/magical_potion
[submodule "mods/playereffects"]
path = mods/playereffects
url = git://repo.or.cz/minetest_playereffects.git

View File

@ -3,3 +3,4 @@ bows
xdecor
3d_armor
shields
magical_potion

View File

@ -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')

1
mods/magical_potion Submodule

@ -0,0 +1 @@
Subproject commit b021ec466d42854ef1a8fd9629136c48ac3080eb

1
mods/playereffects Submodule

@ -0,0 +1 @@
Subproject commit 860358bcd1b30cbf5888588fe50d1b02dadbea43