merge upstream 🐱

2017-01-13 09:12:24 +01:00 · 2017-01-13 09:12:24 +01:00 · 996b93e80e
commit 996b93e80e
parent 107ff57b73 02df980c1a
2 changed files with 3 additions and 2 deletions
--- a/mods/playerskins/init.lua
+++ b/mods/playerskins/init.lua
@ -29,7 +29,8 @@ minetest.register_on_joinplayer(function(player)
        -- apply player texture
        minetest.after(1, function()
            if minetest.get_modpath("3d_armor") then
-               minetest.after(1, function(player)
+                -- FIXME: after function is a placeholder to validate function
+                minetest.after(0, function(player)
                    if not player then
                        return
                    end
--- a/mods/wardrobe
+++ b/mods/wardrobe
@ -1 +1 @@
-Subproject commit 71135fc29026647be78daa9d8f554793771d4fe6
+Subproject commit 2d50e4a1d0a8b471acbf110846bb6e187ea126b8