From: Perttu Ahola Date: Sat, 3 Dec 2011 19:22:29 +0000 (+0200) Subject: More texture naming fixes X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=fd1ef116176503fda9377a6fb4193727667118f0;p=zefram%2Fminetest%2Fminetest_engine.git More texture naming fixes --- diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index 68de378c..552d78c8 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -986,13 +986,6 @@ minetest.register_node("default:ladder", { material = minetest.digprop_woodlike(0.5), }) -minetest.register_node("default:coalstone", { - tile_images = {"stone.png^mineral_coal.png"}, - inventory_image = "stone.png^mineral_coal.png", - is_ground_content = true, - material = minetest.digprop_stonelike(1.5), -}) - minetest.register_node("default:wood", { tile_images = {"default_wood.png"}, inventory_image = minetest.inventorycube("default_wood.png"), diff --git a/data/mods/default/textures/default_dungeon_master.png b/data/mods/default/textures/default_dungeon_master.png deleted file mode 100644 index 3457c822..00000000 Binary files a/data/mods/default/textures/default_dungeon_master.png and /dev/null differ diff --git a/data/mods/default/textures/default_mineral_coal.png b/data/mods/default/textures/default_mineral_coal.png deleted file mode 100644 index 3ff9692f..00000000 Binary files a/data/mods/default/textures/default_mineral_coal.png and /dev/null differ diff --git a/data/mods/default/textures/default_mineral_iron.png b/data/mods/default/textures/default_mineral_iron.png deleted file mode 100644 index 51b15d95..00000000 Binary files a/data/mods/default/textures/default_mineral_iron.png and /dev/null differ diff --git a/data/mods/legacy/init.lua b/data/mods/legacy/init.lua index e95f0e6e..61d78fd6 100644 --- a/data/mods/legacy/init.lua +++ b/data/mods/legacy/init.lua @@ -654,8 +654,8 @@ minetest.register_node(":ladder", { }) minetest.register_node(":coalstone", { - tile_images = {"stone.png^mineral_coal.png"}, - inventory_image = "stone.png^mineral_coal.png", + tile_images = {"default_stone.png^mineral_coal.png"}, + inventory_image = "default_stone.png^mineral_coal.png", is_ground_content = true, material = minetest.digprop_stonelike(1.5), }) diff --git a/data/mods/legacy/textures/dungeon_master.png b/data/mods/legacy/textures/dungeon_master.png new file mode 100644 index 00000000..3457c822 Binary files /dev/null and b/data/mods/legacy/textures/dungeon_master.png differ diff --git a/data/mods/legacy/textures/mineral_coal.png b/data/mods/legacy/textures/mineral_coal.png new file mode 100644 index 00000000..3ff9692f Binary files /dev/null and b/data/mods/legacy/textures/mineral_coal.png differ diff --git a/data/mods/legacy/textures/mineral_iron.png b/data/mods/legacy/textures/mineral_iron.png new file mode 100644 index 00000000..51b15d95 Binary files /dev/null and b/data/mods/legacy/textures/mineral_iron.png differ