From f0a455f878c8d72865c91799a793d21bb82e9860 Mon Sep 17 00:00:00 2001
From: Calinou <calinou@opmbx.org>
Date: Fri, 23 Jan 2015 18:52:02 +0100
Subject: [PATCH] Make glass connected optionally, add detail textures.

---
 nodes.lua                                     |  24 ++++++++++++------
 textures/moreblocks_clean_glass_detail.png    | Bin 0 -> 96 bytes
 textures/moreblocks_coal_glass_detail.png     | Bin 0 -> 159 bytes
 textures/moreblocks_glow_glass_detail.png     | Bin 0 -> 161 bytes
 textures/moreblocks_iron_glass_detail.png     | Bin 0 -> 163 bytes
 .../moreblocks_super_glow_glass_detail.png    | Bin 0 -> 156 bytes
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 textures/moreblocks_clean_glass_detail.png
 create mode 100644 textures/moreblocks_coal_glass_detail.png
 create mode 100644 textures/moreblocks_glow_glass_detail.png
 create mode 100644 textures/moreblocks_iron_glass_detail.png
 create mode 100644 textures/moreblocks_super_glow_glass_detail.png

diff --git a/nodes.lua b/nodes.lua
index d3120c9..8f31e06 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -136,7 +136,8 @@ local nodes = {
 	},
 	["iron_glass"] = {
 		description = S("Iron Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -144,7 +145,8 @@ local nodes = {
 	},
 	["coal_glass"] = {
 		description = S("Coal Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -152,7 +154,8 @@ local nodes = {
 	},
 	["clean_glass"] = {
 		description = S("Clean Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -223,7 +226,8 @@ local nodes = {
 	},
 	["trap_glass"] = {
 		description = S("Trap Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -262,7 +266,8 @@ local nodes = {
 	},
 	["glow_glass"] = {
 		description = S("Glow Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -271,7 +276,8 @@ local nodes = {
 	},
 	["trap_glow_glass"] = {
 		description = S("Trap Glow Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -282,7 +288,8 @@ local nodes = {
 	},
 	["super_glow_glass"] = {
 		description = S("Super Glow Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 15,
@@ -291,7 +298,8 @@ local nodes = {
 	},
 	["trap_super_glow_glass"] = {
 		description = S("Trap Super Glow Glass"),
-		drawtype = "glasslike_framed",
+		drawtype = "glasslike_framed_optional",
+		tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 15,
diff --git a/textures/moreblocks_clean_glass_detail.png b/textures/moreblocks_clean_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..71414e89cc11bacdca2c02a712cb442d270f2253
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5X>wyE0kLa8i19BNlg8YIR
o9G=}s19G@MT^vI=WRn#HfgA${My}@`B0v^{r>mdKI;Vst09j-cg#Z8m

literal 0
HcmV?d00001

diff --git a/textures/moreblocks_coal_glass_detail.png b/textures/moreblocks_coal_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea081f8a4bcd40e8f4b316a697d10453cf31c32
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`X`U{QAr_~P20QXK7;q%p&2bjy
zvuXGcW3#Hzhez!jSIN>;W`?r|&P=(gr(vp_X8!8YngeH)UKfAYSj(Uw)_*j&>{;Wg
zX;Vu6So^%$v?ch*v<JRSnLSFE`VDPou}}Sf#6pW@_4>WcYaiS0ulIkj0cazGr>mdK
II;Vst0M)uX$^ZZW

literal 0
HcmV?d00001

diff --git a/textures/moreblocks_glow_glass_detail.png b/textures/moreblocks_glow_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea67bc359da8019ed8eec64dee8177894b878429
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8J;eVAr_~TYbwnqGD-`W&pY4X
z&BrRRl%qdRjm?X36L(zPsz3d~cc0$+?^5~j>CGemD|CMMFBFfK*t2Is?{U?u|5pmu
zbvP`!BGQ%IxQlIq5c7`3A7hL}7YS;v>L@$e;Hs=_$oAm$Ee54;zGA=LssgQKVDNPH
Kb6Mw<&;$T~k~=*B

literal 0
HcmV?d00001

diff --git a/textures/moreblocks_iron_glass_detail.png b/textures/moreblocks_iron_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b8fc120d7b65ad8a0b4bf9d1f3da712222c6bd4
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`S)MMAAr_~PPIlxwpuoYh)&JrD
z{3w07R{aafxgt)@p5M82b_i=XY!Vg}UHvU+#mSj_y}~}TCi86l<>KP(&#>T}QEXbd
z<d=KC!fDrpf7&Xh#a<FQCsm`Ekd(9bso}X5ho=8&+vvu#XMHU*FJJVMB{OX{0&QjR
MboFyt=akR{0Bt}zhX4Qo

literal 0
HcmV?d00001

diff --git a/textures/moreblocks_super_glow_glass_detail.png b/textures/moreblocks_super_glow_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..e321a5c2b8d492164eb327b7978cf4ef58c13cbb
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`$(}BbAr_~PP7dU1aNuy+8q6KL
zz)w)8<lOai-8Ws`PM=rXm9UBWxCPm!guNEYDoQgy`D!;~%$eVLPU;Po6ZWy0ePi%r
zzqI1Rds9Pi&*cH!5uOJ+3)gpST$}$Xx<`t!V*Ou+`NzYTvvY8X0Ig&2boFyt=akR{
E0Kq*rQ~&?~

literal 0
HcmV?d00001