Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-03 17:41:55 +02:00
commit 949ea0c796
2 changed files with 9 additions and 3 deletions

@ -101,14 +101,13 @@ Copyright (C) 2014 Justin Aquadro (MIT):
textures/drawers_upgrade_gold.png
textures/drawers_upgrade_iron.png
textures/drawers_upgrade_obsidian.png
textures/drawers_upgrade_slot_bg.png (edited by LNJ, 2017)
textures/drawers_upgrade_steel.png
drawers_upgrade_template.png
textures/drawers_upgrade_slot_bg.png (extracted from gui/drawers_1.png by LNJ <git@lnj.li>)
textures/drawers_upgrade_template.png
textures/drawers_wood_front_1.png
textures/drawers_wood_front_2.png
textures/drawers_wood_front_4.png
textures/drawers_wood.png
textures/drawers_upgrade_slot_bg.png (extracted from gui/drawers_1.png by LNJ <git@lnj.li>)
Everything not listed in here:
Copyright (C) 2017 LNJ <git@lnj.li> (MIT)

@ -363,6 +363,13 @@ core.register_lbm({
nodenames = {"group:drawer"},
run_at_every_load = true,
action = function(pos, node)
local meta = core.get_meta(pos)
-- create drawer upgrade inventory
meta:get_inventory():set_size("upgrades", 5)
-- set the formspec
meta:set_string("formspec", drawers.drawer_formspec)
-- count the drawer visuals
local drawerType = core.registered_nodes[node.name].groups.drawer
local foundVisuals = 0
local objs = core.get_objects_inside_radius(pos, 0.537)