diff --git a/mods/craftingpack/crafting/init.lua b/mods/craftingpack/crafting/init.lua index 03109d6..e444caf 100644 --- a/mods/craftingpack/crafting/init.lua +++ b/mods/craftingpack/crafting/init.lua @@ -176,7 +176,7 @@ minetest.register_on_joinplayer(function(player) end) minetest.register_node("crafting:workbench", { - description = "Workbench", + description = "Crafting table", tiles = {"crafting_workbench_top.png", "default_wood.png", "crafting_workbench_side.png", "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png"}, paramtype2 = "facedir", diff --git a/mods/minetest-mod-jumping/jumping/init.lua b/mods/minetest-mod-jumping/jumping/init.lua index 7937c63..0174367 100644 --- a/mods/minetest-mod-jumping/jumping/init.lua +++ b/mods/minetest-mod-jumping/jumping/init.lua @@ -1,22 +1,3 @@ -local trampolinebox = { - type = "fixed", - fixed = { - {-0.5, -0.2, -0.5, 0.5, 0, 0.5}, - - {-0.5, -0.5, -0.5, -0.4, -0.2, -0.4}, - { 0.4, -0.5, -0.5, 0.5, -0.2, -0.4}, - { 0.4, -0.5, 0.4, 0.5, -0.2, 0.5}, - {-0.5, -0.5, 0.4, -0.4, -0.2, 0.5}, - } -} - -local cushionbox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - } -} - local trampoline_punch = function(pos, node) local id = string.sub(node.name, #node.name) id = id + 1 @@ -26,49 +7,27 @@ end for i = 1, 6 do minetest.register_node("jumping:trampoline"..i, { - description = "Trampoline", - drawtype = "nodebox", - node_box = trampolinebox, - selection_box = trampolinebox, + description = "Slime block", paramtype = "light", on_punch = trampoline_punch, tiles = { - "jumping_trampoline_top.png", - "jumping_trampoline_bottom.png", - "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png" + "slime.png", }, - groups = {dig_immediate=2, bouncy=20+i*20, fall_damage_add_percent=-70}, + drawtype = "liquid", + sunlight_propagates = true, + alpha = 190, + groups = {level=0, dig_immediate=3, oddly_breakable_by_hand=1, bouncy=20+i*20, fall_damage_add_percent=-100}, }) end -minetest.register_node("jumping:cushion", { - description = "Cushion", - drawtype = "nodebox", - node_box = cushionbox, - selection_box = cushionbox, - paramtype = "light", - tiles = { - "jumping_cushion_tb.png", - "jumping_cushion_tb.png", - "jumping_cushion_sides.png" - }, - groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100}, -}) - minetest.register_craft({ output = "jumping:trampoline1", recipe = { - {"default:wood", "default:wood", "default:wood"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} + {"mesecons_materials:glue", "mesecons_materials:glue", "mesecons_materials:glue"}, + {"mesecons_materials:glue", "mesecons_materials:glue", "mesecons_materials:glue"}, + {"mesecons_materials:glue", "mesecons_materials:glue", "mesecons_materials:glue"}, } }) -minetest.register_craft({ - output = "jumping:cushion", - recipe = { - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:leaves", "default:leaves", "default:leaves"}, - {"default:stick", "default:stick", "default:stick"} - } -}) + + diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_sides.png b/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_sides.png deleted file mode 100644 index 8c6de57..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_sides.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_tb.png b/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_tb.png deleted file mode 100644 index 09b50e8..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_cushion_tb.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_bottom.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_bottom.png deleted file mode 100644 index cd9da65..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_bottom.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides.png deleted file mode 100644 index a5f3689..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay1.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay1.png deleted file mode 100644 index aebcf05..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay1.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay2.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay2.png deleted file mode 100644 index 74f43fa..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay2.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay3.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay3.png deleted file mode 100644 index d619fcc..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay3.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay4.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay4.png deleted file mode 100644 index f1679e6..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay4.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay5.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay5.png deleted file mode 100644 index 2af894d..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay5.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay6.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay6.png deleted file mode 100644 index 3c2fa6e..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_sides_overlay6.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_top.png b/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_top.png deleted file mode 100644 index a927fdb..0000000 Binary files a/mods/minetest-mod-jumping/jumping/textures/jumping_trampoline_top.png and /dev/null differ diff --git a/mods/minetest-mod-jumping/jumping/textures/slime.png b/mods/minetest-mod-jumping/jumping/textures/slime.png new file mode 100644 index 0000000..9f43a59 Binary files /dev/null and b/mods/minetest-mod-jumping/jumping/textures/slime.png differ diff --git a/mods/minetest-mod-mesecons/mesecons/textures/jeija_glue.png b/mods/minetest-mod-mesecons/mesecons/textures/jeija_glue.png index 2f351d1..9a203fc 100644 Binary files a/mods/minetest-mod-mesecons/mesecons/textures/jeija_glue.png and b/mods/minetest-mod-mesecons/mesecons/textures/jeija_glue.png differ diff --git a/mods/sponge/init.lua b/mods/sponge/init.lua index 3df7d77..cb87802 100644 --- a/mods/sponge/init.lua +++ b/mods/sponge/init.lua @@ -2,7 +2,7 @@ minetest.register_node("sponge:sponge_wet",{ description = "Wet Sponge", tiles = {"sponge_wet.png"}, paramtype = "light", - groups = {crumbly=3, level=0, dig_immediate=1, oddly_breakable_by_hand=1} + groups = {crumbly=3, level=0, dig_immediate=3, oddly_breakable_by_hand=1} }) minetest.register_node("sponge:sponge_dry",{