diff --git a/craftitems.lua b/craftitems.lua old mode 100644 new mode 100755 diff --git a/crafts.lua b/crafts.lua old mode 100644 new mode 100755 index 102eb80..112955f --- a/crafts.lua +++ b/crafts.lua @@ -1,4 +1,4 @@ -minetest.register_craft({ +--[[minetest.register_craft({ output = "multitest:shears", recipe = { {"default:steel_ingot", "", "default:steel_ingot"}, @@ -23,7 +23,7 @@ minetest.register_craft({ {"", "default:wood", ""}, {"multitest:handle_grip", "", "multitest:handle_grip"} } -}) +})]]-- minetest.register_craft({ output = "multitest:rubber_raw 4", @@ -111,6 +111,7 @@ minetest.register_craft({ }, }) +--[[ maintenant dans farming redo minetest.register_craft({ output = "multitest:hayblock 4", recipe = { @@ -119,6 +120,7 @@ minetest.register_craft({ {"farming:wheat", "farming:wheat", "farming:wheat"}, }, }) +--]] minetest.register_craft({ output = "multitest:checkered_floor", @@ -277,4 +279,4 @@ minetest.register_craft({ {"", "wool:white", ""}, {"", "farming:wheat", ""}, }, -}) \ No newline at end of file +}) diff --git a/depends.txt b/depends.txt old mode 100644 new mode 100755 diff --git a/fuel.lua b/fuel.lua old mode 100644 new mode 100755 diff --git a/init.lua b/init.lua old mode 100644 new mode 100755 index 748a208..00f13ba --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ multitest = {} -multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", -"dark_grey", "green", "grey", "magenta", "orange", +multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", +"dark_grey", "green", "grey", "magenta", "orange", "pink", "red", "violet", "white", "yellow"} multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green", @@ -13,7 +13,7 @@ dofile(minetest.get_modpath("multitest").."/craftitems.lua") dofile(minetest.get_modpath("multitest").."/nodes.lua") dofile(minetest.get_modpath("multitest").."/fuel.lua") -minetest.register_tool("multitest:shears", { +--[[minetest.register_tool("multitest:shears", { description = "Shears", inventory_image = "multitest_shears.png", tool_capabilities = { @@ -44,7 +44,7 @@ minetest.register_tool("multitest:stone_shears", { crumbly={times={[1]=4.00, [2]=3.00, [3]=1.50}, uses=50, maxlevel=1} } } -}) +})]]-- minetest.register_tool("multitest:scraper", { description = "Scraper", diff --git a/nodes.lua b/nodes.lua old mode 100644 new mode 100755 index 609a0e8..3044821 --- a/nodes.lua +++ b/nodes.lua @@ -24,7 +24,7 @@ minetest.register_node("multitest:blackstone_paved", { description = "Paved Blackstone", tiles = {"multitest_blackstone_paved.png"}, groups = {cracky=2, stone=1}, - sounds = default.node_sound_stone_defaults(), + sounds = default.node_sound_stone_defaults(), }) minetest.register_node("multitest:blackstone_paved", { @@ -41,6 +41,7 @@ minetest.register_node("multitest:blackstone_brick", { sounds = default.node_sound_stone_defaults(), }) +--[[ maintenant dans farming redo minetest.register_node("multitest:hayblock", { description = "Hay Bale", tiles = {"multitest_hayblock_top.png", "multitest_hayblock_top.png", "multitest_hayblock.png"}, @@ -49,6 +50,7 @@ minetest.register_node("multitest:hayblock", { sounds = default.node_sound_sand_defaults(), on_place = minetest.rotate_node }) +--]] minetest.register_node("multitest:checkered_floor", { description = "Checkered Floor", @@ -57,6 +59,7 @@ minetest.register_node("multitest:checkered_floor", { sounds = default.node_sound_stone_defaults(), }) +--[[ minetest.register_node("multitest:lamp", { description = "Lamp", tiles = {"multitest_lamp.png"}, @@ -66,6 +69,8 @@ minetest.register_node("multitest:lamp", { groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), }) +]] +minetest.register_alias("multitest:lamp", "lantern:lantern") minetest.register_node("multitest:andesite", { description = "Andesite", @@ -117,28 +122,28 @@ minetest.register_node("multitest:sandstone_carved", { }) -- stairs:stair_blackstone -stairs.register_stair_and_slab("blackstone", "multitest:blackstone", - {cracky=3, stone=1}, - {"multitest_blackstone.png"}, - "Blackstone Stairs", +stairs.register_stair_and_slab("blackstone", "multitest:blackstone", + {cracky=3, stone=1}, + {"multitest_blackstone.png"}, + "Blackstone Stairs", "Blackstone Slab", nil) -stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", - {cracky=3, stone=1}, - {"multitest_blackcobble.png"}, - "Black Cobble Stairs", +stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", + {cracky=3, stone=1}, + {"multitest_blackcobble.png"}, + "Black Cobble Stairs", "Black Cobble Slab", nil) -stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", - {cracky=3, stone=1}, - {"multitest_blackstone_brick.png"}, - "Blackstonestone brick Stairs", +stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", + {cracky=3, stone=1}, + {"multitest_blackstone_brick.png"}, + "Blackstonestone brick Stairs", "Blackstone Brick Slab", nil) -stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", - {cracky=3, stone=1}, - {"multitest_blackstone_paved.png"}, - "Paved Blackstone Stairs", +stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", + {cracky=3, stone=1}, + {"multitest_blackstone_paved.png"}, + "Paved Blackstone Stairs", "Paved Blackstone Slab", nil) -- others @@ -176,7 +181,7 @@ minetest.register_node("multitest:door_mat", { }) minetest.register_node("multitest:sponge_block", { - description = "Sponge block", + description = "Sponge Block (Decorative)", tiles = {"multitest_sponge_block.png"}, groups = {oddly_breakable_by_hand=3,}, }) diff --git a/sounds/shears.ogg b/sounds/shears.ogg old mode 100644 new mode 100755 index 198aec4..b5538a4 Binary files a/sounds/shears.ogg and b/sounds/shears.ogg differ diff --git a/textures/multitest_andesite.png b/textures/multitest_andesite.png old mode 100644 new mode 100755 index 739f0da..a01db80 Binary files a/textures/multitest_andesite.png and b/textures/multitest_andesite.png differ diff --git a/textures/multitest_andesite_smooth.png b/textures/multitest_andesite_smooth.png old mode 100644 new mode 100755 index 2fb5afa..5037d5d Binary files a/textures/multitest_andesite_smooth.png and b/textures/multitest_andesite_smooth.png differ diff --git a/textures/multitest_blackcobble.png b/textures/multitest_blackcobble.png old mode 100644 new mode 100755 index dd008d7..86c0e90 Binary files a/textures/multitest_blackcobble.png and b/textures/multitest_blackcobble.png differ diff --git a/textures/multitest_blackstone.png b/textures/multitest_blackstone.png old mode 100644 new mode 100755 index 3464c09..0035b5b Binary files a/textures/multitest_blackstone.png and b/textures/multitest_blackstone.png differ diff --git a/textures/multitest_blackstone_brick.png b/textures/multitest_blackstone_brick.png old mode 100644 new mode 100755 index d9a9ead..2f4271b Binary files a/textures/multitest_blackstone_brick.png and b/textures/multitest_blackstone_brick.png differ diff --git a/textures/multitest_blackstone_paved.png b/textures/multitest_blackstone_paved.png old mode 100644 new mode 100755 index 34d76a4..d243103 Binary files a/textures/multitest_blackstone_paved.png and b/textures/multitest_blackstone_paved.png differ diff --git a/textures/multitest_checkered_floor.png b/textures/multitest_checkered_floor.png old mode 100644 new mode 100755 index 67638bf..44850ed Binary files a/textures/multitest_checkered_floor.png and b/textures/multitest_checkered_floor.png differ diff --git a/textures/multitest_diorite.png b/textures/multitest_diorite.png old mode 100644 new mode 100755 index 8a244a1..1574305 Binary files a/textures/multitest_diorite.png and b/textures/multitest_diorite.png differ diff --git a/textures/multitest_diorite_smooth.png b/textures/multitest_diorite_smooth.png old mode 100644 new mode 100755 index 66c0bd7..34fadb0 Binary files a/textures/multitest_diorite_smooth.png and b/textures/multitest_diorite_smooth.png differ diff --git a/textures/multitest_door_mat.png b/textures/multitest_door_mat.png old mode 100644 new mode 100755 index 9b5d082..9ab4e6c Binary files a/textures/multitest_door_mat.png and b/textures/multitest_door_mat.png differ diff --git a/textures/multitest_granite.png b/textures/multitest_granite.png old mode 100644 new mode 100755 index 4a65da2..77df7ac Binary files a/textures/multitest_granite.png and b/textures/multitest_granite.png differ diff --git a/textures/multitest_granite_smooth.png b/textures/multitest_granite_smooth.png old mode 100644 new mode 100755 diff --git a/textures/multitest_handle_grip.png b/textures/multitest_handle_grip.png old mode 100644 new mode 100755 index 7ad9571..a6e0214 Binary files a/textures/multitest_handle_grip.png and b/textures/multitest_handle_grip.png differ diff --git a/textures/multitest_hayblock.png b/textures/multitest_hayblock.png old mode 100644 new mode 100755 index 34532ff..5995e1b Binary files a/textures/multitest_hayblock.png and b/textures/multitest_hayblock.png differ diff --git a/textures/multitest_hayblock_top.png b/textures/multitest_hayblock_top.png old mode 100644 new mode 100755 index 2e607ab..e417519 Binary files a/textures/multitest_hayblock_top.png and b/textures/multitest_hayblock_top.png differ diff --git a/textures/multitest_lamp.png b/textures/multitest_lamp.png old mode 100644 new mode 100755 index 339b832..9e65ae2 Binary files a/textures/multitest_lamp.png and b/textures/multitest_lamp.png differ diff --git a/textures/multitest_moss_stone.png b/textures/multitest_moss_stone.png old mode 100644 new mode 100755 index b455361..5425282 Binary files a/textures/multitest_moss_stone.png and b/textures/multitest_moss_stone.png differ diff --git a/textures/multitest_moss_stonebrick.png b/textures/multitest_moss_stonebrick.png old mode 100644 new mode 100755 diff --git a/textures/multitest_rubber.png b/textures/multitest_rubber.png old mode 100644 new mode 100755 index 4a2db62..771adef Binary files a/textures/multitest_rubber.png and b/textures/multitest_rubber.png differ diff --git a/textures/multitest_rubber_raw.png b/textures/multitest_rubber_raw.png old mode 100644 new mode 100755 index 000601f..47335b2 Binary files a/textures/multitest_rubber_raw.png and b/textures/multitest_rubber_raw.png differ diff --git a/textures/multitest_rubberblock.png b/textures/multitest_rubberblock.png old mode 100644 new mode 100755 index 7848375..e1c682b Binary files a/textures/multitest_rubberblock.png and b/textures/multitest_rubberblock.png differ diff --git a/textures/multitest_sandstone_carved.png b/textures/multitest_sandstone_carved.png old mode 100644 new mode 100755 index 15dca61..8bcd5d3 Binary files a/textures/multitest_sandstone_carved.png and b/textures/multitest_sandstone_carved.png differ diff --git a/textures/multitest_sandstone_carved_top.png b/textures/multitest_sandstone_carved_top.png old mode 100644 new mode 100755 diff --git a/textures/multitest_scraper.png b/textures/multitest_scraper.png old mode 100644 new mode 100755 index ceccc6e..a7259c5 Binary files a/textures/multitest_scraper.png and b/textures/multitest_scraper.png differ diff --git a/textures/multitest_shears.png b/textures/multitest_shears.png old mode 100644 new mode 100755 index d4c9dae..3adeb5c Binary files a/textures/multitest_shears.png and b/textures/multitest_shears.png differ diff --git a/textures/multitest_sponge_block.png b/textures/multitest_sponge_block.png old mode 100644 new mode 100755 index ad021b4..72bc023 Binary files a/textures/multitest_sponge_block.png and b/textures/multitest_sponge_block.png differ diff --git a/textures/multitest_stone_shears.png b/textures/multitest_stone_shears.png old mode 100644 new mode 100755 index 79a53f3..368dae2 Binary files a/textures/multitest_stone_shears.png and b/textures/multitest_stone_shears.png differ diff --git a/textures/multitest_wood_shears.png b/textures/multitest_wood_shears.png old mode 100644 new mode 100755 index 537669b..fabf19b Binary files a/textures/multitest_wood_shears.png and b/textures/multitest_wood_shears.png differ