Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev

Vanessa Ezekowitz

2013-04-15 3e36899e11bfabaa78f7c9a8bee2eb65ba708ce9

Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev

 item_drop/init.lua

@@ -8,7 +8,7 @@
        for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
            if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
                if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
                    if object:get_luaentity().timer > time_pick then
                    if object:get_luaentity() and object:get_luaentity().timer > time_pick then
                        inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
                        if object:get_luaentity().itemstring ~= "" then
                            minetest.sound_play("item_drop_pickup", {
@@ -137,4 +137,4 @@
    end
end)
]]--
print("DROPS LOADED!")
print("DROPS LOADED!")