diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100755 index f48b1599..00000000 --- a/.dir-locals.el +++ /dev/null @@ -1,4 +0,0 @@ -((nil . ((indent-tabs-mode . t) - (tab-width . 3))) - (lua-mode . ( - (eval . (highlight-regexp "^ *"))))) diff --git a/.gitignore b/.gitignore index 879a1f18..4aa6cf2a 100755 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ *.patch *.swp *.diff +#* +*.old +.dir-locals.el diff --git a/mods/nalc/nodes.lua b/mods/nalc/nodes.lua index 83acd455..edd16d70 100644 --- a/mods/nalc/nodes.lua +++ b/mods/nalc/nodes.lua @@ -262,7 +262,7 @@ minetest.register_node( post_effect_color = {a = 250, r = 0, g = 0, b = 0}, groups = {liquid = 3, not_in_creative_inventory = 1}, }) -minetest.register_alias("default:acid_flowing", "nalc:acid_flowing") +minetest.register_alias("default:sand_flowing", "nalc:sand_flowing") -- -- Tools / "Advanced" crafting / Non-"natural" diff --git a/mods/zombie/#init.lua.old# b/mods/zombie/#init.lua.old# deleted file mode 100644 index 9877e543..00000000 --- a/mods/zombie/#init.lua.old# +++ /dev/null @@ -1,56 +0,0 @@ - --- Zombie by BlockMen - -mobs:register_mob("zombie:zombie", { - type = "monster", - passive = false, - attack_type = "dogfight", - damage = 3, - hp_min = 12, - hp_max = 35, - armor = 150, - collisionbox = {-0.25, -1, -0.3, 0.25, 0.75, 0.3}, - visual = "mesh", - mesh = "creatures_mob.x", - textures = { - {"mobs_zombie.png"}, - }, - visual_size = {x=1, y=1}, - makes_footstep_sound = true, - sounds = { - random = "mobs_zombie.1", - damage = "mobs_zombie_hit", - attack = "mobs_zombie.3", - death = "mobs_zombie_death", - }, - walk_velocity = 0.5, - run_velocity = 0.5, - jump = true, - floats = 0, - view_range = 10, - drops = { - {name = "zombie:rotten_flesh", - chance = 2, min = 3, max = 5,}, - }, - water_damage = 0, - lava_damage = 1, - light_damage = 0, - animation = { - speed_normal = 10, speed_run = 15, - stand_start = 0, stand_end = 79, - walk_start = 168, walk_end = 188, - run_start = 168, run_end = 188, --- punch_start = 168, punch_end = 188, - }, -}) - ---name, nodes, neighbours, minlight, maxlight, interval, chance, active_object_count, min_height, max_height -mobs:register_spawn("zombie:zombie", {"default:stone", "default:dirt_with_grass"}, 5, 0, 1, 1, 31000) - -mobs:register_egg("zombie:zombie", "Zombie", "zombie_head.png", 0) - -minetest.register_craftitem("zombie:rotten_flesh", { - description = "Rotten Flesh", - inventory_image = "mobs_rotten_flesh.png", - on_use = minetest.item_eat(1), -})