1 files changed, 18 insertions, 36 deletions

diff --git a/COMPILING.md b/COMPILING.md
index 89f88bbb5..fcd0e4826 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -1,6 +1,6 @@
 # COMPILING #
 
-To compile MCServer from source, you need CMake and make, as well as a C compiler, C++ compiler and linker. To contribute code, you also need a Git client.
+To compile Cuberite from source, you need CMake and make, as well as a C compiler, C++ compiler and linker. To contribute code, you also need a Git client.
 
 ## Windows ##
 
@@ -14,35 +14,25 @@ To contribute your changes to the sources back to the repository, you need a Git
 - GitHub windows client: http://windows.github.com/
 - TortoiseGit: http://code.google.com/p/tortoisegit/
 
-Alternatively, if you want only to compile the source, without contributing, you can download the sources in a ZIP file directly from GitHub: https://github.com/mc-server/MCServer/archive/master.zip
+Alternatively, if you want only to compile the source, without contributing, you can download the sources in a ZIP file directly from GitHub: https://github.com/cuberite/cuberite/archive/master.zip
 If you're using Git to get the sources, use the following set of commands to set up the local workspace correctly:
 ```
-mkdir MCServer
-cd MCServer
-git clone https://github.com/mc-server/MCServer.git .
-git submodule init
-git submodule update
+git clone --recursive https://github.com/cuberite/cuberite.git
 ```
 
 Now that you have the sources, it's time to prepare the project files for your favorite compiler. Open a command window in the folder with the sources and type in `cmake .` . This will run CMake, it will auto-detect your Visual Studio version and produce the appropriate project and solution files.
 
-Finally, open the newly created file, `MCServer.sln`, in your Visual Studio.
+Finally, open the newly created file, `Cuberite.sln`, in your Visual Studio.
 
-If you want to run MCServer from within the IDE, you need to first make sure that it will be run with the correct home folder. Normally this happens automatically, but for some Visual Studio versions the process doesn't stick. Right-click on the MCServer project in the Solution Explorer tool window, and select Properties. In the dialog, navigate to Configuration properties -> Debugging in the tree on the left, then make sure the value `Working Directory` is set to `../MCServer`. If you don't do this, the server won't be able to find crafting recipes, item names or plugins.
+If you want to run Cuberite from within the IDE, you need to first make sure that it will be run with the correct home folder. Normally this happens automatically, but for some Visual Studio versions the process doesn't stick. Right-click on the Cuberite project in the Solution Explorer tool window, and select Properties. In the dialog, navigate to Configuration properties -> Debugging in the tree on the left, then make sure the value `Working Directory` is set to `../Server`. If you don't do this, the server won't be able to find crafting recipes, item names or plugins.
 
 ### Release configuration ###
 
-To make Visual Studio produce the version with the best performance, you will need to select a Release configuration. Go to menu Build -> Configuration Manager, and in the opened dialog, change the top left combo box (Active solution configuration) to Release. Close the dialog and build the solution. The resulting executable is called `MCServer.exe` in the `MCServer` folder.
+To make Visual Studio produce the version with the best performance, you will need to select a Release configuration. Go to menu Build -> Configuration Manager, and in the opened dialog, change the top left combo box (Active solution configuration) to Release. Close the dialog and build the solution. The resulting executable is called `Cuberite.exe` in the `Server` folder.
 
 ### Debug configuration ###
 
