From 7d4291eb6b3ceb92873c48d70f14a0cece306e82 Mon Sep 17 00:00:00 2001
From: Calinou <calinou@opmbx.org>
Date: Tue, 23 Sep 2014 20:03:37 +0200
Subject: [PATCH] Add "connected" glass and obsidian glass

---
 mods/default/nodes.lua                          |   9 ++++-----
 mods/default/textures/default_glass.png         | Bin 204 -> 170 bytes
 mods/default/textures/default_glass_detail.png  | Bin 0 -> 183 bytes
 mods/default/textures/default_glass_frame.png   | Bin 0 -> 161 bytes
 .../default/textures/default_obsidian_glass.png | Bin 217 -> 142 bytes
 .../textures/default_obsidian_glass_detail.png  | Bin 0 -> 161 bytes
 .../textures/default_obsidian_glass_frame.png   | Bin 0 -> 227 bytes
 7 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 mods/default/textures/default_glass_detail.png
 create mode 100644 mods/default/textures/default_glass_frame.png
 create mode 100644 mods/default/textures/default_obsidian_glass_detail.png
 create mode 100644 mods/default/textures/default_obsidian_glass_frame.png

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 354096e0..dea650bc 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -446,9 +446,8 @@ minetest.register_node("default:bookshelf", {
 
 minetest.register_node("default:glass", {
 	description = "Glass",
-	drawtype = "glasslike",
-	tiles = {"default_glass.png"},
-	inventory_image = minetest.inventorycube("default_glass.png"),
+	drawtype = "glasslike_framed",
+	tiles = {"default_glass_frame.png", "default_glass_detail.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	is_ground_content = false,
@@ -1278,8 +1277,8 @@ minetest.register_node("default:diamondblock", {
 
 minetest.register_node("default:obsidian_glass", {
 	description = "Obsidian Glass",
-	drawtype = "glasslike",
-	tiles = {"default_obsidian_glass.png"},
+	drawtype = "glasslike_framed",
+	tiles = {"default_obsidian_glass_frame.png", "default_obsidian_glass_detail.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = true,
diff --git a/mods/default/textures/default_glass.png b/mods/default/textures/default_glass.png
index b4c7fb5f06515f2c5bac428faa4d456a409cd433..ac81b2ab5a631515a45b7fb1884d6a848cd10ca1 100644
GIT binary patch
delta 121
zcmX@ZxQcOtgdhtu0|Ud`yN`l^luCe4i0edsmDp)k?L9y~V@Z%-FoVOh8)-m}iKmNW
z2uE~k_d;F<2cDJ>+yBcwk9_BP*1WWZAuB|a;Yl+CtCwPnkVO3>?#<8N2)~Kg`il9i
WyM&C7>e@b_eg;ohKbLh*2~7YtnJE|m

delta 155
zcmZ3*c!qI;gg6H?0|SGGE`KnPatiPXaRt)LmYkfZsZx35$m3(jo}M}L;^M_u*RQ|1
zbLZXt`yU=Y{CFzV;|x$0V@Z%-FoVOh8)-m}g{O;SNCji^16F1M)?~v43~!hY32f5{
z;ph?c;c#bAQeqN2V$jUP*rLiIS|f3-OTndMqZn6$4#R^t%+<bH7TG{E7(8A5T-G@y
GGywofR5&#N

diff --git a/mods/default/textures/default_glass_detail.png b/mods/default/textures/default_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..b459665aca294da5e118bee8833220d9d17c17bd
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eSlAh>#`*$mn}KBa@olh%g(G?
zadz?ID~lFgU9$Mf+O@Z~ZoRu>$Gu&<?jJbt_{fpR$BsQcbLPdxi?6O<e{<)~yZiS)
zJbd`^`$QW-pizt^L4Lsu4$p3+0Xb@(E{-7*my;6|xH%j(1Y0=xxmcP02zbqCtYWw<
h6vrc&$Rh}JP?99W#*4}irvr5`c)I$ztaD0e0sw%IOPK%w

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_glass_frame.png b/mods/default/textures/default_glass_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..119e4338ce356bd569f74d660e79615add661086
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?bUAE-pvL)wME<3qm*_l-<
z&MsbjWznLmOBP>QyY|-Bt#^0qxVLN9{R0Oc$LU<W3e>__666=m;PC858jz#m>Eal|
z5uI#N{EUZRV1A;-0R}c32_80`ARY-N6@v#1o?K5_m>qZ+#14tJwjZ?t*~#GP>gTe~
HDWM4fx3@YJ

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_obsidian_glass.png b/mods/default/textures/default_obsidian_glass.png
index ef5f8b5a3bf8930baf3e599340507bc305a1bacb..c213a9689d96dd9e5157f576bce34ab6e8167a8d 100644
GIT binary patch
delta 125
zcmcb~*vB|QqKt`|fq@}uuJ|V)#Tnoe;>y5~E+8NvuVz@SZdV5sWGo5t3ubV5b|VeQ
zG4^zE4B@z*%+Whb>ePb+2M%y3&XKT~At5C-LqbwYL_$hZ>VZ(gBF0Eg;bvwJPA9Px
a5r&1kxnhi>H;DqZGkCiCxvX<aXaWH22_ZrN

delta 201
zcmeBUyvaC0qMn19fq_9omp>RtNeB3ZxB_V@86_Dd9eFiFC7W0s3tv6kFaZGpAh*k<
zJ{~B|UJ~R7QVs&4DX$`cRGO!YV@L&KZ2v{R!wNjiw&x^&{@0J|+`8)3-UTrSjBYuX
zzhBV%GhzK!gP23jJkKqhF2&zk`)%gN!%kt<4Zo6v3l~p5_-3Wn0nWY2o^H!dycA^c
uS<M(Tp?mGxH)no#hO$m)czyHB-@o$Kk6CQxZ2F2pR(rboxvX<aXaWGj@=1vR

diff --git a/mods/default/textures/default_obsidian_glass_detail.png b/mods/default/textures/default_obsidian_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bfa63c2468cbc238a9ce16666958eb709868d3a
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8J;eVAr_~TZ3-S3GMhbkpm4gu
zn~zmsDMx>t8k-m6Chj|P7X5!5^!%O7=lL4?H=@`cn6SjYJJ5Li#^D1O%~~|32ME=5
zI4rp$(v{q}i*14sv&G_z=d>n#$~ZDJgJVZg!lH>2C73^?<}&y^c4FUBWfcjulfl!~
K&t;ucLK6Us8and;

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_obsidian_glass_frame.png b/mods/default/textures/default_obsidian_glass_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c4dab4174e58d884387e142f8bea05c4428aab3
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=3P7N-|11@@j@kHnBPu
zzIwJ{0s;a+ZkJ1aJW!gwB*-rqNP|FV%Bu(<Rp9C37{U>4dhQ@6lc7M{#s2~~ncg^f
zpYX6@d)EBMHiy+rLB)Vo;=(4|w?AX&DLwk$%fY+9Xm|C+mRHA?tz?-R>n(9%%K>@)
zE-{AE%LhJREWSKNsN(Xf0AXL@4>|s|n@YXkR8^bVcY5nfP2<V1lCGEbRDO88R(1i%
N4W6!kF6*2UngEJsNQD3Z

literal 0
HcmV?d00001