]> git.lizzy.rs Git - mcl_enchanting.git/commitdiff
Import changes from xdecor
authorkilbith <jeanpatrick.guerrero@gmail.com>
Sat, 2 Apr 2016 19:35:30 +0000 (21:35 +0200)
committerkilbith <jeanpatrick.guerrero@gmail.com>
Sat, 2 Apr 2016 19:35:30 +0000 (21:35 +0200)
33 files changed:
init.lua
textures/glyph1.png [deleted file]
textures/glyph10.png [deleted file]
textures/glyph11.png [deleted file]
textures/glyph12.png [deleted file]
textures/glyph13.png [deleted file]
textures/glyph14.png [deleted file]
textures/glyph2.png [deleted file]
textures/glyph3.png [deleted file]
textures/glyph4.png [deleted file]
textures/glyph5.png [deleted file]
textures/glyph6.png [deleted file]
textures/glyph7.png [deleted file]
textures/glyph8.png [deleted file]
textures/glyph9.png [deleted file]
textures/xdecor_glyph1.png [new file with mode: 0644]
textures/xdecor_glyph10.png [new file with mode: 0644]
textures/xdecor_glyph11.png [new file with mode: 0644]
textures/xdecor_glyph12.png [new file with mode: 0644]
textures/xdecor_glyph13.png [new file with mode: 0644]
textures/xdecor_glyph14.png [new file with mode: 0644]
textures/xdecor_glyph15.png [new file with mode: 0644]
textures/xdecor_glyph16.png [new file with mode: 0644]
textures/xdecor_glyph17.png [new file with mode: 0644]
textures/xdecor_glyph18.png [new file with mode: 0644]
textures/xdecor_glyph2.png [new file with mode: 0644]
textures/xdecor_glyph3.png [new file with mode: 0644]
textures/xdecor_glyph4.png [new file with mode: 0644]
textures/xdecor_glyph5.png [new file with mode: 0644]
textures/xdecor_glyph6.png [new file with mode: 0644]
textures/xdecor_glyph7.png [new file with mode: 0644]
textures/xdecor_glyph8.png [new file with mode: 0644]
textures/xdecor_glyph9.png [new file with mode: 0644]