-In order to tinker with the code, you'll more than likely need to use the debugging features of the IDE. To make them the easiest to use, you should switch to the Debug configuration - this provides the highest level of information while debugging, for the price of the executable being 2 - 10 times slower. Go to menu Build -> Configuration Manager, and in the opened dialog, change the top left combo box (Active solution configuration) to Debug. Close the dialog and build the solution. The resulting executable is called `MCServer_debug.exe` in the `MCServer` folder.
-
-### Profiling ###
-
-It is possible to use an external profiler to learn more about how the code performs. You can find more information about the techniques in the article here: http://www.codeproject.com/Articles/144643/Profiling-of-C-Applications-in-Visual-Studio-for-F
-
-There's a script file, `MCServer/profile_run.cmd` that encapsulates most of the profiling work, have a look at the comments at the top of that script for details on how to get it to work. You'll need to change to a profiled configuration (both debug and release can be profiled).
+In order to tinker with the code, you'll more than likely need to use the debugging features of the IDE. To make them the easiest to use, you should switch to the Debug configuration - this provides the highest level of information while debugging, for the price of the executable being 2 - 10 times slower. Go to menu Build -> Configuration Manager, and in the opened dialog, change the top left combo box (Active solution configuration) to Debug. Close the dialog and build the solution. The resulting executable is called `Cuberite_debug.exe` in the `Server` folder.
 
 ## OSX ##
 Install git from its [website](http://git-scm.com) or homebrew: `brew install git`.
@@ -53,18 +43,14 @@ Install CMake from its [website](http://cmake.org) or homebrew: `brew install cm
 
 ### Getting the sources ###
 ```
-mkdir MCServer
-cd MCServer
-git clone https://github.com/mc-server/MCServer.git .
-git submodule init
-git submodule update
+git clone --recursive https://github.com/cuberite/cuberite.git
 ```
 
 ### Building ###
 
 Follow the instructions at [CMake on Unix-based platforms](#cmake-on-unix-based-platforms), using Xcode as cmake's generator. If no generator is specified, CMake will use the Makefile generator, in which case you must build with the `make` command.
 
-After doing so, run the command `xcodebuild lib/polarssl/POLARSSL.xcodeproj` in the build directory, in order to build polarssl, a library that is required by MCServer. Lastly, run the command `xcodebuild` to build MCServer. Optionally, you may open the project files for polarssl and then MCServer in Xcode and build there.
+After doing so, run the command `xcodebuild lib/polarssl/POLARSSL.xcodeproj` in the build directory, in order to build polarssl, a library that is required by Cuberite. Lastly, run the command `xcodebuild` to build Cuberite. Optionally, you may open the project files for polarssl and then Cuberite in Xcode and build there.
 
 
 ## Linux, FreeBSD etc. ##
@@ -77,26 +63,22 @@ sudo apt-get install git make cmake gcc g++
 
 ### Getting the sources ###
 ```
-mkdir MCServer
-cd MCServer
-git clone https://github.com/mc-server/MCServer.git .
-git submodule init
-git submodule update
+git clone --recursive https://github.com/cuberite/cuberite.git
 ```
 
 ### Building ###
 
 Follow the instructions at [CMake on Unix-based platforms](#cmake-on-unix-based-platforms).
 
-After doing so, run the command `make` in the build directory, and MCServer will build. 
+After doing so, run the command `make` in the build directory, and Cuberite will build. 
 
 ## CMake on Unix-based platforms ###
 
 ### Release Mode ###
 
-Release mode is preferred for almost all cases, it has much better speed and less console spam. However, if you are developing MCServer actively, debug mode might be better.
+Release mode is preferred for almost all cases, it has much better speed and less console spam. However, if you are developing Cuberite actively, debug mode might be better.
 
-Assuming you are in the MCServer folder created in the initial setup step, you need to run these commands:
+Assuming you are in the Cuberite folder created in the initial setup step, you need to run these commands:
 ```
 mkdir Release
 cd Release
@@ -104,13 +86,13 @@ cmake -DCMAKE_BUILD_TYPE=RELEASE ..
 ```
 NOTE: CMake can generate project files for many different programs, such as Xcode, eclipse, and ninja. To use a different generator, first type `cmake --help`, and at the end, cmake will output the different generators that are available. To specify one, add `-G` followed by the name of the generator, in the `cmake` command. Note that the name is case-sensitive. 
 
-The executable will be built in the `MCServer/MCServer` folder and will be named `MCServer`.
+The executable will be built in the `cuberite/Server` folder and will be named `Cuberite`.
 
 ### Debug Mode ###
 
-Debug mode is useful if you want more debugging information about MCServer while it's running or if you want to use a debugger like GDB to debug issues and crashes.
+Debug mode is useful if you want more debugging information about Cuberite while it's running or if you want to use a debugger like GDB to debug issues and crashes.
 
-Assuming you are in the MCServer folder created in the Getting the sources step, you need to run these commands:
+Assuming you are in the Cuberite folder created in the Getting the sources step, you need to run these commands:
 ```
 mkdir Debug
 cd Debug
@@ -118,11 +100,11 @@ cmake -DCMAKE_BUILD_TYPE=DEBUG ..
 ```
 NOTE: CMake can generate project files for many different programs, such as Xcode, eclipse, and ninja. To use a different generator, first type `cmake --help`, and at the end, cmake will output the different generators that are available. To specify one, add `-G` followed by the name of the generator, in the `cmake` command. Note that the name is case-sensitive. 
 
-The executable will be built in the `MCServer/MCServer` folder and will be named `MCServer_debug`.
+The executable will be built in the `cuberite/Server` folder and will be named `Cuberite_debug`.
     
 ### 32 Bit Mode switch ###
 
-This is useful if you want to compile MCServer on an x64 (64-bit Intel) machine but want to use on an x86 (32-bit Intel) machine. This switch can be used with debug or release mode. Simply add:
+This is useful if you want to compile Cuberite on an x64 (64-bit Intel) machine but want to use on an x86 (32-bit Intel) machine. This switch can be used with debug or release mode. Simply add:
 
     -DFORCE_32=1