Merge branch 'Ataron-diamond_textures'

2024-12-25 02:00:37 +01:00 · 2014-12-25 23:26:16 +01:00 · 2014-12-25 23:26:16 +01:00 · f3bfdacc65
commit f3bfdacc65
parent 931c706f04 ca3755ea64
28 changed files with 1 additions and 1 deletions
--- a/mods/maptools/LICENSE.txt
+++ b/mods/maptools/LICENSE.txt
--- a/mods/maptools/README.txt
+++ b/mods/maptools/README.txt
--- a/mods/maptools/_README.txt
+++ b/mods/maptools/_README.txt
--- a/mods/maptools/aliases.lua
+++ b/mods/maptools/aliases.lua
--- a/mods/maptools/default_nodes.lua
+++ b/mods/maptools/default_nodes.lua
@ -357,7 +357,7 @@ minetest.register_node("maptools:diamondblock", {
 	description = S("Unbreakable Diamond Block"),
 	range = 12,
 	stack_max = 10000,
-	tiles = {"default_steel_block.png"},
+	tiles = {"default_diamond_block.png"},
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools_creative},
 	sounds = default.node_sound_stone_defaults(),
--- a/mods/maptools/depends.txt
+++ b/mods/maptools/depends.txt
--- a/mods/maptools/init.lua
+++ b/mods/maptools/init.lua
--- a/mods/maptools/locale/es.txt
+++ b/mods/maptools/locale/es.txt
--- a/mods/maptools/locale/fr.txt
+++ b/mods/maptools/locale/fr.txt
--- a/mods/maptools/textures/black.png
+++ b/mods/maptools/textures/black.png
--- a/mods/maptools/textures/fire_basic_flame.png
+++ b/mods/maptools/textures/fire_basic_flame.png
--- a/mods/maptools/textures/fire_basic_flame_animated.png
+++ b/mods/maptools/textures/fire_basic_flame_animated.png
--- a/mods/maptools/textures/invisible.png
+++ b/mods/maptools/textures/invisible.png
--- a/mods/maptools/textures/maptools_adminpick.png
+++ b/mods/maptools/textures/maptools_adminpick.png
--- a/mods/maptools/textures/maptools_adminpick_with_drops.png
+++ b/mods/maptools/textures/maptools_adminpick_with_drops.png
--- a/mods/maptools/textures/maptools_copper_coin.png
+++ b/mods/maptools/textures/maptools_copper_coin.png
--- a/mods/maptools/textures/maptools_gold_coin.png
+++ b/mods/maptools/textures/maptools_gold_coin.png
--- a/mods/maptools/textures/maptools_grass_side_12.png
+++ b/mods/maptools/textures/maptools_grass_side_12.png
--- a/mods/maptools/textures/maptools_grass_side_4.png
+++ b/mods/maptools/textures/maptools_grass_side_4.png
--- a/mods/maptools/textures/maptools_grass_side_8.png
+++ b/mods/maptools/textures/maptools_grass_side_8.png
--- a/mods/maptools/textures/maptools_infinitefuel.png
+++ b/mods/maptools/textures/maptools_infinitefuel.png
--- a/mods/maptools/textures/maptools_silver_coin.png
+++ b/mods/maptools/textures/maptools_silver_coin.png
--- a/mods/maptools/textures/maptools_smoke.png
+++ b/mods/maptools/textures/maptools_smoke.png
--- a/mods/maptools/textures/maptools_super_apple_bottom.png
+++ b/mods/maptools/textures/maptools_super_apple_bottom.png
--- a/mods/maptools/textures/maptools_super_apple_side.png
+++ b/mods/maptools/textures/maptools_super_apple_side.png
--- a/mods/maptools/textures/maptools_super_apple_top.png
+++ b/mods/maptools/textures/maptools_super_apple_top.png
--- a/mods/maptools/textures/maptools_superapple.png
+++ b/mods/maptools/textures/maptools_superapple.png
--- a/mods/maptools/textures/white.png
+++ b/mods/maptools/textures/white.png