mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-25 01:19:33 +01:00
Merge branch 'master' into compass_and_clock
This commit is contained in:
commit
7513bc600a
2 changed files with 5 additions and 2 deletions
|
@ -117,8 +117,9 @@ pumpkin_face_base_def.groups.armor_head=1
|
||||||
pumpkin_face_base_def.groups.non_combat_armor_head=1
|
pumpkin_face_base_def.groups.non_combat_armor_head=1
|
||||||
pumpkin_face_base_def._mcl_armor_mob_range_factor = 0
|
pumpkin_face_base_def._mcl_armor_mob_range_factor = 0
|
||||||
pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman"
|
pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman"
|
||||||
pumpkin_face_base_def._mcl_armor_entry = "head"
|
pumpkin_face_base_def._mcl_armor_element = "head"
|
||||||
pumpkin_face_base_def.groups.non_combat_armor=1
|
pumpkin_face_base_def._mcl_armor_texture = "mcl_farming_pumpkin_face.png"
|
||||||
|
pumpkin_face_base_def._mcl_armor_preview = "mcl_farming_pumpkin_face_preview.png"
|
||||||
if minetest.get_modpath("mcl_armor") then
|
if minetest.get_modpath("mcl_armor") then
|
||||||
pumpkin_face_base_def.on_secondary_use = mcl_armor.equip_on_use
|
pumpkin_face_base_def.on_secondary_use = mcl_armor.equip_on_use
|
||||||
end
|
end
|
||||||
|
|
|
@ -112,6 +112,8 @@ local function addhead(name, texture, desc, longdesc, rangemob, rangefactor)
|
||||||
_mcl_armor_mob_range_mob = rangemob,
|
_mcl_armor_mob_range_mob = rangemob,
|
||||||
_mcl_armor_mob_range_factor = rangefactor,
|
_mcl_armor_mob_range_factor = rangefactor,
|
||||||
_mcl_armor_element = "head",
|
_mcl_armor_element = "head",
|
||||||
|
_mcl_armor_texture = "mcl_heads_" .. name .. ".png",
|
||||||
|
_mcl_armor_preview = "mcl_heads_" .. name .. "_preview.png",
|
||||||
_mcl_blast_resistance = 1,
|
_mcl_blast_resistance = 1,
|
||||||
_mcl_hardness = 1,
|
_mcl_hardness = 1,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue