Merge branch 'master' into update

master
D00Med 2017-02-01 07:46:27 +10:00 committed by GitHub
commit 9ec403a9be
2 changed files with 6 additions and 5 deletions

View File

@ -27,11 +27,12 @@ local chest_stuff = {
{name="default:diamond", max = 5},
{name="hyruletools:nyan_rupee", max = 5},
{name="twilight:crystal", max = 1},
{name="hyruletools:steel_boomerang", max = 1},
{name="hyruletools:hookshot", max = 1},
{name="clawshot:clawshot", max = 1},
{name="binoculars:binoculars", max = 1},
{name="hyruletools:classic_sword", max = 1},
{name="hyruletools:hookshot_gold", max = 1},
{name="clawshot:clawshot_gold", max = 1},
{name="hyruletools:triforce_shard", max = 1},
{name="hyruletools:boomerang_steel", max = 1},
{name="default:ice", max = 3}
}

View File

@ -211,7 +211,7 @@ else
jump = 1.0, -- multiplier to default value
gravity = 1.0, -- multiplier to default value
sneak = true, -- whether player can sneak
sneak_glitch = false, -- whether player can use the sneak glitch
sneak_glitch = true, -- whether player can use the sneak glitch
})
end--]]
@ -240,4 +240,4 @@ minetest.register_craftitem("twilight:crystal", {
return itemstack
end
end
})
})