diff --git a/mods/moretrees/.gitignore b/mods/moretrees/.gitignore old mode 100755 new mode 100644 diff --git a/mods/moretrees/LICENSE b/mods/moretrees/LICENSE old mode 100755 new mode 100644 diff --git a/mods/moretrees/README.md b/mods/moretrees/README.md old mode 100755 new mode 100644 diff --git a/mods/moretrees/biome_defs.lua b/mods/moretrees/biome_defs.lua old mode 100755 new mode 100644 diff --git a/mods/moretrees/crafts.lua b/mods/moretrees/crafts.lua old mode 100755 new mode 100644 diff --git a/mods/moretrees/default_settings.txt b/mods/moretrees/default_settings.txt old mode 100755 new mode 100644 diff --git a/mods/moretrees/depends.txt b/mods/moretrees/depends.txt old mode 100755 new mode 100644 diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua old mode 100755 new mode 100644 diff --git a/mods/moretrees/leafdecay.lua b/mods/moretrees/leafdecay.lua old mode 100755 new mode 100644 diff --git a/mods/moretrees/locale/de.txt b/mods/moretrees/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/moretrees/locale/template.txt b/mods/moretrees/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/moretrees/node_defs.lua b/mods/moretrees/node_defs.lua old mode 100755 new mode 100644 index 9f3095d9..649a8daa --- a/mods/moretrees/node_defs.lua +++ b/mods/moretrees/node_defs.lua @@ -30,12 +30,10 @@ local dirs2 = { 12, 9, 18, 7, 12 } local dirs3 = { 14, 11, 16, 5, 14 } local moretrees_new_leaves_drawtype = "allfaces_optional" -local moretrees_new_leaves_extension = ".png" local moretrees_plantlike_leaves_visual_scale = 1 if moretrees.plantlike_leaves then moretrees_new_leaves_drawtype = "plantlike" - moretrees_new_leaves_extension = "_plantlike.png" moretrees_plantlike_leaves_visual_scale = 1.189 end @@ -50,8 +48,7 @@ if moretrees.plantlike_leaves then minetest.override_item("default:leaves", { inventory_image = minetest.inventorycube("default_leaves.png"), drawtype = "plantlike", - visual_scale = 1.189, - tiles = { "default_leaves_plantlike.png" } + visual_scale = 1.189 }) else minetest.override_item("default:leaves", { @@ -70,8 +67,7 @@ if moretrees.plantlike_leaves then minetest.override_item("default:jungleleaves", { inventory_image = minetest.inventorycube("default_jungleleaves.png"), drawtype = "plantlike", - visual_scale = 1.189, - tiles = { "default_jungleleaves_plantlike.png" } + visual_scale = 1.189 }) else minetest.override_item("default:jungleleaves", { @@ -169,7 +165,7 @@ for i in ipairs(moretrees.treelist) do drawtype = moretrees_new_leaves_drawtype, waving = moretrees_new_leaves_waving, visual_scale = moretrees_plantlike_leaves_visual_scale, - tiles = { "moretrees_"..treename.."_leaves"..moretrees_new_leaves_extension }, + tiles = { "moretrees_"..treename.."_leaves.png" }, inventory_image = moretrees_leaves_inventory_image, paramtype = "light", groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1}, @@ -314,7 +310,7 @@ for color = 1, 3 do drawtype = moretrees_new_leaves_drawtype, waving = moretrees_new_leaves_waving, visual_scale = moretrees_plantlike_leaves_visual_scale, - tiles = {"moretrees_jungletree_leaves_"..jungleleaves[color]..moretrees_new_leaves_extension}, + tiles = {"moretrees_jungletree_leaves_"..jungleleaves[color]..".png"}, inventory_image = moretrees_leaves_inventory_image, paramtype = "light", groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1}, @@ -342,7 +338,7 @@ minetest.register_node("moretrees:fir_leaves_bright", { waving = moretrees_new_leaves_waving, visual_scale = moretrees_plantlike_leaves_visual_scale, description = S("Douglas Fir Leaves (Bright)"), - tiles = { "moretrees_fir_leaves_bright"..moretrees_new_leaves_extension }, + tiles = { "moretrees_fir_leaves_bright.png" }, inventory_image = moretrees_leaves_inventory_image, paramtype = "light", groups = {snappy=3, flammable=2, leaves=1, moretrees_leaves=1 }, diff --git a/mods/moretrees/saplings.lua b/mods/moretrees/saplings.lua old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/default_jungleleaves_plantlike.png b/mods/moretrees/textures/default_jungleleaves_plantlike.png deleted file mode 100755 index ad3e3e4f..00000000 Binary files a/mods/moretrees/textures/default_jungleleaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/default_leaves_plantlike.png b/mods/moretrees/textures/default_leaves_plantlike.png deleted file mode 100755 index 7d93edeb..00000000 Binary files a/mods/moretrees/textures/default_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_acacia_leaves.png b/mods/moretrees/textures/moretrees_acacia_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acacia_leaves_plantlike.png b/mods/moretrees/textures/moretrees_acacia_leaves_plantlike.png deleted file mode 100755 index 6c26b32d..00000000 Binary files a/mods/moretrees/textures/moretrees_acacia_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_acacia_sapling.png b/mods/moretrees/textures/moretrees_acacia_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acacia_trunk.png b/mods/moretrees/textures/moretrees_acacia_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acacia_trunk_top.png b/mods/moretrees/textures/moretrees_acacia_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acacia_wood.png b/mods/moretrees/textures/moretrees_acacia_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acorn.png b/mods/moretrees/textures/moretrees_acorn.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acorn_muffin.png b/mods/moretrees/textures/moretrees_acorn_muffin.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_acorn_muffin_batter.png b/mods/moretrees/textures/moretrees_acorn_muffin_batter.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_apple_tree_leaves.png b/mods/moretrees/textures/moretrees_apple_tree_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_apple_tree_leaves_plantlike.png b/mods/moretrees/textures/moretrees_apple_tree_leaves_plantlike.png deleted file mode 100755 index b08582bd..00000000 Binary files a/mods/moretrees/textures/moretrees_apple_tree_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_apple_tree_sapling.png b/mods/moretrees/textures/moretrees_apple_tree_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_apple_tree_trunk.png b/mods/moretrees/textures/moretrees_apple_tree_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_apple_tree_trunk_top.png b/mods/moretrees/textures/moretrees_apple_tree_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_apple_tree_wood.png b/mods/moretrees/textures/moretrees_apple_tree_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_beech_leaves.png b/mods/moretrees/textures/moretrees_beech_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_beech_leaves_plantlike.png b/mods/moretrees/textures/moretrees_beech_leaves_plantlike.png deleted file mode 100755 index 7d93edeb..00000000 Binary files a/mods/moretrees/textures/moretrees_beech_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_beech_sapling.png b/mods/moretrees/textures/moretrees_beech_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_beech_trunk.png b/mods/moretrees/textures/moretrees_beech_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_beech_trunk_top.png b/mods/moretrees/textures/moretrees_beech_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_beech_wood.png b/mods/moretrees/textures/moretrees_beech_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_birch_leaves.png b/mods/moretrees/textures/moretrees_birch_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_birch_leaves_plantlike.png b/mods/moretrees/textures/moretrees_birch_leaves_plantlike.png deleted file mode 100755 index 0633d79d..00000000 Binary files a/mods/moretrees/textures/moretrees_birch_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_birch_sapling.png b/mods/moretrees/textures/moretrees_birch_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_birch_trunk.png b/mods/moretrees/textures/moretrees_birch_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_birch_trunk_top.png b/mods/moretrees/textures/moretrees_birch_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_birch_wood.png b/mods/moretrees/textures/moretrees_birch_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_coconut.png b/mods/moretrees/textures/moretrees_coconut.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_coconut_milk.png b/mods/moretrees/textures/moretrees_coconut_milk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_coconut_milk_inv.png b/mods/moretrees/textures/moretrees_coconut_milk_inv.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_cone.png b/mods/moretrees/textures/moretrees_fir_cone.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_leaves.png b/mods/moretrees/textures/moretrees_fir_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_leaves_bright.png b/mods/moretrees/textures/moretrees_fir_leaves_bright.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_leaves_bright_plantlike.png b/mods/moretrees/textures/moretrees_fir_leaves_bright_plantlike.png deleted file mode 100755 index 9ecc81ce..00000000 Binary files a/mods/moretrees/textures/moretrees_fir_leaves_bright_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_fir_leaves_plantlike.png b/mods/moretrees/textures/moretrees_fir_leaves_plantlike.png deleted file mode 100755 index e80836f3..00000000 Binary files a/mods/moretrees/textures/moretrees_fir_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_fir_nuts.png b/mods/moretrees/textures/moretrees_fir_nuts.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_sapling.png b/mods/moretrees/textures/moretrees_fir_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_trunk.png b/mods/moretrees/textures/moretrees_fir_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_trunk_top.png b/mods/moretrees/textures/moretrees_fir_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_fir_wood.png b/mods/moretrees/textures/moretrees_fir_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_green.png b/mods/moretrees/textures/moretrees_jungletree_leaves_green.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_green_plantlike.png b/mods/moretrees/textures/moretrees_jungletree_leaves_green_plantlike.png deleted file mode 100755 index 9c482f26..00000000 Binary files a/mods/moretrees/textures/moretrees_jungletree_leaves_green_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_red.png b/mods/moretrees/textures/moretrees_jungletree_leaves_red.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_red_plantlike.png b/mods/moretrees/textures/moretrees_jungletree_leaves_red_plantlike.png deleted file mode 100755 index a137954b..00000000 Binary files a/mods/moretrees/textures/moretrees_jungletree_leaves_red_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_yellow.png b/mods/moretrees/textures/moretrees_jungletree_leaves_yellow.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_jungletree_leaves_yellow_plantlike.png b/mods/moretrees/textures/moretrees_jungletree_leaves_yellow_plantlike.png deleted file mode 100755 index e02217c6..00000000 Binary files a/mods/moretrees/textures/moretrees_jungletree_leaves_yellow_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_oak_leaves.png b/mods/moretrees/textures/moretrees_oak_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_oak_leaves_plantlike.png b/mods/moretrees/textures/moretrees_oak_leaves_plantlike.png deleted file mode 100755 index d9009285..00000000 Binary files a/mods/moretrees/textures/moretrees_oak_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_oak_sapling.png b/mods/moretrees/textures/moretrees_oak_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_oak_trunk.png b/mods/moretrees/textures/moretrees_oak_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_oak_trunk_top.png b/mods/moretrees/textures/moretrees_oak_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_oak_wood.png b/mods/moretrees/textures/moretrees_oak_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_palm_leaves.png b/mods/moretrees/textures/moretrees_palm_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_palm_leaves_plantlike.png b/mods/moretrees/textures/moretrees_palm_leaves_plantlike.png deleted file mode 100755 index 6dcf65c3..00000000 Binary files a/mods/moretrees/textures/moretrees_palm_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_palm_sapling.png b/mods/moretrees/textures/moretrees_palm_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_palm_trunk.png b/mods/moretrees/textures/moretrees_palm_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_palm_trunk_top.png b/mods/moretrees/textures/moretrees_palm_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_palm_wood.png b/mods/moretrees/textures/moretrees_palm_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_cone.png b/mods/moretrees/textures/moretrees_pine_cone.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_leaves.png b/mods/moretrees/textures/moretrees_pine_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_leaves_plantlike.png b/mods/moretrees/textures/moretrees_pine_leaves_plantlike.png deleted file mode 100755 index 1264e1aa..00000000 Binary files a/mods/moretrees/textures/moretrees_pine_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_pine_nuts.png b/mods/moretrees/textures/moretrees_pine_nuts.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_sapling.png b/mods/moretrees/textures/moretrees_pine_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_trunk.png b/mods/moretrees/textures/moretrees_pine_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_trunk_top.png b/mods/moretrees/textures/moretrees_pine_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_pine_wood.png b/mods/moretrees/textures/moretrees_pine_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_raw_coconut.png b/mods/moretrees/textures/moretrees_raw_coconut.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_leaves.png b/mods/moretrees/textures/moretrees_rubber_tree_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_leaves_plantlike.png b/mods/moretrees/textures/moretrees_rubber_tree_leaves_plantlike.png deleted file mode 100755 index 476393bd..00000000 Binary files a/mods/moretrees/textures/moretrees_rubber_tree_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_rubber_tree_sapling.png b/mods/moretrees/textures/moretrees_rubber_tree_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk_empty.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk_empty.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_trunk_top.png b/mods/moretrees/textures/moretrees_rubber_tree_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_rubber_tree_wood.png b/mods/moretrees/textures/moretrees_rubber_tree_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_sequoia_leaves.png b/mods/moretrees/textures/moretrees_sequoia_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_sequoia_leaves_plantlike.png b/mods/moretrees/textures/moretrees_sequoia_leaves_plantlike.png deleted file mode 100755 index 6321be82..00000000 Binary files a/mods/moretrees/textures/moretrees_sequoia_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_sequoia_sapling.png b/mods/moretrees/textures/moretrees_sequoia_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_sequoia_trunk.png b/mods/moretrees/textures/moretrees_sequoia_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_sequoia_trunk_top.png b/mods/moretrees/textures/moretrees_sequoia_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_sequoia_wood.png b/mods/moretrees/textures/moretrees_sequoia_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_cone.png b/mods/moretrees/textures/moretrees_spruce_cone.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_leaves.png b/mods/moretrees/textures/moretrees_spruce_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_leaves_plantlike.png b/mods/moretrees/textures/moretrees_spruce_leaves_plantlike.png deleted file mode 100755 index e80836f3..00000000 Binary files a/mods/moretrees/textures/moretrees_spruce_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_spruce_nuts.png b/mods/moretrees/textures/moretrees_spruce_nuts.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_sapling.png b/mods/moretrees/textures/moretrees_spruce_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_trunk.png b/mods/moretrees/textures/moretrees_spruce_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_trunk_top.png b/mods/moretrees/textures/moretrees_spruce_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_spruce_wood.png b/mods/moretrees/textures/moretrees_spruce_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_willow_leaves.png b/mods/moretrees/textures/moretrees_willow_leaves.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_willow_leaves_plantlike.png b/mods/moretrees/textures/moretrees_willow_leaves_plantlike.png deleted file mode 100755 index ae612059..00000000 Binary files a/mods/moretrees/textures/moretrees_willow_leaves_plantlike.png and /dev/null differ diff --git a/mods/moretrees/textures/moretrees_willow_sapling.png b/mods/moretrees/textures/moretrees_willow_sapling.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_willow_trunk.png b/mods/moretrees/textures/moretrees_willow_trunk.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_willow_trunk_top.png b/mods/moretrees/textures/moretrees_willow_trunk_top.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/textures/moretrees_willow_wood.png b/mods/moretrees/textures/moretrees_willow_wood.png old mode 100755 new mode 100644 diff --git a/mods/moretrees/tree_biomes.txt b/mods/moretrees/tree_biomes.txt old mode 100755 new mode 100644 diff --git a/mods/moretrees/tree_models.lua b/mods/moretrees/tree_models.lua old mode 100755 new mode 100644