From 7413b7228e32284bc4c2c568d27de419a5bd1cb5 Mon Sep 17 00:00:00 2001 From: kilbith Date: Sat, 2 Apr 2016 21:35:30 +0200 Subject: [PATCH] Import changes from xdecor --- init.lua | 2 +- textures/glyph1.png | Bin 108 -> 0 bytes textures/glyph10.png | Bin 104 -> 0 bytes textures/glyph11.png | Bin 104 -> 0 bytes textures/glyph12.png | Bin 102 -> 0 bytes textures/glyph13.png | Bin 105 -> 0 bytes textures/glyph2.png | Bin 106 -> 0 bytes textures/glyph3.png | Bin 106 -> 0 bytes textures/glyph5.png | Bin 106 -> 0 bytes textures/glyph6.png | Bin 104 -> 0 bytes textures/glyph7.png | Bin 104 -> 0 bytes textures/glyph8.png | Bin 104 -> 0 bytes textures/xdecor_glyph1.png | Bin 0 -> 161 bytes textures/xdecor_glyph10.png | Bin 0 -> 157 bytes textures/xdecor_glyph11.png | Bin 0 -> 158 bytes textures/xdecor_glyph12.png | Bin 0 -> 156 bytes textures/xdecor_glyph13.png | Bin 0 -> 159 bytes textures/{glyph14.png => xdecor_glyph14.png} | Bin textures/xdecor_glyph15.png | Bin 0 -> 160 bytes textures/xdecor_glyph16.png | Bin 0 -> 166 bytes textures/xdecor_glyph17.png | Bin 0 -> 145 bytes textures/xdecor_glyph18.png | Bin 0 -> 161 bytes textures/xdecor_glyph2.png | Bin 0 -> 159 bytes textures/xdecor_glyph3.png | Bin 0 -> 159 bytes textures/{glyph4.png => xdecor_glyph4.png} | Bin textures/xdecor_glyph5.png | Bin 0 -> 161 bytes textures/xdecor_glyph6.png | Bin 0 -> 159 bytes textures/xdecor_glyph7.png | Bin 0 -> 157 bytes textures/xdecor_glyph8.png | Bin 0 -> 158 bytes textures/{glyph9.png => xdecor_glyph9.png} | Bin 30 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 textures/glyph1.png delete mode 100644 textures/glyph10.png delete mode 100644 textures/glyph11.png delete mode 100644 textures/glyph12.png delete mode 100644 textures/glyph13.png delete mode 100644 textures/glyph2.png delete mode 100644 textures/glyph3.png delete mode 100644 textures/glyph5.png delete mode 100644 textures/glyph6.png delete mode 100644 textures/glyph7.png delete mode 100644 textures/glyph8.png create mode 100644 textures/xdecor_glyph1.png create mode 100644 textures/xdecor_glyph10.png create mode 100644 textures/xdecor_glyph11.png create mode 100644 textures/xdecor_glyph12.png create mode 100644 textures/xdecor_glyph13.png rename textures/{glyph14.png => xdecor_glyph14.png} (100%) create mode 100644 textures/xdecor_glyph15.png create mode 100644 textures/xdecor_glyph16.png create mode 100644 textures/xdecor_glyph17.png create mode 100644 textures/xdecor_glyph18.png create mode 100644 textures/xdecor_glyph2.png create mode 100644 textures/xdecor_glyph3.png rename textures/{glyph4.png => xdecor_glyph4.png} (100%) create mode 100644 textures/xdecor_glyph5.png create mode 100644 textures/xdecor_glyph6.png create mode 100644 textures/xdecor_glyph7.png create mode 100644 textures/xdecor_glyph8.png rename textures/{glyph9.png => xdecor_glyph9.png} (100%) diff --git a/init.lua b/init.lua index 230776f..4b13ad6 100644 --- a/init.lua +++ b/init.lua @@ -150,7 +150,7 @@ function enchanting.timer(pos) acceleration = {x=0, y=-2.2, z=0}, expirationtime = 1, size = 2, - texture = "glyph"..math.random(1,14)..".png" + texture = "xdecor_glyph"..math.random(1,18)..".png" }) end return true diff --git a/textures/glyph1.png b/textures/glyph1.png deleted file mode 100644 index da77892eb6cfbc473a42b5b145f07ac000858d33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX+VyMr;B3<$MxhN2M-)5XmD(FY-(g=5V*tm@nO!w9-usfr>mdKI;Vst00L|s Ab^rhX diff --git a/textures/glyph10.png b/textures/glyph10.png deleted file mode 100644 index 27c7c8d07d7d8949ea9dbc83b178fe5a59f5611d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK wgTu2MX+VyEr;B3<$MxhD2@e>Y+1U6PSf4P={IhraS)d$)r>mdKI;Vst08!}~?f?J) diff --git a/textures/glyph11.png b/textures/glyph11.png deleted file mode 100644 index 76493c91fdfdb86026d1b95f75603dbc1e864264..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK wgTu2MX+VyEr;B3<$Ms}}Mtg@nt&NNfoIH#hdxZpV0Oc4wUHx3vIVCg!05T#M`~Uy| diff --git a/textures/glyph12.png b/textures/glyph12.png deleted file mode 100644 index 72f18fb56ea0de0e5459220cf50f2ce303f35c48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK ugTu2MX+RF2r;B3<$Ms|b24^+_P6pOH3?JErel`JR7(8A5T-G@yGywqZycXa9 diff --git a/textures/glyph13.png b/textures/glyph13.png deleted file mode 100644 index 70ca494ae4ee37d6688ac84ad2df3b3cdcfb0b64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK xgTu2MX+Vykr;B3<$MxidgbxglxY!gJ7+Bsg9AxMItP7N6@O1TaS?83{1OQZ87?1z} diff --git a/textures/glyph2.png b/textures/glyph2.png deleted file mode 100644 index a6da2d187af74bbeb6db2fc5813614a3957f2daf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK ygTu2MX+VyUr;B3<$Ms}`goK12hYv8d)H86&Fd6RbWpW0}GI+ZBxvXFgv=lzMPzCadZNswPK ygTu2MX+VyUr;B3<$Mxh72@euJFgUTZ@iVYrVa#kU-unnB%i!ti=d#Wzp$Pz!?HZ&2 diff --git a/textures/glyph5.png b/textures/glyph5.png deleted file mode 100644 index c79537f6124d4025cd6d8f5d757ae99589a086fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK ygTu2MX+VyUr;B3<$Mxg@1}8=~J~pv7DF)^>3^!+%tXTz=W$<+Mb6Mw<&;$TWei%9c diff --git a/textures/glyph6.png b/textures/glyph6.png deleted file mode 100644 index f73535485addddfecfe4092b195dbaab33969efe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK wgTu2MX+VyEr;B3<$Mxg@24`kAMm9zUmN^U?*Dtqi0?ILXy85}Sb4q9e01-SE^Z)<= diff --git a/textures/glyph7.png b/textures/glyph7.png deleted file mode 100644 index 3f91a329a1462482ac582b1e51c9f770f044f6d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK wgTu2MX+VyEr;B3<$Mxh12?2=#49@HfEENoQ=NG%n1LYVzUHx3vIVCg!05ZWB_5c6? diff --git a/textures/glyph8.png b/textures/glyph8.png deleted file mode 100644 index 6c6599471745faf67c4c8b93aa24a6ac449c60b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK wgTu2MX+VyEr;B3<$Ms|bhQnNJY;9Z&>~9zwcN^(^0?ILXy85}Sb4q9e04hZo0{{R3 diff --git a/textures/xdecor_glyph1.png b/textures/xdecor_glyph1.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ac3f553eac90a663283dbbd7071ba4e2296426 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl2}{WECbNYB ug+x4E978y+C;vEn;6Opc!G^~6Mn(of6ULwNaXWQ^@(iA?elF{r5}E)T9wi?D literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph10.png b/textures/xdecor_glyph10.png new file mode 100644 index 0000000000000000000000000000000000000000..d002147f50c9623f1e7db05d3d933a475f0e2c8a GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl35!YvuDh!T q6cX@saSY+Op1dL90fRFe8y^F+3PYr=Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl35&9bP0l+XkKppqlY literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph12.png b/textures/xdecor_glyph12.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5dd1d2020d45f601c6c35d85d3544f1c545eda GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl35%$7Uio+g pD8%pS;uyklJvkvkfWgUtlY!BP!STn3m!d!^22WQ%mvv4FO#ozwB8vb3 literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph13.png b/textures/xdecor_glyph13.png new file mode 100644 index 0000000000000000000000000000000000000000..45c6d5a638c7400da787ccb7fd9a6e35b940879d GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl3Cro!KA2bo t6cX}uaSY+Oo}7^IAt52*2lEjg2KEL<*B4TkCjn&{JYD@<);T3K0RZxnB?tfj literal 0 HcmV?d00001 diff --git a/textures/glyph14.png b/textures/xdecor_glyph14.png similarity index 100% rename from textures/glyph14.png rename to textures/xdecor_glyph14.png diff --git a/textures/xdecor_glyph15.png b/textures/xdecor_glyph15.png new file mode 100644 index 0000000000000000000000000000000000000000..0db3a9ea2739d4e4e685eab827b48de850773799 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*ZZ@dAqwX{0G4WdzViJif|TqL>4nJ za0`PlBg3pY5H=O_6ICX!cu%^-iXct3h8>fIEHXsPfh@W9TgufnT^gK00Nfe tm_0xK*c{AAFuec( literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph16.png b/textures/xdecor_glyph16.png new file mode 100644 index 0000000000000000000000000000000000000000..d10a72b7559894c14779dcbb7240107b9dda2475 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*ZZ@dAqwX{0G4WdzViJif|TqL>4nJ za0`PlBg3pY5H=O_6ICX!qO^yK5w~!LdKphjv*Y^OS=zpGAIZfUbN$X-aVmR zt~D>6_c|FVdQ&MBb@ E0J*#}+5i9m literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph17.png b/textures/xdecor_glyph17.png new file mode 100644 index 0000000000000000000000000000000000000000..2b374e881679f09485473f69066efd0522e7986e GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_`5A|IT2?*ZZ@dAqwX{0G4WdzViJif|TqL>4nJ za0`PlBg3pY5H=O_6ICX!qV2wE)V_zh2%V4978y+C;#~W-~RCb|NkZR;%ffM i&rC}?!1zLuk-_$zF#oTOE4KnwGI+ZBxvX4nJ za0`PlBg3pY5H=O_6ICX!m<+Om1ZC#^*mi1LpZM2p4lkKV8C(M;o!g1hOWm1 xe0QK|HXG;n@f&E{+;B4C~}^EXf@gQu&X%Q~loCID?HE@A)x literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph2.png b/textures/xdecor_glyph2.png new file mode 100644 index 0000000000000000000000000000000000000000..eb1e74fbcb8e6fca93aaf269e1d5cefa7672a43e GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl2}`hMa;%#M s6cX}uaSY+Oo-B}%kgy^#f$@+O1Ir#p!5d|kFMzTPp00i_>zopr0IJ<14gdfE literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph3.png b/textures/xdecor_glyph3.png new file mode 100644 index 0000000000000000000000000000000000000000..e82145e5c27dfbe25ae08937e6d8534a88b4a4f6 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl35y%-P%f(i t3JH0-IEHXsPri`wAmIXo6Du1p14{|R$+qLCegS0}JYD@<);T3K0RYkhB!d6| literal 0 HcmV?d00001 diff --git a/textures/glyph4.png b/textures/xdecor_glyph4.png similarity index 100% rename from textures/glyph4.png rename to textures/xdecor_glyph4.png diff --git a/textures/xdecor_glyph5.png b/textures/xdecor_glyph5.png new file mode 100644 index 0000000000000000000000000000000000000000..f0635bf2b39cf3fdce8fc7e42516f5392ca5bd55 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl2}|in_JmXb ug+x4E978y+CkG@1BnTutNJvOr!N|b8hT&$)-p>L+c?M5cKbLh*2~7Y24kTm% literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph6.png b/textures/xdecor_glyph6.png new file mode 100644 index 0000000000000000000000000000000000000000..c93976cfba6fd5ce800ea5a08a0b0cd39daeddfc GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl2}>B*@6Or^ s6cX}uaSY+Oo}7>nz~IEp#>mFVz-+@XQT$WxZlElKr>mdKI;Vst0E`VGN&o-= literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph7.png b/textures/xdecor_glyph7.png new file mode 100644 index 0000000000000000000000000000000000000000..1e4ff024898eb70b7e3d7ee370ee36ad456f7e53 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl3CoEpJ(Vm0 q3JG|+IEHXsPo9tvkQl&ln1z952E$+GT77Mx9D}E;pUXO@geCx386kB5 literal 0 HcmV?d00001 diff --git a/textures/xdecor_glyph8.png b/textures/xdecor_glyph8.png new file mode 100644 index 0000000000000000000000000000000000000000..2f2b86c16525bd26662ac61021db2bb0fb7d7656 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|Y3?y$c)pCP40X`wFK>Fgv=lzMPzCadZNswPK zgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*&nbl35%(PzWI~| r6cY4waSY+Oo-B~S;KUOS%)_uy=irGOKuHEqS3j3^P6