index 230776febdfc4153c843c760291ebb4fcf638f76..4b13ad675bf817657c0f93830f2657c38c74ddd2 100644 (file)
--- 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 (file)
index da77892..0000000
Binary files a/textures/glyph1.png and /dev/null differ
diff --git a/textures/glyph10.png b/textures/glyph10.png
deleted file mode 100644 (file)
index 27c7c8d..0000000
Binary files a/textures/glyph10.png and /dev/null differ
diff --git a/textures/glyph11.png b/textures/glyph11.png
deleted file mode 100644 (file)
index 76493c9..0000000
Binary files a/textures/glyph11.png and /dev/null differ
diff --git a/textures/glyph12.png b/textures/glyph12.png
deleted file mode 100644 (file)
index 72f18fb..0000000
Binary files a/textures/glyph12.png and /dev/null differ
diff --git a/textures/glyph13.png b/textures/glyph13.png
deleted file mode 100644 (file)
index 70ca494..0000000
Binary files a/textures/glyph13.png and /dev/null differ
diff --git a/textures/glyph14.png b/textures/glyph14.png
deleted file mode 100644 (file)
index 6862387..0000000
Binary files a/textures/glyph14.png and /dev/null differ
diff --git a/textures/glyph2.png b/textures/glyph2.png
deleted file mode 100644 (file)
index a6da2d1..0000000
Binary files a/textures/glyph2.png and /dev/null differ
diff --git a/textures/glyph3.png b/textures/glyph3.png
deleted file mode 100644 (file)
index 456e030..0000000
Binary files a/textures/glyph3.png and /dev/null differ
diff --git a/textures/glyph4.png b/textures/glyph4.png
deleted file mode 100644 (file)
index e93f238..0000000
Binary files a/textures/glyph4.png and /dev/null differ
diff --git a/textures/glyph5.png b/textures/glyph5.png
deleted file mode 100644 (file)
index c79537f..0000000
Binary files a/textures/glyph5.png and /dev/null differ
diff --git a/textures/glyph6.png b/textures/glyph6.png
deleted file mode 100644 (file)
index f735354..0000000
Binary files a/textures/glyph6.png and /dev/null differ
diff --git a/textures/glyph7.png b/textures/glyph7.png
deleted file mode 100644 (file)
index 3f91a32..0000000
Binary files a/textures/glyph7.png and /dev/null differ
diff --git a/textures/glyph8.png b/textures/glyph8.png
deleted file mode 100644 (file)
index 6c65994..0000000
Binary files a/textures/glyph8.png and /dev/null differ
diff --git a/textures/glyph9.png b/textures/glyph9.png
deleted file mode 100644 (file)
index 4b3e366..0000000
Binary files a/textures/glyph9.png and /dev/null differ
diff --git a/textures/xdecor_glyph1.png b/textures/xdecor_glyph1.png
new file mode 100644 (file)
index 0000000..a5ac3f5
Binary files /dev/null and b/textures/xdecor_glyph1.png differ
diff --git a/textures/xdecor_glyph10.png b/textures/xdecor_glyph10.png
new file mode 100644 (file)
index 0000000..d002147
Binary files /dev/null and b/textures/xdecor_glyph10.png differ
diff --git a/textures/xdecor_glyph11.png b/textures/xdecor_glyph11.png
new file mode 100644 (file)
index 0000000..c9cd9ff
Binary files /dev/null and b/textures/xdecor_glyph11.png differ
diff --git a/textures/xdecor_glyph12.png b/textures/xdecor_glyph12.png
new file mode 100644 (file)
index 0000000..dc5dd1d
Binary files /dev/null and b/textures/xdecor_glyph12.png differ
diff --git a/textures/xdecor_glyph13.png b/textures/xdecor_glyph13.png
new file mode 100644 (file)
index 0000000..45c6d5a
Binary files /dev/null and b/textures/xdecor_glyph13.png differ
diff --git a/textures/xdecor_glyph14.png b/textures/xdecor_glyph14.png
new file mode 100644 (file)
index 0000000..6862387
Binary files /dev/null and b/textures/xdecor_glyph14.png differ
diff --git a/textures/xdecor_glyph15.png b/textures/xdecor_glyph15.png
new file mode 100644 (file)
index 0000000..0db3a9e
Binary files /dev/null and b/textures/xdecor_glyph15.png differ
diff --git a/textures/xdecor_glyph16.png b/textures/xdecor_glyph16.png
new file mode 100644 (file)
index 0000000..d10a72b
Binary files /dev/null and b/textures/xdecor_glyph16.png differ
diff --git a/textures/xdecor_glyph17.png b/textures/xdecor_glyph17.png
new file mode 100644 (file)
index 0000000..2b374e8
Binary files /dev/null and b/textures/xdecor_glyph17.png differ
diff --git a/textures/xdecor_glyph18.png b/textures/xdecor_glyph18.png
new file mode 100644 (file)
index 0000000..e762e35
Binary files /dev/null and b/textures/xdecor_glyph18.png differ
diff --git a/textures/xdecor_glyph2.png b/textures/xdecor_glyph2.png
new file mode 100644 (file)
index 0000000..eb1e74f
Binary files /dev/null and b/textures/xdecor_glyph2.png differ
diff --git a/textures/xdecor_glyph3.png b/textures/xdecor_glyph3.png
new file mode 100644 (file)
index 0000000..e82145e
Binary files /dev/null and b/textures/xdecor_glyph3.png differ
diff --git a/textures/xdecor_glyph4.png b/textures/xdecor_glyph4.png
new file mode 100644 (file)
index 0000000..e93f238
Binary files /dev/null and b/textures/xdecor_glyph4.png differ
diff --git a/textures/xdecor_glyph5.png b/textures/xdecor_glyph5.png
new file mode 100644 (file)
index 0000000..f0635bf
Binary files /dev/null and b/textures/xdecor_glyph5.png differ
diff --git a/textures/xdecor_glyph6.png b/textures/xdecor_glyph6.png
new file mode 100644 (file)
index 0000000..c93976c
Binary files /dev/null and b/textures/xdecor_glyph6.png differ
diff --git a/textures/xdecor_glyph7.png b/textures/xdecor_glyph7.png
new file mode 100644 (file)
index 0000000..1e4ff02
Binary files /dev/null and b/textures/xdecor_glyph7.png differ
diff --git a/textures/xdecor_glyph8.png b/textures/xdecor_glyph8.png
new file mode 100644 (file)
index 0000000..2f2b86c
Binary files /dev/null and b/textures/xdecor_glyph8.png differ
diff --git a/textures/xdecor_glyph9.png b/textures/xdecor_glyph9.png
new file mode 100644 (file)
index 0000000..4b3e366
Binary files /dev/null and b/textures/xdecor_glyph9.png differ