summaryrefslogtreecommitdiffstats
path: root/Server
diff options
context:
space:
mode:
Diffstat (limited to 'Server')
-rw-r--r--Server/.gitignore1
-rw-r--r--Server/Plugins/Debuggers/Debuggers.lua2
-rw-r--r--Server/Plugins/HookNotify/HookNotify.lua2
-rw-r--r--Server/Plugins/NetworkTest/NetworkTest.lua4
-rw-r--r--Server/Plugins/TestLuaRocks/TestLuaRocks.lua2
-rw-r--r--Server/README.txt31
-rwxr-xr-xServer/hg2
-rw-r--r--Server/hg.supp2
-rwxr-xr-xServer/vg2
-rw-r--r--Server/webadmin/files/guest.html2
-rw-r--r--Server/webadmin/files/login.css2
-rw-r--r--Server/webadmin/files/style.css2
-rw-r--r--Server/webadmin/login_template.html4
-rw-r--r--Server/webadmin/template.html6
-rw-r--r--Server/webadmin/template.lua4
15 files changed, 33 insertions, 35 deletions
diff --git a/Server/.gitignore b/Server/.gitignore
index 1df22b079..768adbb2c 100644
--- a/Server/.gitignore
+++ b/Server/.gitignore
@@ -31,6 +31,7 @@ motd.txt
*.dmp
*.xml
mcserver_api.lua
+cuberite_api.lua
# Ignore the webadmin certs / privkey, so that no-one commits theirs by accident:
webadmin/httpscert.crt
diff --git a/Server/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua
index 85e2c50ae..5b7f26fe6 100644
--- a/Server/Plugins/Debuggers/Debuggers.lua
+++ b/Server/Plugins/Debuggers/Debuggers.lua
@@ -1459,7 +1459,7 @@ function HandleCompo(a_Split, a_Player)
-- Send one composite message to self:
local msg = cCompositeChat()
msg:AddTextPart("Hello! ", "b@e") -- bold yellow
- msg:AddUrlPart("MCServer", "http://mc-server.org")
+ msg:AddUrlPart("Cuberite", "http://cuberite.org")
msg:AddTextPart(" rules! ")
msg:AddRunCommandPart("Set morning", "/time set 0")
a_Player:SendMessage(msg)
diff --git a/Server/Plugins/HookNotify/HookNotify.lua b/Server/Plugins/HookNotify/HookNotify.lua
index 411dbebbd..33b1a80a8 100644
--- a/Server/Plugins/HookNotify/HookNotify.lua
+++ b/Server/Plugins/HookNotify/HookNotify.lua
@@ -5,7 +5,7 @@
Implements the entire plugin
NOTE: This plugin is not meant for production servers. It is used mainly by developers to verify that things
-are working properly when implementing MCServer features. Do not enable this plugin on production servers!
+are working properly when implementing Cuberite features. Do not enable this plugin on production servers!
This plugin logs a notification for each hook that is being called by the server.
The TICK and WORLD_TICK hooks are disabled because they produce too much output.
diff --git a/Server/Plugins/NetworkTest/NetworkTest.lua b/Server/Plugins/NetworkTest/NetworkTest.lua
index d6849ead6..1bb35d0c6 100644
--- a/Server/Plugins/NetworkTest/NetworkTest.lua
+++ b/Server/Plugins/NetworkTest/NetworkTest.lua
@@ -107,7 +107,7 @@ local g_Services =
-- Send a welcome message to newly accepted connections:
OnAccepted = function (a_Link)
- a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the echo server @ MCServer-Lua\r\n")
+ a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the echo server @ Cuberite-Lua\r\n")
end, -- OnAccepted()
-- There was an error listening on the port:
@@ -140,7 +140,7 @@ local g_Services =
-- Send a welcome message and the fortune to newly accepted connections:
OnAccepted = function (a_Link)
- a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the fortune server @ MCServer-Lua\r\n\r\nYour fortune:\r\n")
+ a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the fortune server @ Cuberite-Lua\r\n\r\nYour fortune:\r\n")
a_Link:Send(g_Fortunes[math.random(#g_Fortunes)] .. "\r\n")
end, -- OnAccepted()
diff --git a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
index 4a7cd4e1e..0e4ccb7d5 100644
--- a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
+++ b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
@@ -1,7 +1,7 @@
-- TestLuaRocks.lua
--- This is a mockup plugin that does a quick test of LuaRocks capability in MCServer
+-- This is a mockup plugin that does a quick test of LuaRocks capability in Cuberite
-- "Success" is when the plugin loads, downloads the forum webpage and displays the headers and length and then displays both libs as loaded.
-- "Failure" usually manifests as one of the "require" lines failing, although you have the luarock installed.
diff --git a/Server/README.txt b/Server/README.txt
index 3cddc37d2..f3972e90f 100644
--- a/Server/README.txt
+++ b/Server/README.txt
@@ -1,20 +1,17 @@
-/============================\
-| Custom Minecraft Server |
-| (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.mc-server.org |
-| www.ae-c.net |
-| www.rbthinktank.com |
-| Mail: faketruth@gmail.com |
-\============================/
+/=============================\
+| 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 |
+\=============================/
Compatible clients: 1.7.x and 1.8.x
Compatible protocol versions: 4, 5, 47
diff --git a/Server/hg b/Server/hg
index f79dce8e8..38ba01206 100755
--- a/Server/hg
+++ b/Server/hg
@@ -1,6 +1,6 @@
#! /bin/bash
-# This script runs MCServer under helgrind
+# This script runs Cuberite under helgrind
# It expects valgrind to be normally installed and available
# Note that this is for Linux only and debug-only, since it slows down MCS way too much
diff --git a/Server/hg.supp b/Server/hg.supp
index bea6ecf3c..7acad9edc 100644
--- a/Server/hg.supp
+++ b/Server/hg.supp
@@ -1,4 +1,4 @@
-# This is a valgrind suppressions file for running helgrind on MCServer
+# This is a valgrind suppressions file for running helgrind on Cuberite
# Use by adding "--suppressions=hg.supp" to the helgrind commandline
diff --git a/Server/vg b/Server/vg
index 5fc22ab68..53f30d8d1 100755
--- a/Server/vg
+++ b/Server/vg
@@ -1,6 +1,6 @@
#! /bin/bash
-# This script runs MCServer under valgrind
+# This script runs Cuberite under valgrind
# It expects valgrind to be normally installed and available
# Note that this is for Linux only and debug-only, since it slows down MCS way too much
diff --git a/Server/webadmin/files/guest.html b/Server/webadmin/files/guest.html
index 4f965b75c..27af93142 100644
--- a/Server/webadmin/files/guest.html
+++ b/Server/webadmin/files/guest.html
@@ -8,7 +8,7 @@
<body>
<p>
- Hello! Welcome to the MCServer WebAdmin.
+ Hello! Welcome to the Cuberite WebAdmin.
</p>
<p>
This is a default message, edit <b>files/guest.html</b> to add your own custom message.
diff --git a/Server/webadmin/files/login.css b/Server/webadmin/files/login.css
index 5d87da4c5..ad94e5810 100644
--- a/Server/webadmin/files/login.css
+++ b/Server/webadmin/files/login.css
@@ -1,4 +1,4 @@
-/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+/* Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */
* {
margin: 0;
}
diff --git a/Server/webadmin/files/style.css b/Server/webadmin/files/style.css
index 7c0671970..8cb803a05 100644
--- a/Server/webadmin/files/style.css
+++ b/Server/webadmin/files/style.css
@@ -1,4 +1,4 @@
-/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+/* Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */
* {
margin: 0;
}
diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html
index d0ab9b566..30b7d4f82 100644
--- a/Server/webadmin/login_template.html
+++ b/Server/webadmin/login_template.html
@@ -1,4 +1,4 @@
-<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -->
+<!-- Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */ -->
<html>
<head>
<title>Cuberite WebAdmin - Login</title>
@@ -32,7 +32,7 @@
<tbody>
<tr>
<td class="thead rounded_top">
- <div style="float:left!important"><strong>MCServer WebAdmin</strong></div>
+ <div style="float:left!important"><strong>Cuberite WebAdmin</strong></div>
</td>
</tr>
<tr>
diff --git a/Server/webadmin/template.html b/Server/webadmin/template.html
index b0864e35d..305c566cd 100644
--- a/Server/webadmin/template.html
+++ b/Server/webadmin/template.html
@@ -110,9 +110,9 @@
#cssmenu > ul > li > a:after { border-color:#707070; }
#cssmenu > ul > li > a:hover { background:#B8B8B8; }
</style>
- <meta name="msapplication-tooltip" content="MCServer WebAdministrator"/>
+ <meta name="msapplication-tooltip" content="Cuberite WebAdmin"/>
<meta name="msapplication-navbutton-color" content="#B8B8B8" />
- <link rel="shortcut icon" href="http://mc-server.org/favicon.ico" />
+ <link rel="shortcut icon" href="http://cuberite.org/favicon.ico" />
</head>
<body>
<div id="wrapper">
@@ -132,7 +132,7 @@
{CONTENT}
</div>
<footer>
- <p>MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.</p>
+ <p>Cuberite is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.</p>
<p>Web Design by <a href="https://github.com/WebFreak001"@WebFreak001</a></p>
</footer>
</div>
diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua
index 00b2523b7..03ef95088 100644
--- a/Server/webadmin/template.lua
+++ b/Server/webadmin/template.lua
@@ -81,7 +81,7 @@ function ShowPage(WebAdmin, TemplateRequest)
end
Output([[
-<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 -->
+<!-- Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 -->
<html>
<head>
<title>]] .. Title .. [[</title>
@@ -94,7 +94,7 @@ function ShowPage(WebAdmin, TemplateRequest)
<div class="pagehead">
<div class="row1">
<div class="wrapper">
- <img src="/logo_login.png" alt="MCServer Logo" class="logo">
+ <img src="/logo_login.png" alt="Cuberite Logo" class="logo">
</div>
</div>
<div id="panel">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 16:35:38 +0100