summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-08-14 04:52:46 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-08-14 04:52:46 -0400
commit3f738369862a2f187ea3a53cdd3e8448df19a904 (patch)
tree30a8c93bd2d82af69dc9308529c33e36ebc0edfc
parent92f49e3096dc37b9b802994d287c47dc7f583c24 (diff)
downloaddreambuilder_modpack-3f738369862a2f187ea3a53cdd3e8448df19a904.tar
dreambuilder_modpack-3f738369862a2f187ea3a53cdd3e8448df19a904.tar.gz
dreambuilder_modpack-3f738369862a2f187ea3a53cdd3e8448df19a904.tar.bz2
dreambuilder_modpack-3f738369862a2f187ea3a53cdd3e8448df19a904.tar.xz
dreambuilder_modpack-3f738369862a2f187ea3a53cdd3e8448df19a904.zip
update unified inventory and boost_carts
-rw-r--r--boost_cart/init.lua5
-rw-r--r--unified_inventory/register.lua4
2 files changed, 4 insertions, 5 deletions
diff --git a/boost_cart/init.lua b/boost_cart/init.lua
index 2298516..42d3533 100644
--- a/boost_cart/init.lua
+++ b/boost_cart/init.lua
@@ -24,7 +24,8 @@ end
dofile(boost_cart.modpath.."/functions.lua")
dofile(boost_cart.modpath.."/rails.lua")
-if minetest.global_exists(mesecon) then
+local HAVE_MESECONS_ENABLED = minetest.global_exists("mesecon")
+if HAVE_MESECONS_ENABLED then
dofile(boost_cart.modpath.."/detector.lua")
end
@@ -279,7 +280,7 @@ function boost_cart.cart:on_step(dtime)
new_acc = vector.multiply(dir, acc)
end
- if mesecon then
+ if HAVE_MESECONS_ENABLED then
boost_cart:signal_detector_rail(vector.round(pos))
end
diff --git a/unified_inventory/register.lua b/unified_inventory/register.lua
index cc789a7..978646b 100644
--- a/unified_inventory/register.lua
+++ b/unified_inventory/register.lua
@@ -228,8 +228,6 @@ unified_inventory.register_page("craftguide", {
formspec = formspec.."listcolors[#00000000;#00000000]"
local item_name = unified_inventory.current_item[player_name]
if not item_name then return {formspec=formspec} end
- local displayed_name = minetest.registered_items[item_name].description
- if not displayed_name then displayed_name = item_name end
local dir = unified_inventory.current_craft_direction[player_name]
local rdir
@@ -245,7 +243,7 @@ unified_inventory.register_page("craftguide", {
formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]"
formspec = formspec.."textarea["..craftresultx..","..craftresulty
- ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..displayed_name)..";]"
+ ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..item_name)..";]"
formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_"
.. rdir .. "_", ItemStack(item_name))