summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias <mathias-github@users.noreply.github.com>2016-01-28 19:01:42 +0100
committerMathias <mathias-github@users.noreply.github.com>2016-01-28 19:01:42 +0100
commit152c7c064ad8a2b1ad87536ae591f0c4f3108a5e (patch)
tree33cd91503076f5217450bc7449fb06aafd6737ee
parentMerge pull request #2907 from cuberite/LuaNoSslVerify (diff)
downloadcuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar.gz
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar.bz2
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar.lz
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar.xz
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.tar.zst
cuberite-152c7c064ad8a2b1ad87536ae591f0c4f3108a5e.zip
-rw-r--r--Server/README.txt28
-rw-r--r--Server/favicon.pngbin1644 -> 797 bytes
-rw-r--r--src/Root.cpp1
3 files changed, 12 insertions, 17 deletions
diff --git a/Server/README.txt b/Server/README.txt
index f3972e90f..77521a510 100644
--- a/Server/README.txt
+++ b/Server/README.txt
@@ -1,17 +1,13 @@
-/=============================\
-| Custom Minecraft Server |
-|(Cuberite, formerly MCServer)|
-| |
-| Founder: Kevin Bansberg |
-| A.K.A. FakeTruth |
-| Lead dev: Mattes D |
-| A.K.A. _Xoft(o) |
-| A.K.A. xoft |
-| Monsters by Alex Sonek |
-| A.K.A. Duralex |
-|=============================|
-| Info: www.cuberite.org |
-\=============================/
+---------------------------------------------------------------------------------
+ Welcome to your new Cuberite server, compatible with Minecraft 1.7 and 1.8!
+---------------------------------------------------------------------------------
-Compatible clients: 1.7.x and 1.8.x
-Compatible protocol versions: 4, 5, 47
+ - To get started with your server, read the user's manual at
+ https://book.cuberite.org/
+
+ - For information about adding plugins to your server, visit
+ http://cuberite.org/plugins/
+
+ - For additional support, visit http://cuberite.org/support/
+
+---------------------------------------------------------------------------------
diff --git a/Server/favicon.png b/Server/favicon.png
index c2651d6e6..dc802ec91 100644
--- a/Server/favicon.png
+++ b/Server/favicon.png
Binary files differ
diff --git a/src/Root.cpp b/src/Root.cpp
index 2465cdfd4..aa532f88c 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -151,7 +151,6 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
LOGWARN("Regenerating settings.ini, all settings will be reset");
IniFile->AddHeaderComment(" This is the main server configuration");
IniFile->AddHeaderComment(" Most of the settings here can be configured using the webadmin interface, if enabled in webadmin.ini");
- IniFile->AddHeaderComment(" See: http://wiki.mc-server.org/doku.php?id=configure:settings.ini for further configuration help");
}
auto settingsRepo = cpp14::make_unique<cOverridesSettingsRepository>(std::move(IniFile), std::move(a_OverridesRepo));