19 files changed, 35 insertions, 35 deletions

diff --git a/GETTING-STARTED.md b/GETTING-STARTED.md
index 5a36652ee..76e522cf7 100644
--- a/GETTING-STARTED.md
+++ b/GETTING-STARTED.md
@@ -17,8 +17,8 @@ Useful Resources
 ----------------
 
  * [Minecraft Wiki](http://minecraft.gamepedia.com/Minecraft_Wiki)
- * [Minecraft Protocol Wiki](http://wiki.vg)
- * [Lua API Documentation](http://api-docs.cuberite.org)
+ * [Minecraft Protocol Wiki](http://wiki.vg/Main_Page)
+ * [Lua API Documentation](http://api-docs.cuberite.org/)
  * [VS2013 Community Edition Download](https://www.visualstudio.com/products/visual-studio-community-vs)
 
 Setting up a Dev Environment
@@ -102,9 +102,9 @@ Where to Get Started
 Issues that should be easy to get started with are tagged as [easy](https://github.com/cuberite/cuberite/issues?q=is%3Aopen+is%3Aissue+label%3Aeasy) in GitHub issues. Other good places to get started are:
 
  * Cleaning up some of the compiler warnings. (Check [Travis CI](https://travis-ci.org/cuberite/cuberite) for a list of them.) With clang, there are over 10000 lines of warnings to clean up.
- *  Writing some plugins: They are written in lua, with excellent API documentation available via [APIDump](http://api-docs.cuberite.org). The [Core](https://github.com/cuberite/Core) plugin should also help quite a bit here.
+ *  Writing some plugins: They are written in lua, with excellent API documentation available via [APIDump](http://api-docs.cuberite.org/). The [Core](https://github.com/cuberite/Core) plugin should also help quite a bit here.
 
 Special Things
 ---------------------
- * Make yourself familiar with the community. Visit the forums: http://forum.mc-server.org
+ * Make yourself familiar with the community. Visit the forums: https://forum.cuberite.org/
  * Ask questions as much as you like, we're here to help :smiley:
diff --git a/README.md b/README.md
index acaa1ad33..3e75499da 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Cuberite can run on Windows, *nix and Android operating systems. This includes A
 
 We currently support Release 1.7 and 1.8 (not beta) Minecraft protocol versions.
 
-Subscribe to [the newsletter](https://newsletter.cuberite.org/subscribe.htm) for important updates and project news.
+Subscribe to [the newsletter](http://cuberite.org/news/) for important updates and project news.
 
 Installation
 ------------
@@ -17,7 +17,7 @@ There are several ways to obtain Cuberite.
 #### Binaries
  - The easiest method is downloading for Windows or Linux from the [Project site](http://cuberite.org/).
  - You can use the EasyInstall script for Linux, which automatically downloads the correct binary. The script is described below.
- - You can also obtain a binary from the [buildserver archive](https://builds.cuberite.org).
+ - You can also obtain a binary from the [buildserver archive](https://builds.cuberite.org/).
 
 ##### The EasyInstall script
 This Linux script will download the correct binary from the project site.
@@ -36,7 +36,7 @@ This script downloads the source code and compiles it. The script is smart enoug
     sh -c "$(wget -O - https://raw.githubusercontent.com/cuberite/cuberite/master/compile.sh)"
 
 #### Hosted services
- - Hosted Cuberite is available DIY on DigitalOcean: [![Install on DigitalOcean](http://doinstall.bearbin.net/button.svg)](http://doinstall.bearbin.net/install?url=https://github.com/cuberite/cuberite) and [Gamocosm](https://gamocosm.com) also offers Cuberite support.
+ - Hosted Cuberite is available DIY on DigitalOcean: [![Install on DigitalOcean](http://doinstall.bearbin.net/button.svg)](http://doinstall.bearbin.net/install?url=https://github.com/cuberite/cuberite) and [Gamocosm](https://gamocosm.com/) also offers Cuberite support.
 
 Contributing
 ------------
@@ -48,7 +48,7 @@ Check out the [CONTRIBUTING.md](https://github.com/cuberite/cuberite/blob/master
 Other Stuff
 -----------
 
-For other stuff, including plugins and discussion, check out the [forums](http://forum.mc-server.org) and [Plugin API](http://api-docs.cuberite.org).
+For other stuff, including plugins and discussion, check out the [forums](https://forum.cuberite.org/) and [Plugin API](http://api-docs.cuberite.org/).
 
 [Support Us on Bountysource](https://bountysource.com/teams/cuberite)
 
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>
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index efeb3b1e4..da13e3b10 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -781,7 +781,7 @@ void cChunk::CheckBlocks()
 void cChunk::TickBlocks(void)
 {
 	// Tick dem blocks
-	// _X: We must limit the random number or else we get a nasty int overflow bug - http://forum.mc-server.org/showthread.php?tid=457
+	// _X: We must limit the random number or else we get a nasty int overflow bug - https://forum.cuberite.org/thread-457.html
 	int RandomX = m_World->GetTickRandomNumber(0x00ffffff);
 	int RandomY = m_World->GetTickRandomNumber(0x00ffffff);
 	int RandomZ = m_World->GetTickRandomNumber(0x00ffffff);
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index cbbf910fb..705f0bed5 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -3081,7 +3081,7 @@ void cChunkMap::cChunkLayer::UnloadUnusedChunks(void)
 		{
 			// The cChunk destructor calls our GetChunk() while removing its entities
 			// so we still need to be able to return the chunk. Therefore we first delete, then nullptrify
-			// Doing otherwise results in bug http://forum.mc-server.org/showthread.php?tid=355
+			// Doing otherwise results in bug https://forum.cuberite.org/thread-355.html
 			delete m_Chunks[i];
 			m_Chunks[i] = nullptr;
 		}
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 4e882b5d8..792ca49b5 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1366,7 +1366,7 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
 	{
 		// Only compare ItemType, not meta (torches have different metas)
 		// The -1 check is there because sometimes the client sends -1 instead of the held item
-		// Ref.: http://forum.mc-server.org/showthread.php?tid=549&pid=4502#pid4502
+		// Ref.: https://forum.cuberite.org/thread-549-post-4502.html#pid4502
 		LOGWARN("Player %s tried to place a block that was not equipped (exp %d, got %d)",
 			m_Username.c_str(), Equipped.m_ItemType, a_HeldItem.m_ItemType
 		);
diff --git a/src/Defines.h b/src/Defines.h
index e2f72ed84..63ea3b8e5 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -627,7 +627,7 @@ template <class T> inline T Diff(T a_Val1, T a_Val2)
 
 enum eMessageType
 {
-	// http://forum.mc-server.org/showthread.php?tid=1212
+	// https://forum.cuberite.org/thread-1212.html
 	// MessageType...
 
 	mtCustom,          // Send raw data without any processing
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index aeb70b552..d4097f734 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1554,7 +1554,7 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
 	if (!a_Chunk.UnboundedRelGetBlockType(RelX, RelY, RelZ, BlockIn))
 	{
 		// This sometimes happens on Linux machines
-		// Ref.: http://forum.mc-server.org/showthread.php?tid=1244
+		// Ref.: https://forum.cuberite.org/thread-1244.html
 		LOGD("SetSwimState failure: RelX = %d, RelZ = %d, Pos = %.02f, %.02f}",
 			RelX, RelY, GetPosX(), GetPosZ()
 		);
diff --git a/src/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h
index 41e4baf52..32345fc79 100644
--- a/src/Generating/ComposableGenerator.h
+++ b/src/Generating/ComposableGenerator.h
@@ -8,7 +8,7 @@ Generating works by composing several algorithms:
 Biome, TerrainHeight, TerrainComposition, Ores, Structures and SmallFoliage
 Each algorithm may be chosen from a pool of available algorithms in the same class and combined with others,
 based on user's preferences in the world.ini.
-See http://forum.mc-server.org/showthread.php?tid=409 for details.
+See https://forum.cuberite.org/thread-409.html for details.
 */
 
 
diff --git a/src/Items/ItemSlab.h b/src/Items/ItemSlab.h
index 97f721c2f..e51c6675b 100644
--- a/src/Items/ItemSlab.h
+++ b/src/Items/ItemSlab.h
@@ -121,7 +121,7 @@ public:
 		The client has a bug when a slab replaces snow and there's a slab above it.
 		The client then combines the slab above, rather than replacing the snow.
 		We send the block above the currently placed block back to the client to fix the bug.
-		Ref.: http://forum.mc-server.org/showthread.php?tid=434&pid=17388#pid17388
+		Ref.: https://forum.cuberite.org/thread-434-post-17388.html#pid17388
 		*/
 		if ((a_BlockFace == BLOCK_FACE_TOP) && (a_BlockY < cChunkDef::Height - 1))
 		{
diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h
index c268b5ff6..d48005d2e 100644
--- a/src/Mobs/MonsterTypes.h
+++ b/src/Mobs/MonsterTypes.h
@@ -42,7 +42,7 @@ enum eMonsterType
 	mtWolf         = E_META_SPAWN_EGG_WOLF,
 	mtZombie       = E_META_SPAWN_EGG_ZOMBIE,
 	mtZombiePigman = E_META_SPAWN_EGG_ZOMBIE_PIGMAN,
-	mtMax          = 120,  // This is just a hotfix for http://forum.mc-server.org/showthread.php?tid=1616. Tolua is too bad to find the highest value, so this is needed.
+	mtMax          = 120,  // This is just a hotfix for https://forum.cuberite.org/thread-1616.html. Tolua is too bad to find the highest value, so this is needed.
 } ;
 
 // tolua_end
diff --git a/src/Server.cpp b/src/Server.cpp
index 5c050c215..5548e77d1 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -373,7 +373,7 @@ void cServer::TickClients(float a_Dt)
 		{
 			if ((*itr)->IsDestroyed())
 			{
-				// Delete the client later, when CS is not held, to avoid deadlock: http://forum.mc-server.org/showthread.php?tid=374
+				// Delete the client later, when CS is not held, to avoid deadlock: https://forum.cuberite.org/thread-374.html
 				RemoveClients.push_back(*itr);
 				itr = m_Clients.erase(itr);
 				continue;
diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp
index 45a34a8d9..518357f0b 100644
--- a/src/Simulator/FloodyFluidSimulator.cpp
+++ b/src/Simulator/FloodyFluidSimulator.cpp
@@ -2,7 +2,7 @@
 // FloodyFluidSimulator.cpp
 
 // Interfaces to the cFloodyFluidSimulator that represents a fluid simulator that tries to flood everything :)
-// http://forum.mc-server.org/showthread.php?tid=565
+// https://forum.cuberite.org/thread-565.html
 
 #include "Globals.h"
 
diff --git a/src/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h
index 0eac61a03..44ac05ab3 100644
--- a/src/Simulator/FloodyFluidSimulator.h
+++ b/src/Simulator/FloodyFluidSimulator.h
@@ -2,7 +2,7 @@
 // FloodyFluidSimulator.h
 
 // Interfaces to the cFloodyFluidSimulator that represents a fluid simulator that tries to flood everything :)
-// http://forum.mc-server.org/showthread.php?tid=565
+// https://forum.cuberite.org/thread-565.html
 
 
 
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index d0b963e13..e23c3c698 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -35,7 +35,7 @@ cWindow::cWindow(WindowType a_WindowType, const AString & a_WindowTitle) :
 	m_Owner(nullptr)
 {
 	// The window ID is signed in protocol 1.7, unsigned in protocol 1.8. Keep out of trouble by using only 7 bits:
-	// Ref.: http://forum.mc-server.org/showthread.php?tid=1876
+	// Ref.: https://forum.cuberite.org/thread-1876.html
 	ASSERT((m_WindowID >= 0) && (m_WindowID < 127));
 
 	if (a_WindowType == wtInventory)