summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormathiascode <mathiascode@users.noreply.github.com>2017-06-03 18:49:02 +0200
committerLukas Pioch <lukas@zgow.de>2017-06-03 18:49:02 +0200
commit5f0d2b902ec0d1dee1518d8f440aa5966b014710 (patch)
tree2e86b8439fdafd7d8485bf2071eefd64cf6ef114
parentLineBlockTracer: Fixed a math rounding error failure. (diff)
downloadcuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar.gz
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar.bz2
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar.lz
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar.xz
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.tar.zst
cuberite-5f0d2b902ec0d1dee1518d8f440aa5966b014710.zip
-rw-r--r--Server/favicon.pngbin797 -> 2233 bytes
-rw-r--r--Server/webadmin/files/favicon.icobin15086 -> 0 bytes
-rw-r--r--Server/webadmin/files/favicon.pngbin0 -> 553 bytes
-rw-r--r--Server/webadmin/login_template.html2
-rw-r--r--Server/webadmin/template.lua2
-rw-r--r--src/Resources/icon.icobin101726 -> 297310 bytes
-rw-r--r--src/Resources/icon_128.pngbin1550 -> 3723 bytes
-rw-r--r--src/Resources/icon_16.pngbin352 -> 663 bytes
-rw-r--r--src/Resources/icon_256.pngbin2562 -> 7114 bytes
-rw-r--r--src/Resources/icon_32.pngbin595 -> 1356 bytes
-rw-r--r--src/Resources/icon_48.pngbin811 -> 1751 bytes
11 files changed, 2 insertions, 2 deletions
diff --git a/Server/favicon.png b/Server/favicon.png
index dc802ec91..1ef184162 100644
--- a/Server/favicon.png
+++ b/Server/favicon.png
Binary files differ
diff --git a/Server/webadmin/files/favicon.ico b/Server/webadmin/files/favicon.ico
deleted file mode 100644
index 2cb6a255b..000000000
--- a/Server/webadmin/files/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/Server/webadmin/files/favicon.png b/Server/webadmin/files/favicon.png
new file mode 100644
index 000000000..9e3da2967
--- /dev/null
+++ b/Server/webadmin/files/favicon.png
Binary files differ
diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html
index 75c2f8e7e..795cc153e 100644
--- a/Server/webadmin/login_template.html
+++ b/Server/webadmin/login_template.html
@@ -4,7 +4,7 @@
<title>Cuberite WebAdmin - Login</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="login.css" rel="stylesheet" type="text/css">
- <link rel="icon" href="favicon.ico">
+ <link rel="icon" href="favicon.png">
</head>
<body>
<div class="contention">
diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua
index ac7fb9d72..a0d7543af 100644
--- a/Server/webadmin/template.lua
+++ b/Server/webadmin/template.lua
@@ -88,7 +88,7 @@ function ShowPage(WebAdmin, TemplateRequest)
<title>]] .. Title .. [[</title>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="/style.css">
- <link rel="icon" href="/favicon.ico">
+ <link rel="icon" href="/favicon.png">
</head>
<body>
<div class="contention push25">
diff --git a/src/Resources/icon.ico b/src/Resources/icon.ico
index 4d01896d7..40ae9f426 100644
--- a/src/Resources/icon.ico
+++ b/src/Resources/icon.ico
Binary files differ
diff --git a/src/Resources/icon_128.png b/src/Resources/icon_128.png
index 3641f66af..c0a875b22 100644
--- a/src/Resources/icon_128.png
+++ b/src/Resources/icon_128.png
Binary files differ
diff --git a/src/Resources/icon_16.png b/src/Resources/icon_16.png
index 9b3e7d5dd..5feb1d5e1 100644
--- a/src/Resources/icon_16.png
+++ b/src/Resources/icon_16.png
Binary files differ
diff --git a/src/Resources/icon_256.png b/src/Resources/icon_256.png
index 928605045..554e1c2d4 100644
--- a/src/Resources/icon_256.png
+++ b/src/Resources/icon_256.png
Binary files differ
diff --git a/src/Resources/icon_32.png b/src/Resources/icon_32.png
index b0bf87eca..b6c85a244 100644
--- a/src/Resources/icon_32.png
+++ b/src/Resources/icon_32.png
Binary files differ
diff --git a/src/Resources/icon_48.png b/src/Resources/icon_48.png
index 9e790ebd1..74b14ec6c 100644
--- a/src/Resources/icon_48.png
+++ b/src/Resources/icon_48.png
Binary files differ