167 files changed, 71 insertions, 183 deletions

diff --git a/.gitignore b/.gitignore
index 8dc90910c..1386548bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,13 @@ build/
 nbproject/
 ipch/
 Win32/
-MCServer/MCServer
-MCServer/buildinfo
-MCServer/CONTRIBUTORS
-MCServer/LICENSE
-MCServer/Licenses
-MCServer/itemblacklist
+MCServer
+Server/Cuberite
+Server/buildinfo
+Server/CONTRIBUTORS
+Server/LICENSE
+Server/Licenses
+Server/itemblacklist
 Testing/
 ChunkWorxSave.ini
 doxy/
@@ -71,11 +72,11 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_mainfest.txt
-src/MCServer
+src/Cuberite
 lib/tolua++/tolua
 src/Bindings/Bindings.*
 src/Bindings/BindingDependencies.txt
-MCServer.dir/
+Cuberite.dir/
 src/AllFiles.lst
 
 #win32 cmake stuff
diff --git a/.gitmodules b/.gitmodules
index f3653ec9f..7ea69d180 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,23 +1,23 @@
 [submodule "MCServer/Plugins/Core"]
-	path = MCServer/Plugins/Core
+	path = Server/Plugins/Core
 	url = https://github.com/mc-server/Core.git
 [submodule "MCServer/Plugins/ProtectionAreas"]
-	path = MCServer/Plugins/ProtectionAreas
+	path = Server/Plugins/ProtectionAreas
 	url = https://github.com/mc-server/ProtectionAreas.git
 [submodule "MCServer/Plugins/TransAPI"]
-	path = MCServer/Plugins/TransAPI
+	path = Server/Plugins/TransAPI
 	url = https://github.com/bearbin/transapi.git
 [submodule "MCServer/Plugins/ChunkWorx"]
-	path = MCServer/Plugins/ChunkWorx
+	path = Server/Plugins/ChunkWorx
 	url = https://github.com/mc-server/ChunkWorx.git
 [submodule "MCServer/Plugins/ChatLog"]
-	path = MCServer/Plugins/ChatLog
+	path = Server/Plugins/ChatLog
 	url = https://github.com/mc-server/ChatLog.git
 [submodule "MCServer/Plugins/Handy"]
-	path = MCServer/Plugins/Handy
+	path = Server/Plugins/Handy
 	url = https://github.com/mc-server/Handy.git
 [submodule "MCServer/Plugins/MagicCarpet"]
-	path = MCServer/Plugins/MagicCarpet
+	path = Server/Plugins/MagicCarpet
 	url = https://github.com/mc-server/MagicCarpet.git
 [submodule "lib/polarssl"]
 	path = lib/polarssl
diff --git a/.travis.yml b/.travis.yml
index d5305f601..01b51ee9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: cpp
 sudo: false
 
-compiler: 
+compiler:
 - clang
 - gcc
 
@@ -16,8 +16,8 @@ addons:
 script: ./CIbuild.sh
 
 env:
-  - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
-  - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG   MCSERVER_PATH=./MCServer_debug
+  - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE CUBERITE_PATH=./Cuberite
+  - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG   CUBERITE_PATH=./Cuberite_debug
 
 notifications:
   email:
diff --git a/CIbuild.sh b/CIbuild.sh
index f1a583c79..8a91549ad 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -2,9 +2,9 @@
 
 set -e
 
-export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
-export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
-export MCSERVER_BUILD_DATETIME=`date`
+export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE"
+export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER
+export CUBERITE_BUILD_DATETIME=`date`
 
 if [ "$CXX" == "g++" ]; then
 	# This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features
@@ -21,8 +21,8 @@ cd ..
 echo "Building..."
 make -j 2;
 make -j 2 test ARGS="-V";
-cd MCServer/;
-if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]; then
-	echo restart | $MCSERVER_PATH;
-	echo stop | $MCSERVER_PATH;
+cd Server/;
+if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
+	echo restart | $CUBERITE_PATH;
+	echo stop | $CUBERITE_PATH;
 fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95e10a53..78bbc5c89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,9 @@ endif()
 
 # These env variables are used for configuring Travis CI builds.
 # See https://github.com/mc-server/MCServer/pull/767
-if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE})
-	message("Setting build type to $ENV{TRAVIS_MCSERVER_BUILD_TYPE}")
-	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_MCSERVER_BUILD_TYPE})
+if(DEFINED ENV{TRAVIS_CUBERITE_BUILD_TYPE})
+	message("Setting build type to $ENV{TRAVIS_CUBERITE_BUILD_TYPE}")
+	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_CUBERITE_BUILD_TYPE})
 endif()
 
 if(DEFINED ENV{TRAVIS_MCSERVER_FORCE32})
@@ -23,13 +23,13 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
 	set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
 endif()
 
-if(DEFINED ENV{MCSERVER_BUILD_ID})
+if(DEFINED ENV{CUBERITE_BUILD_ID})
 	# The build info is defined by the build system (Travis / Jenkins)
