5 files changed, 15 insertions, 15 deletions

diff --git a/Server/Plugins/APIDump/Classes/Plugins.lua b/Server/Plugins/APIDump/Classes/Plugins.lua
index 758598242..e053c57e2 100644
--- a/Server/Plugins/APIDump/Classes/Plugins.lua
+++ b/Server/Plugins/APIDump/Classes/Plugins.lua
@@ -37,7 +37,7 @@ return
 			plugins, can enable or disable plugins, manages hooks and in-game console commands.</p>
 			<p>
 			Plugins can be identified by either the PluginFolder or PluginName. Note that these two can differ,
-			refer to <a href="http://forum.mc-server.org/showthread.php?tid=1877">the forum</a> for detailed discussion.
+			refer to <a href="https://forum.cuberite.org/thread-1877.html">the forum</a> for detailed discussion.
 			<p>
 			There is one instance of cPluginManager in Cuberite, to get it, call either
 			{{cRoot|cRoot}}:Get():GetPluginManager() or cPluginManager:Get() function.</p>
diff --git a/Server/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html
index 7f350f9f2..066af7d7a 100644
--- a/Server/Plugins/APIDump/InfoFile.html
+++ b/Server/Plugins/APIDump/InfoFile.html
@@ -234,8 +234,8 @@ RegisterPluginInfoConsoleCommands()
 
 			<p>There are several plugins that already implement this approach. You can visit them for inspiration and to see what the generated documentation looks like:</p>
 			<ul>
-				<li>Gallery plugin: <a href="https://github.com/cuberite/gallery/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=1306">Forum</a> documentation</li>
-				<li>WorldEdit plugin: <a href="https://github.com/cuberite/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=870">Forum</a> and <a href="https://github.com/cuberite/WorldEdit">MarkDown</a> documentation</li>
+				<li>Gallery plugin: <a href="https://github.com/cuberite/gallery/blob/master/Info.lua">Info.lua</a>, <a href="https://forum.cuberite.org/thread-1306.html">Forum</a> documentation</li>
+				<li>WorldEdit plugin: <a href="https://github.com/cuberite/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="https://forum.cuberite.org/thread-870.html">Forum</a> and <a href="https://github.com/cuberite/WorldEdit">MarkDown</a> documentation</li>
 			</ul>
 
 			<script>
diff --git a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
index 0e4ccb7d5..a4c2be6f8 100644
--- a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
+++ b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
@@ -21,7 +21,7 @@ local http = require("socket.http");
 
 
 LOGINFO("Trying to download a webpage...");
-local body, code, headers = http.request('http://forum.mc-server.org/index.php');
+local body, code, headers = http.request('https://forum.cuberite.org/');
 LOG("code: " .. tostring(code));
 LOG("headers: ");
 for k, v in pairs(headers or {}) do
@@ -46,4 +46,4 @@ function Initialize(a_Plugin)
 	end
 	LOGINFO("Preventing plugin load so that it may be requested again from the webadmin.");
 	return false;
-end
\ No newline at end of file
+end
diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html
index 30b7d4f82..20393d828 100644
--- a/Server/webadmin/login_template.html
+++ b/Server/webadmin/login_template.html
@@ -51,17 +51,17 @@
 	<div class="upper">
 		<div class="wrapper">
 			<ul class="menu bottom_links">
-				<li><a href="http://cuberite.org" target="_blank">Cuberite</a></li>
-				<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
-				<li><a href="https://builds.cuberite.org" target="_blank">Buildserver</a></li>
-				<li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li>
+				<li><a href="http://cuberite.org/" target="_blank">Cuberite</a></li>
+				<li><a href="https://forum.cuberite.org/" target="_blank">Forums</a></li>
+				<li><a href="https://builds.cuberite.org/" target="_blank">Buildserver</a></li>
+				<li><a href="http://api-docs.cuberite.org/" target="_blank">API Documentation</a></li>
 				<li><a href="https://book.cuberite.org/" target="_blank">User's Manual</a></li>
 			</ul>
 		</div>
 	</div>
 	<div class="lower">
 		<div class="wrapper">
-			<span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span>
+			<span id="copyright">Copyright © <a href="http://cuberite.org/" target="_blank">Cuberite Team</a>.</span>
 		</div>
 	</div>
 </div>
diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua
index 03ef95088..d80ca5f74 100644
--- a/Server/webadmin/template.lua
+++ b/Server/webadmin/template.lua
@@ -177,17 +177,17 @@ function ShowPage(WebAdmin, TemplateRequest)
 	<div class="upper">
 		<div class="wrapper">
 			<ul class="menu bottom_links">
-				<li><a href="http://cuberite.org" target="_blank">Cuberite</a></li>
-				<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
-				<li><a href="https://builds.cuberite.org" target="_blank">Buildserver</a></li>
-				<li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li>
+				<li><a href="http://cuberite.org/" target="_blank">Cuberite</a></li>
+				<li><a href="https://forum.cuberite.org/" target="_blank">Forums</a></li>
+				<li><a href="https://builds.cuberite.org/" target="_blank">Buildserver</a></li>
+				<li><a href="http://api-docs.cuberite.org/" target="_blank">API Documentation</a></li>
 				<li><a href="https://book.cuberite.org/" target="_blank">User's Manual</a></li>
 			</ul>
 		</div>
 	</div>
 	<div class="lower">
 		<div class="wrapper">
-			<span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span>
+			<span id="copyright">Copyright © <a href="http://cuberite.org/" target="_blank">Cuberite Team</a>.</span>
 		</div>
 	</div>
 </div>