diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-10 20:50:31 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-10 20:50:31 +0200 |
| commit | c8b41e9b2b329055eb86106aa34173158a838022 (patch) | |
| tree | 987447581f09776aeef4f204df52d27c15925a36 | |
| parent | Cleaned up flags (diff) | |
| parent | Merge pull request #1414 from Masy98/Crafting (diff) | |
| download | cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar.gz cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar.bz2 cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar.lz cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar.xz cuberite-c8b41e9b2b329055eb86106aa34173158a838022.tar.zst cuberite-c8b41e9b2b329055eb86106aa34173158a838022.zip | |
| -rw-r--r-- | MCServer/crafting.txt | 2 | ||||
| -rw-r--r-- | src/HTTPServer/HTTPServer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt index 64ad2adf9..1236ab10e 100644 --- a/MCServer/crafting.txt +++ b/MCServer/crafting.txt @@ -351,7 +351,7 @@ Clay, 4 = ClayBlock, * Painting = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Wool, 2:2 ItemFrame = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Leather, 2:2 -Sign = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 | Stick, 2:3 +Sign, 3 = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 | Stick, 2:3 Ladder, 3 = Stick, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 3:3 GlassPane, 16 = Glass, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 IronBars, 16 = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp index c91be677e..0c41b54b2 100644 --- a/src/HTTPServer/HTTPServer.cpp +++ b/src/HTTPServer/HTTPServer.cpp @@ -170,8 +170,8 @@ bool cHTTPServer::Initialize(const AString & a_PortsIPv4, const AString & a_Port // Notify the admin about the HTTPS / HTTP status if (m_Cert.get() == NULL) { - LOGWARNING("WebServer: The server is running in unsecure HTTP mode."); - LOGINFO("Put a valid HTTPS certificate to file 'webadmin/httpscert.crt' and its corresponding private key to 'httpskey.pem' (without any password) to enable HTTPS support"); + LOGWARNING("WebServer: The server is running in unsecured HTTP mode."); + LOGINFO("Put a valid HTTPS certificate in file 'webadmin/httpscert.crt' and its corresponding private key to 'webadmin/httpskey.pem' (without any password) to enable HTTPS support"); } else { |