From cc7e1271beac599a4807daaf0999015225e78a2c Mon Sep 17 00:00:00 2001 From: Foz Date: Fri, 29 Dec 2017 17:41:17 -0500 Subject: [PATCH] Revert "Undo adding glass detail, but leave the colorizing" This reverts commit 281268e7bc991a46b0d609d2ae5290aec12833d1. The commit needs to be reverted because it prevents connected glass. --- nodes.lua | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nodes.lua b/nodes.lua index 0fa49ac..5054557 100644 --- a/nodes.lua +++ b/nodes.lua @@ -143,8 +143,8 @@ local nodes = { ["iron_glass"] = { description = S("Iron Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#DEDEDE", "default_glass_detail.png^[colorize:#DEDEDE"}, - tiles = {"default_glass.png^[colorize:#DEDEDE"}, + tiles = {"default_glass.png^[colorize:#DEDEDE", "default_glass_detail.png^[colorize:#DEDEDE"}, + --tiles = {"moreblocks_iron_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -154,8 +154,8 @@ local nodes = { ["coal_glass"] = { description = S("Coal Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#828282", "default_glass_detail.png^[colorize:#828282"}, - tiles = {"default_glass.png^[colorize:#828282"}, + tiles = {"default_glass.png^[colorize:#828282", "default_glass_detail.png^[colorize:#828282"}, + --tiles = {"moreblocks_coal_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -165,8 +165,8 @@ local nodes = { ["clean_glass"] = { description = S("Clean Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"}, - tiles = {"moreblocks_clean_glass.png"}, + tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"}, + --tiles = {"moreblocks_clean_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -265,8 +265,8 @@ local nodes = { ["trap_glass"] = { description = S("Trap Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^moreblocks_trap_box_glass.png", "default_glass_detail.png"}, - tiles = {"default_glass.png^moreblocks_trap_box_glass.png"}, + tiles = {"default_glass.png^moreblocks_trap_box_glass.png", "default_glass_detail.png"}, + --tiles = {"default_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -278,8 +278,8 @@ local nodes = { ["trap_obsidian_glass"] = { description = S("Trap Obsidian Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png", "default_obsidian_glass_detail.png"}, - tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png"}, + tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png", "default_obsidian_glass_detail.png"}, + --tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -348,8 +348,8 @@ local nodes = { ["glow_glass"] = { description = S("Glow Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#E9CD61", "default_glass_detail.png^[colorize:#E9CD61"}, - tiles = {"default_glass.png^[colorize:#E9CD61"}, + tiles = {"default_glass.png^[colorize:#E9CD61", "default_glass_detail.png^[colorize:#E9CD61"}, + --tiles = {"moreblocks_glow_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -360,8 +360,8 @@ local nodes = { ["trap_glow_glass"] = { description = S("Trap Glow Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#E9CD61"}, - tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png"}, + tiles = {"default_glass.png^[colorize:#E9CD61^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#E9CD61"}, + --tiles = {"moreblocks_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -374,8 +374,8 @@ local nodes = { ["super_glow_glass"] = { description = S("Super Glow Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#FFFF78", "default_glass_detail.png^[colorize:#FFFF78"}, - tiles = {"default_glass.png^[colorize:#FFFF78"}, + tiles = {"default_glass.png^[colorize:#FFFF78", "default_glass_detail.png^[colorize:#FFFF78"}, + --tiles = {"moreblocks_super_glow_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -386,8 +386,8 @@ local nodes = { ["trap_super_glow_glass"] = { description = S("Trap Super Glow Glass"), drawtype = "glasslike_framed_optional", - --tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#FFFF78"}, - tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png"}, + tiles = {"default_glass.png^[colorize:#FFFF78^moreblocks_trap_box_glass.png", "default_glass_detail.png^[colorize:#FFFF78"}, + --tiles = {"moreblocks_super_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false,