-	set(BUILD_ID $ENV{MCSERVER_BUILD_ID})
-	set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME})
-	set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME})
-	if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID})
-		set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID})
+	set(BUILD_ID $ENV{CUBERITE_BUILD_ID})
+	set(BUILD_SERIES_NAME $ENV{CUBERITE_BUILD_SERIES_NAME})
+	set(BUILD_DATETIME $ENV{CUBERITE_BUILD_DATETIME})
+	if(DEFINED ENV{CUBERITE_BUILD_COMMIT_ID})
+		set(BUILD_COMMIT_ID $ENV{CUBERITE_BUILD_COMMIT_ID})
 	else()
 		message("Commit id not set, attempting to determine id from git")
 		execute_process(
@@ -75,16 +75,16 @@ endif()
 # We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively:
 # Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/
 if(MSVC OR MSVC_IDE)
-  if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
-    message(FATAL_ERROR "The project requires C++11 features. "
-      "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
-  elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
-    message( "VC11: using Microsoft Visual Studio 2012 "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
-    set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
-  else() # VC12+, assuming C++11 supported.
-  endif()
+	if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
+		message(FATAL_ERROR "The project requires C++11 features. "
+		"You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
+	elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
+		message( "VC11: using Microsoft Visual Studio 2012 "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
+		set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
+	else() # VC12+, assuming C++11 supported.
+	endif()
 endif()
 
 set(BUILD_TOOLS OFF CACHE BOOL "")
@@ -129,7 +129,7 @@ endif()
 
 
 
-project (MCServer)
+project (Cuberite)
 
 # Set options for SQLiteCpp, disable all their tests and lints:
 set(SQLITECPP_RUN_CPPLINT     OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide."  FORCE)
@@ -259,4 +259,3 @@ if (MSVC)
 		)
 	endif()
 endif()
-
diff --git a/MCServer/delete_windows_service.cmd b/MCServer/delete_windows_service.cmd
deleted file mode 100644
index ab6238e2f..000000000
--- a/MCServer/delete_windows_service.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off

-set SERVICENAME="MCServer"

-

-sc delete %SERVICENAME%
\ No newline at end of file
diff --git a/MCServer/favicon.png b/MCServer/favicon.png
deleted file mode 100644
index 946cce005..000000000
--- a/MCServer/favicon.png
+++ /dev/null
diff --git a/MCServer/install_windows_service.cmd b/MCServer/install_windows_service.cmd
deleted file mode 100644
index d6b6c15a3..000000000
--- a/MCServer/install_windows_service.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-rem Alter this if you need to install multiple instances.

-@echo off

-set SERVICENAME="MCServer"

-

-set CURRENTDIR=%CD%

-sc create %SERVICENAME% binPath= "%CURRENTDIR%\MCServer.exe -d" start= auto DisplayName= %SERVICENAME%

-sc description %SERVICENAME% "Minecraft server instance"
\ No newline at end of file
diff --git a/MCServer/profile_run.cmd b/MCServer/profile_run.cmd
deleted file mode 100644
index 6137e9d4d..000000000
--- a/MCServer/profile_run.cmd
+++ /dev/null
@@ -1,101 +0,0 @@
-@echo off
-::
-:: Profiling using a MSVC standalone profiler
-::
-:: See http://www.codeproject.com/Articles/144643/Profiling-of-C-Applications-in-Visual-Studio-for-F for details
-:: Note that this script assumes a newer version of the tool, Performance Tools 2010, so that it is Win7-compatible
-:: Download at http://www.microsoft.com/en-ca/download/details.aspx?id=23205
-::
-:: This script sets the profiler up, then starts the app, waits for it to finish and stops the profiler.
-:: Then it generates all the CSV report files
-::
-:: It expects the MS Performance tools installed in C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools
-:: You can override this path by setting the pt environment variable prior to launching this script
-::
-:: By default it will launch the 32-bit release version of MCServer; set the app environment variable to another executable to run that instead.
-:: Set the IsExecutablex64 env variable to \x64 to profile a 64-bit executable instead (available as the profile_run_x64.cmd script)
-:: Note that the app needs to be compiled with the "/PROFILE" flag in order for the profiling to work
-
-
-
-
-setlocal
-
-:: Get the 32-bit program files folder
-:: Note that in Win7 the %ProgramFiles% variable points to 32-bit program files for normal users and to 64-bit program files for elevated users
-:: This script needs elevation, but the performance tools are 32-bit only
-if "%programfiles(x86)%p" == "p" (
-	set ProgFiles="%ProgramFiles%"
-) else (
-	set ProgFiles="%ProgramFiles(x86)%"
-)
-
-:: Check that the required variables exist, provide defaults:
-if %pt%n == n (
-	set pt="%ProgFiles:"=%\Microsoft Visual Studio 10.0\Team Tools\Performance Tools"
-)
-
-if %app%n == n (
-	set app=MCServer_profile.exe
-)
-
-if %outputdir%n == n (
-	set outputdir=..\Profiling
-)
-
-
-
-
-:: Create the output directory, if it didn't exist
-mkdir %outputdir%
-
-
-
-
-
-:: Start the profiler
-set outputname=profile.vsp
-set output=%outputdir%\%outputname%
-%pt%%IsExecutablex64%\vsperfcmd /start:sample /output:%output%
-if errorlevel 1 goto haderror
-
-:: Launch the application via the profiler
-%pt%%IsExecutablex64%\vsperfcmd /launch:%app%
-if errorlevel 1 goto haderrorshutdown
-
-:: Shut down the profiler (this command waits, until the application is terminated)
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: cd to outputdir, so that the reports are generated there
-cd %outputdir%
-
-:: generate the report files (.csv)
-%pt%\vsperfreport /summary:all %outputname% /symbolpath:"srv*C:\Programovani\Symbols*http://msdl.microsoft.com/download/symbols" 
-if errorlevel 1 goto haderror
-
-
-
-
-
-goto finished
-
-
-
-
-:haderrorshutdown
-echo An error was encountered, shutting down the profiler
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-
-:haderror
-echo An error was encountered
-pause
-
-
-
-
-:finished
diff --git a/MCServer/profile_run_debug.cmd b/MCServer/profile_run_debug.cmd
deleted file mode 100644
index a9792541a..000000000
--- a/MCServer/profile_run_debug.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on the DebugProfile executable
-
-set app=MCServer_debug_profile.exe
-call profile_run.cmd
diff --git a/MCServer/profile_run_x64.cmd b/MCServer/profile_run_x64.cmd
deleted file mode 100644
index 242136f4b..000000000
--- a/MCServer/profile_run_x64.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on a x64 release executable
-
-set IsExecutablex64=\x64
-call profile_run.cmd
diff --git a/MCServer/.gitignore b/Server/.gitignore
index 6da9aa7c7..161734f86 100644
--- a/MCServer/.gitignore
+++ b/Server/.gitignore
@@ -3,8 +3,8 @@
 *.exp
 *.lib
 *.ini
-MCServer
-MCServer_debug
+Cuberite
+Cuberite_debug
 CommLogs/
 GalExports/
 logs
@@ -33,4 +33,3 @@ mcserver_api.lua
 # Ignore the webadmin certs / privkey, so that no-one commits theirs by accident:
 webadmin/httpscert.crt
 webadmin/httpskey.pem
-
diff --git a/MCServer/Plugins/.gitignore b/Server/Plugins/.gitignore
index 8553945b5..8553945b5 100644
--- a/MCServer/Plugins/.gitignore
+++ b/Server/Plugins/.gitignore
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index 187c72b9e..187c72b9e 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
diff --git a/MCServer/Plugins/APIDump/APIDump.deproj b/Server/Plugins/APIDump/APIDump.deproj
index 0e6fcd325..0e6fcd325 100644
--- a/MCServer/Plugins/APIDump/APIDump.deproj
+++ b/Server/Plugins/APIDump/APIDump.deproj
diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/Server/Plugins/APIDump/Classes/BlockEntities.lua
index daa658654..daa658654 100644
--- a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
+++ b/Server/Plugins/APIDump/Classes/BlockEntities.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Geometry.lua b/Server/Plugins/APIDump/Classes/Geometry.lua
index 36bd222a6..36bd222a6 100644
--- a/MCServer/Plugins/APIDump/Classes/Geometry.lua
+++ b/Server/Plugins/APIDump/Classes/Geometry.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Network.lua b/Server/Plugins/APIDump/Classes/Network.lua
index c7626562d..c7626562d 100644
--- a/MCServer/Plugins/APIDump/Classes/Network.lua
+++ b/Server/Plugins/APIDump/Classes/Network.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Plugins.lua b/Server/Plugins/APIDump/Classes/Plugins.lua
index 0d0aae04f..0d0aae04f 100644
--- a/MCServer/Plugins/APIDump/Classes/Plugins.lua
+++ b/Server/Plugins/APIDump/Classes/Plugins.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Projectiles.lua b/Server/Plugins/APIDump/Classes/Projectiles.lua
index 748f58b71..748f58b71 100644
--- a/MCServer/Plugins/APIDump/Classes/Projectiles.lua
+++ b/Server/Plugins/APIDump/Classes/Projectiles.lua
diff --git a/MCServer/Plugins/APIDump/Classes/WebAdmin.lua b/Server/Plugins/APIDump/Classes/WebAdmin.lua
index 808335aea..808335aea 100644
--- a/MCServer/Plugins/APIDump/Classes/WebAdmin.lua
+++ b/Server/Plugins/APIDump/Classes/WebAdmin.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua b/Server/Plugins/APIDump/Hooks/OnBlockSpread.lua
index 7da796d4d..7da796d4d 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua
+++ b/Server/Plugins/APIDump/Hooks/OnBlockSpread.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua b/Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua
index d404da073..d404da073 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua
+++ b/Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChat.lua b/Server/Plugins/APIDump/Hooks/OnChat.lua
index a15d09cc7..a15d09cc7 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChat.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChat.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua b/Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua
index 61c191c57..61c191c57 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua
index 64bfdad5c..64bfdad5c 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua
index 0db0e2727..0db0e2727 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
index a67d5d461..a67d5d461 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua
index 98e0a71fd..98e0a71fd 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua
+++ b/Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua b/Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua
index 2a451da92..2a451da92 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua
+++ b/Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua b/Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
index 7cd86b8b8..7cd86b8b8 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
+++ b/Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua b/Server/Plugins/APIDump/Hooks/OnDisconnect.lua
index ae872a3ad..ae872a3ad 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua
+++ b/Server/Plugins/APIDump/Hooks/OnDisconnect.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua b/Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
index 155abc41b..155abc41b 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
+++ b/Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
index 6675fdbe0..6675fdbe0 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
+++ b/Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
index 521f829c7..521f829c7 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
+++ b/Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua b/Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua
index cdeb0947f..cdeb0947f 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua
+++ b/Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua b/Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua
index 4aa31bbd6..4aa31bbd6 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua
+++ b/Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploded.lua b/Server/Plugins/APIDump/Hooks/OnExploded.lua
index 6a01542ab..6a01542ab 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnExploded.lua
+++ b/Server/Plugins/APIDump/Hooks/OnExploded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploding.lua b/Server/Plugins/APIDump/Hooks/OnExploding.lua
index e21b41be0..e21b41be0 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnExploding.lua
+++ b/Server/Plugins/APIDump/Hooks/OnExploding.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHandshake.lua b/Server/Plugins/APIDump/Hooks/OnHandshake.lua
index 6183cc506..6183cc506 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnHandshake.lua
+++ b/Server/Plugins/APIDump/Hooks/OnHandshake.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
index b268a76be..b268a76be 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
+++ b/Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
index bd5702518..bd5702518 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
+++ b/Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilled.lua b/Server/Plugins/APIDump/Hooks/OnKilled.lua
index 9289b8f35..9289b8f35 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnKilled.lua
+++ b/Server/Plugins/APIDump/Hooks/OnKilled.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilling.lua b/Server/Plugins/APIDump/Hooks/OnKilling.lua
index 6bfd75fb6..6bfd75fb6 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnKilling.lua
+++ b/Server/Plugins/APIDump/Hooks/OnKilling.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnLogin.lua b/Server/Plugins/APIDump/Hooks/OnLogin.lua
index f71c3ade4..f71c3ade4 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnLogin.lua
+++ b/Server/Plugins/APIDump/Hooks/OnLogin.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua b/Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
index baf99834e..baf99834e 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
index 18f19f247..18f19f247 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
index e718c5d97..e718c5d97 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua b/Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
index dc033197a..dc033197a 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua b/Server/Plugins/APIDump/Hooks/OnPlayerEating.lua
index e77d02a96..e77d02a96 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerEating.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFished.lua
index 4e093f4ae..4e093f4ae 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerFished.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua
index c5aaecd92..c5aaecd92 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
index 53637d5f1..53637d5f1 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua b/Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua
index dcd16ed00..dcd16ed00 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
index 3d4c07950..3d4c07950 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua b/Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua
index 4385bf94d..4385bf94d 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
index 74d4c19e3..74d4c19e3 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
index b78acc327..b78acc327 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
index e1b95197d..e1b95197d 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
index b271cf058..b271cf058 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua b/Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua
index 7315ede7a..7315ede7a 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua b/Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
index 190909ee5..190909ee5 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
index 880404bf8..880404bf8 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
index babd70fcc..babd70fcc 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
index 6089928e2..6089928e2 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
index b4ecb5ca1..b4ecb5ca1 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
index 9b2949f93..9b2949f93 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua b/Server/Plugins/APIDump/Hooks/OnPluginMessage.lua
index 743d3bb5e..743d3bb5e 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPluginMessage.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua b/Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
index 2c8a5a2c9..2c8a5a2c9 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPostCrafting.lua
index 0dc9d4c73..0dc9d4c73 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPostCrafting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPreCrafting.lua
index 8f24fc881..8f24fc881 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua
+++ b/Server/Plugins/APIDump/Hooks/OnPreCrafting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
index 72cf85821..72cf85821 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
+++ b/Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
index dd949fb46..dd949fb46 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
+++ b/Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/Server/Plugins/APIDump/Hooks/OnServerPing.lua
index 430465786..430465786 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/Server/Plugins/APIDump/Hooks/OnServerPing.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
index 037a90f1c..037a90f1c 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
+++ b/Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
index c319a77ea..c319a77ea 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
+++ b/Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua
index e2bd1c940..e2bd1c940 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
+++ b/Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua
index 4c0519e27..4c0519e27 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua
+++ b/Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua b/Server/Plugins/APIDump/Hooks/OnTakeDamage.lua
index 608126f2b..608126f2b 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua
+++ b/Server/Plugins/APIDump/Hooks/OnTakeDamage.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnTick.lua b/Server/Plugins/APIDump/Hooks/OnTick.lua
index d8c329253..d8c329253 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnTick.lua
+++ b/Server/Plugins/APIDump/Hooks/OnTick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua
index 937e6b981..937e6b981 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua
+++ b/Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua
index d74458182..d74458182 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua
+++ b/Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua
index 2a3bbe92b..2a3bbe92b 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua
+++ b/Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua
index bb809af11..bb809af11 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua
+++ b/Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua b/Server/Plugins/APIDump/Hooks/OnWorldStarted.lua
index 61e3de86e..61e3de86e 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua
+++ b/Server/Plugins/APIDump/Hooks/OnWorldStarted.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua b/Server/Plugins/APIDump/Hooks/OnWorldTick.lua
index 657716d9e..657716d9e 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua
+++ b/Server/Plugins/APIDump/Hooks/OnWorldTick.lua
diff --git a/MCServer/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html
index 99910f5ae..99910f5ae 100644
--- a/MCServer/Plugins/APIDump/InfoFile.html
+++ b/Server/Plugins/APIDump/InfoFile.html
diff --git a/MCServer/Plugins/APIDump/LICENSE-prettify.txt b/Server/Plugins/APIDump/LICENSE-prettify.txt
index b7f86df20..b7f86df20 100644
--- a/MCServer/Plugins/APIDump/LICENSE-prettify.txt
+++ b/Server/Plugins/APIDump/LICENSE-prettify.txt
diff --git a/MCServer/Plugins/APIDump/SettingUpDecoda.html b/Server/Plugins/APIDump/SettingUpDecoda.html
index 8a74f0240..8a74f0240 100644
--- a/MCServer/Plugins/APIDump/SettingUpDecoda.html
+++ b/Server/Plugins/APIDump/SettingUpDecoda.html
diff --git a/MCServer/Plugins/APIDump/SettingUpZeroBrane.html b/Server/Plugins/APIDump/SettingUpZeroBrane.html
index d2f5bb483..d2f5bb483 100644
--- a/MCServer/Plugins/APIDump/SettingUpZeroBrane.html
+++ b/Server/Plugins/APIDump/SettingUpZeroBrane.html
diff --git a/MCServer/Plugins/APIDump/Static/.gitignore b/Server/Plugins/APIDump/Static/.gitignore
index 8d1c8b69c..8d1c8b69c 100644
--- a/MCServer/Plugins/APIDump/Static/.gitignore
+++ b/Server/Plugins/APIDump/Static/.gitignore
diff --git a/MCServer/Plugins/APIDump/Static/decoda_debug_settings.png b/Server/Plugins/APIDump/Static/decoda_debug_settings.png
index 462d517b4..462d517b4 100644
--- a/MCServer/Plugins/APIDump/Static/decoda_debug_settings.png
+++ b/Server/Plugins/APIDump/Static/decoda_debug_settings.png
diff --git a/MCServer/Plugins/APIDump/Static/decoda_logo.png b/Server/Plugins/APIDump/Static/decoda_logo.png
index fb446b62c..fb446b62c 100644
--- a/MCServer/Plugins/APIDump/Static/decoda_logo.png
+++ b/Server/Plugins/APIDump/Static/decoda_logo.png
diff --git a/MCServer/Plugins/APIDump/Static/decoda_workspace.png b/Server/Plugins/APIDump/Static/decoda_workspace.png
index 7e626dae9..7e626dae9 100644
--- a/MCServer/Plugins/APIDump/Static/decoda_workspace.png
+++ b/Server/Plugins/APIDump/Static/decoda_workspace.png
diff --git a/MCServer/Plugins/APIDump/Static/zbs_logo.png b/Server/Plugins/APIDump/Static/zbs_logo.png
index c8d6d6278..c8d6d6278 100644
--- a/MCServer/Plugins/APIDump/Static/zbs_logo.png
+++ b/Server/Plugins/APIDump/Static/zbs_logo.png
diff --git a/MCServer/Plugins/APIDump/Static/zbs_workspace.png b/Server/Plugins/APIDump/Static/zbs_workspace.png
index 9ce17e35a..9ce17e35a 100644
--- a/MCServer/Plugins/APIDump/Static/zbs_workspace.png
+++ b/Server/Plugins/APIDump/Static/zbs_workspace.png
diff --git a/MCServer/Plugins/APIDump/UsingChunkStays.html b/Server/Plugins/APIDump/UsingChunkStays.html
index a7cb5302a..a7cb5302a 100644
--- a/MCServer/Plugins/APIDump/UsingChunkStays.html
+++ b/Server/Plugins/APIDump/UsingChunkStays.html
diff --git a/MCServer/Plugins/APIDump/WebWorldThreads.html b/Server/Plugins/APIDump/WebWorldThreads.html
index b6c5c34ca..b6c5c34ca 100644
--- a/MCServer/Plugins/APIDump/WebWorldThreads.html
+++ b/Server/Plugins/APIDump/WebWorldThreads.html
diff --git a/MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html
index 2b6af0d82..2b6af0d82 100644
--- a/MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html
+++ b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html
diff --git a/MCServer/Plugins/APIDump/lang-lua.js b/Server/Plugins/APIDump/lang-lua.js
index 7e44cca0a..7e44cca0a 100644
--- a/MCServer/Plugins/APIDump/lang-lua.js
+++ b/Server/Plugins/APIDump/lang-lua.js
diff --git a/MCServer/Plugins/APIDump/main.css b/Server/Plugins/APIDump/main.css
index e5685caab..e5685caab 100644
--- a/MCServer/Plugins/APIDump/main.css
+++ b/Server/Plugins/APIDump/main.css
diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/Server/Plugins/APIDump/main_APIDump.lua
index 4892d477d..4892d477d 100644
--- a/MCServer/Plugins/APIDump/main_APIDump.lua
+++ b/Server/Plugins/APIDump/main_APIDump.lua
diff --git a/MCServer/Plugins/APIDump/prettify.css b/Server/Plugins/APIDump/prettify.css
index d44b3a228..d44b3a228 100644
--- a/MCServer/Plugins/APIDump/prettify.css
+++ b/Server/Plugins/APIDump/prettify.css
diff --git a/MCServer/Plugins/APIDump/prettify.js b/Server/Plugins/APIDump/prettify.js
index 7b990496d..7b990496d 100644
--- a/MCServer/Plugins/APIDump/prettify.js
+++ b/Server/Plugins/APIDump/prettify.js
diff --git a/MCServer/Plugins/ChatLog b/Server/Plugins/ChatLog
-Subproject 983d23ca37baa89f7e4dc11d71502d9c059f637
+Subproject 983d23ca37baa89f7e4dc11d71502d9c059f637
diff --git a/MCServer/Plugins/ChunkWorx b/Server/Plugins/ChunkWorx
-Subproject 894c7e32049e9d2a1e736f7d721aaacd1ae29e5
+Subproject 894c7e32049e9d2a1e736f7d721aaacd1ae29e5
diff --git a/MCServer/Plugins/Core b/Server/Plugins/Core
-Subproject ee01115ac848116cf58956fa6d031dbbadddba0
+Subproject ee01115ac848116cf58956fa6d031dbbadddba0
diff --git a/MCServer/Plugins/Debuggers/Debuggers.deproj b/Server/Plugins/Debuggers/Debuggers.deproj
index 5d25c5815..5d25c5815 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.deproj
+++ b/Server/Plugins/Debuggers/Debuggers.deproj
diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua
index bd0b94a06..bd0b94a06 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/Server/Plugins/Debuggers/Debuggers.lua
diff --git a/MCServer/Plugins/Debuggers/Info.lua b/Server/Plugins/Debuggers/Info.lua
index a76690ea1..a76690ea1 100644
--- a/MCServer/Plugins/Debuggers/Info.lua
+++ b/Server/Plugins/Debuggers/Info.lua
diff --git a/MCServer/Plugins/DiamondMover/DiamondMover.lua b/Server/Plugins/DiamondMover/DiamondMover.lua
index d3e70acfc..d3e70acfc 100644
--- a/MCServer/Plugins/DiamondMover/DiamondMover.lua
+++ b/Server/Plugins/DiamondMover/DiamondMover.lua
diff --git a/MCServer/Plugins/DumpInfo/Init.lua b/Server/Plugins/DumpInfo/Init.lua
index 2c5998e36..2c5998e36 100644
--- a/MCServer/Plugins/DumpInfo/Init.lua
+++ b/Server/Plugins/DumpInfo/Init.lua
diff --git a/MCServer/Plugins/Handy b/Server/Plugins/Handy
-Subproject e64a04be39ac7790abcb09de3d4c7d8fc2a2a1e
+Subproject e64a04be39ac7790abcb09de3d4c7d8fc2a2a1e
diff --git a/MCServer/Plugins/HookNotify/HookNotify.lua b/Server/Plugins/HookNotify/HookNotify.lua
index 411dbebbd..411dbebbd 100644
--- a/MCServer/Plugins/HookNotify/HookNotify.lua
+++ b/Server/Plugins/HookNotify/HookNotify.lua
diff --git a/MCServer/Plugins/InfoDump.deproj b/Server/Plugins/InfoDump.deproj
index 30003c36d..30003c36d 100644
--- a/MCServer/Plugins/InfoDump.deproj
+++ b/Server/Plugins/InfoDump.deproj
diff --git a/MCServer/Plugins/InfoDump.lua b/Server/Plugins/InfoDump.lua
index 2c7fff163..2c7fff163 100644
--- a/MCServer/Plugins/InfoDump.lua
+++ b/Server/Plugins/InfoDump.lua
diff --git a/MCServer/Plugins/InfoReg.lua b/Server/Plugins/InfoReg.lua
index cc075c0b8..cc075c0b8 100644
--- a/MCServer/Plugins/InfoReg.lua
+++ b/Server/Plugins/InfoReg.lua
diff --git a/MCServer/Plugins/MagicCarpet b/Server/Plugins/MagicCarpet
-Subproject 94da343b62f0498a5843247f36d6ee00cbeb8f2
+Subproject 94da343b62f0498a5843247f36d6ee00cbeb8f2
diff --git a/MCServer/Plugins/NetworkTest/Info.lua b/Server/Plugins/NetworkTest/Info.lua
index d8c3095fe..d8c3095fe 100644
--- a/MCServer/Plugins/NetworkTest/Info.lua
+++ b/Server/Plugins/NetworkTest/Info.lua
diff --git a/MCServer/Plugins/NetworkTest/NetworkTest.lua b/Server/Plugins/NetworkTest/NetworkTest.lua
index 22056d4e9..22056d4e9 100644
--- a/MCServer/Plugins/NetworkTest/NetworkTest.lua
+++ b/Server/Plugins/NetworkTest/NetworkTest.lua
diff --git a/MCServer/Plugins/NetworkTest/splashes.txt b/Server/Plugins/NetworkTest/splashes.txt
index 50a87bd91..50a87bd91 100644
--- a/MCServer/Plugins/NetworkTest/splashes.txt
+++ b/Server/Plugins/NetworkTest/splashes.txt
diff --git a/MCServer/Plugins/ProtectionAreas b/Server/Plugins/ProtectionAreas
-Subproject 624580e5b522ba2799dfe5b5902b4002b1a8da3
+Subproject 624580e5b522ba2799dfe5b5902b4002b1a8da3
diff --git a/MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
index 4a7cd4e1e..4a7cd4e1e 100644
--- a/MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua
+++ b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
diff --git a/MCServer/Plugins/TransAPI b/Server/Plugins/TransAPI
-Subproject be15597bf3d976310a59e3aa8661cce413441c1
+Subproject be15597bf3d976310a59e3aa8661cce413441c1
diff --git a/MCServer/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset
index eac51e176..eac51e176 100644
--- a/MCServer/Prefabs/Villages/AlchemistVillage.cubeset
+++ b/Server/Prefabs/Villages/AlchemistVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset
index b3e545e52..b3e545e52 100644
--- a/MCServer/Prefabs/Villages/JapaneseVillage.cubeset
+++ b/Server/Prefabs/Villages/JapaneseVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/PlainsVillage.cubeset b/Server/Prefabs/Villages/PlainsVillage.cubeset
index 0ad53a762..0ad53a762 100644
--- a/MCServer/Prefabs/Villages/PlainsVillage.cubeset
+++ b/Server/Prefabs/Villages/PlainsVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
index cbaac332a..cbaac332a 100644
--- a/MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset
+++ b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset
index 63238fa6e..63238fa6e 100644
--- a/MCServer/Prefabs/Villages/SandVillage.cubeset
+++ b/Server/Prefabs/Villages/SandVillage.cubeset
diff --git a/MCServer/README.txt b/Server/README.txt
index 3cddc37d2..3cddc37d2 100644
--- a/MCServer/README.txt
+++ b/Server/README.txt
diff --git a/MCServer/crafting.txt b/Server/crafting.txt
index 243e52fdb..243e52fdb 100644
--- a/MCServer/crafting.txt
+++ b/Server/crafting.txt
diff --git a/Server/delete_windows_service.cmd b/Server/delete_windows_service.cmd
new file mode 100644
index 000000000..14a55edfc
--- /dev/null
+++ b/Server/delete_windows_service.cmd
@@ -0,0 +1,4 @@
+@echo off

+set SERVICENAME="Cuberite"

+

+sc delete %SERVICENAME%

diff --git a/Server/favicon.png b/Server/favicon.png
new file mode 100644
index 000000000..61d201abf
--- /dev/null
+++ b/Server/favicon.png
diff --git a/MCServer/furnace.txt b/Server/furnace.txt
index 24bc35bc8..24bc35bc8 100644
--- a/MCServer/furnace.txt
+++ b/Server/furnace.txt
diff --git a/MCServer/hg b/Server/hg
index 93593de8d..f79dce8e8 100755
--- a/MCServer/hg
+++ b/Server/hg
@@ -4,4 +4,4 @@
 # 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
 
-valgrind --log-file=helgrind.log --suppressions=hg.supp --gen-suppressions=all --tool=helgrind -v ./MCServer
\ No newline at end of file
+valgrind --log-file=helgrind.log --suppressions=hg.supp --gen-suppressions=all --tool=helgrind -v ./Cuberite
diff --git a/MCServer/hg.supp b/Server/hg.supp
index 27eb8c27a..27eb8c27a 100644
--- a/MCServer/hg.supp
+++ b/Server/hg.supp
diff --git a/Server/install_windows_service.cmd b/Server/install_windows_service.cmd
new file mode 100644
index 000000000..84d69ee1a
--- /dev/null
+++ b/Server/install_windows_service.cmd
@@ -0,0 +1,7 @@
+rem Alter this if you need to install multiple instances.

+@echo off

+set SERVICENAME="Cuberite"

+

+set CURRENTDIR=%CD%

+sc create %SERVICENAME% binPath= "%CURRENTDIR%\Cuberite.exe -d" start= auto DisplayName= %SERVICENAME%

+sc description %SERVICENAME% "Minecraft server instance"

diff --git a/MCServer/items.ini b/Server/items.ini
index 5eb04619c..5eb04619c 100644
--- a/MCServer/items.ini
+++ b/Server/items.ini
diff --git a/MCServer/lang/items_de.ini b/Server/lang/items_de.ini
index 3c2ab87d1..3c2ab87d1 100644
--- a/MCServer/lang/items_de.ini
+++ b/Server/lang/items_de.ini
diff --git a/MCServer/monsters.ini b/Server/monsters.ini
index af1938e3e..af1938e3e 100644
--- a/MCServer/monsters.ini
+++ b/Server/monsters.ini
diff --git a/MCServer/vg b/Server/vg
index fcc8270d0..5fc22ab68 100755
--- a/MCServer/vg
+++ b/Server/vg
@@ -4,4 +4,4 @@
 # 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
 
-valgrind --log-file=valgrind.log --suppressions=vg.supp --tool=memcheck --leak-check=full --leak-resolution=high --show-reachable=yes --track-origins=yes -v ./MCServer
+valgrind --log-file=valgrind.log --suppressions=vg.supp --tool=memcheck --leak-check=full --leak-resolution=high --show-reachable=yes --track-origins=yes -v ./Cuberite
diff --git a/MCServer/vg.supp b/Server/vg.supp
index e69de29bb..e69de29bb 100644
--- a/MCServer/vg.supp
+++ b/Server/vg.supp
diff --git a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
index 7022ef12a..7022ef12a 100644
--- a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
+++ b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
diff --git a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
index 5cf1237c8..5cf1237c8 100755
--- a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
+++ b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
diff --git a/MCServer/webadmin/files/background.gif b/Server/webadmin/files/background.gif
index cab9bed56..cab9bed56 100644
--- a/MCServer/webadmin/files/background.gif
+++ b/Server/webadmin/files/background.gif
diff --git a/MCServer/webadmin/files/favicon.ico b/Server/webadmin/files/favicon.ico
index ea4bde926..ea4bde926 100644
--- a/MCServer/webadmin/files/favicon.ico
+++ b/Server/webadmin/files/favicon.ico
diff --git a/MCServer/webadmin/files/guest.html b/Server/webadmin/files/guest.html
index 4f965b75c..4f965b75c 100644
--- a/MCServer/webadmin/files/guest.html
+++ b/Server/webadmin/files/guest.html
diff --git a/MCServer/webadmin/files/header.png b/Server/webadmin/files/header.png
index 97b067715..97b067715 100644
--- a/MCServer/webadmin/files/header.png
+++ b/Server/webadmin/files/header.png
diff --git a/MCServer/webadmin/files/home.gif b/Server/webadmin/files/home.gif
index b10e0bed7..b10e0bed7 100644
--- a/MCServer/webadmin/files/home.gif
+++ b/Server/webadmin/files/home.gif
diff --git a/MCServer/webadmin/files/loading.gif b/Server/webadmin/files/loading.gif
index b8d06f669..b8d06f669 100644
--- a/MCServer/webadmin/files/loading.gif
+++ b/Server/webadmin/files/loading.gif
diff --git a/MCServer/webadmin/files/log_out.png b/Server/webadmin/files/log_out.png
index 63232417a..63232417a 100644
--- a/MCServer/webadmin/files/log_out.png
+++ b/Server/webadmin/files/log_out.png
diff --git a/MCServer/webadmin/files/login.css b/Server/webadmin/files/login.css
index 5d87da4c5..5d87da4c5 100644
--- a/MCServer/webadmin/files/login.css
+++ b/Server/webadmin/files/login.css
diff --git a/MCServer/webadmin/files/login.gif b/Server/webadmin/files/login.gif
index ce2cb6fc0..ce2cb6fc0 100644
--- a/MCServer/webadmin/files/login.gif
+++ b/Server/webadmin/files/login.gif
diff --git a/MCServer/webadmin/files/logo.png b/Server/webadmin/files/logo.png
index 50733e824..50733e824 100644
--- a/MCServer/webadmin/files/logo.png
+++ b/Server/webadmin/files/logo.png
diff --git a/MCServer/webadmin/files/logo_login.png b/Server/webadmin/files/logo_login.png
index d2155f928..d2155f928 100644
--- a/MCServer/webadmin/files/logo_login.png
+++ b/Server/webadmin/files/logo_login.png
diff --git a/MCServer/webadmin/files/mc-logo.png b/Server/webadmin/files/mc-logo.png
index 9a77a490f..9a77a490f 100644
--- a/MCServer/webadmin/files/mc-logo.png
+++ b/Server/webadmin/files/mc-logo.png
diff --git a/MCServer/webadmin/files/pmfolder.gif b/Server/webadmin/files/pmfolder.gif
index 3fc68fdcb..3fc68fdcb 100644
--- a/MCServer/webadmin/files/pmfolder.gif
+++ b/Server/webadmin/files/pmfolder.gif
diff --git a/MCServer/webadmin/files/style.css b/Server/webadmin/files/style.css
index 7c0671970..7c0671970 100644
--- a/MCServer/webadmin/files/style.css
+++ b/Server/webadmin/files/style.css
diff --git a/MCServer/webadmin/files/sub_pmfolder.gif b/Server/webadmin/files/sub_pmfolder.gif
index 3d0d6e627..3d0d6e627 100644
--- a/MCServer/webadmin/files/sub_pmfolder.gif
+++ b/Server/webadmin/files/sub_pmfolder.gif
diff --git a/MCServer/webadmin/files/tcat.png b/Server/webadmin/files/tcat.png
index eb64eb3d6..eb64eb3d6 100644
--- a/MCServer/webadmin/files/tcat.png
+++ b/Server/webadmin/files/tcat.png
diff --git a/MCServer/webadmin/files/thead.png b/Server/webadmin/files/thead.png
index 81aa04bac..81aa04bac 100644
--- a/MCServer/webadmin/files/thead.png
+++ b/Server/webadmin/files/thead.png
diff --git a/MCServer/webadmin/login_template.html b/Server/webadmin/login_template.html
index fb6f21b52..fb6f21b52 100644
--- a/MCServer/webadmin/login_template.html
+++ b/Server/webadmin/login_template.html
diff --git a/MCServer/webadmin/template.html b/Server/webadmin/template.html
index b0864e35d..b0864e35d 100644
--- a/MCServer/webadmin/template.html
+++ b/Server/webadmin/template.html
diff --git a/MCServer/webadmin/template.lua b/Server/webadmin/template.lua
index 5b3ecf152..5b3ecf152 100644
--- a/MCServer/webadmin/template.lua
+++ b/Server/webadmin/template.lua
diff --git a/appveyor.yml b/appveyor.yml
index b14fe30c7..d2dc73739 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,6 @@ before_build:
 - cmake -G "Visual Studio 12" .
 - echo %TIME%
 build:
-  project: MCServer.sln
+  project: Cuberite.sln
   parallel: true
   verbosity: minimal
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03dfc76db..a9e1a6606 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 2.8.2)
-project (MCServer)
+project (Cuberite)
 
 
 include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/")
@@ -301,12 +301,12 @@ endforeach()
 FILE(WRITE "AllFiles.lst" "${ALLFILESLINES}")
 
 
-set(EXECUTABLE MCServer)
+set(EXECUTABLE Cuberite)
 
 if (MSVC)
 	get_directory_property(BINDING_OUTPUTS DIRECTORY "Bindings" DEFINITION BINDING_OUTPUTS)
 	get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES)
-	
+
 	# The paths in BINDING_DEPENDENCIES are relative to the Bindings folder, convert them relative to this folder:
 	foreach (dep ${BINDING_DEPENDENCIES})
 		list (APPEND BINDINGS_DEPENDENCIES "Bindings/${dep}")
@@ -331,12 +331,12 @@ add_executable(${EXECUTABLE} ${SOURCE})
 
 
 # Output the executable into the $/MCServer folder, so that it has access to external resources:
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/MCServer)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server)
 SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES
-	RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/MCServer
+	RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server
 )
 
 
diff --git a/uploadCoverage.sh b/uploadCoverage.sh
index fc17ddc2c..761a0c941 100755
--- a/uploadCoverage.sh
+++ b/uploadCoverage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]
+if [ "$TRAVIS_CUBERITE_BUILD_TYPE" == "COVERAGE" ]
 	then
 	find tests -type f -name '*.gcda' -exec sh -c 'cp {} $(dirname {})/../$(basename {})' \;
 	coveralls --exclude lib --exclude Android >/dev/null