summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-06-03 17:41:55 +0200
committerWeblate <noreply@weblate.org>2017-06-03 17:41:55 +0200
commit949ea0c7963a78f5ce9ff2e7bcada9e4a97c6162 (patch)
tree98d0013008d3a3ddd81974d24de1e2c999bac640
parentddd94e25c4d7c443395613453d9a4c3d127dec8e (diff)
parenteb8d2dfd3850260242c41c9942fe58f9d6bf6b21 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--LICENSE.txt5
-rwxr-xr-xlua/visual.lua7
2 files changed, 9 insertions, 3 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index d9a36f0..c01553f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -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)
diff --git a/lua/visual.lua b/lua/visual.lua
index 3287f65..db0f570 100755
--- a/lua/visual.lua
+++ b/lua/visual.lua
@@ -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)