Rename to MultiCraft

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetest --run-unittests
+          ./bin/multicraft --run-unittests
 
   # This is the current gcc compiler (available in bionic)
   gcc_8:
@@ -68,7 +68,7 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetest --run-unittests
+          ./bin/multicraft --run-unittests
 
   # This is our minor clang compiler
   clang_3_9:
@@ -90,7 +90,7 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetest --run-unittests
+          ./bin/multicraft --run-unittests
 
   # This is the current clang version
   clang_9:
@@ -114,11 +114,11 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetest --run-unittests
+          ./bin/multicraft --run-unittests
 
       - name: Valgrind
         run: |
-          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
+          valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/multicraft --run-unittests
 
   # Build with prometheus-cpp (server-only)
   clang_9_prometheus:
@@ -146,7 +146,7 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetestserver --run-unittests
+          ./bin/multicraftserver --run-unittests
 
   # Build without freetype (client-only)
   clang_9_no_freetype:
@@ -170,7 +170,7 @@ jobs:
 
       - name: Test
         run: |
-          ./bin/minetest --run-unittests
+          ./bin/multicraft --run-unittests
 
   docker:
     name: "Docker image"

.gitignore

@@ -31,13 +31,13 @@ build/.cmake/
 # Gradle
 .gradle
 
-## Files related to Minetest development cycle
+## Files related to MultiCraft development cycle
 /*.patch
 *.diff
 # GNU Patch reject file
 *.rej
 
-## Non-static Minetest directories or symlinks to these
+## Non-static MultiCraft directories or symlinks to these
 /bin/
 /games/*
 !/games/devtest/
@@ -57,11 +57,12 @@ build/.cmake/
 /client/mod_storage/
 
 ## Configuration/log files
+multicraft.conf
 minetest.conf
 debug.txt
 debug.txt.1
 
-## Other files generated by Minetest
+## Other files generated by MultiCraft
 screenshot_*.png
 testbm.txt
 

CMakeLists.txt

@@ -6,8 +6,8 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
 endif()
 
 # This can be read from ${PROJECT_NAME} after project() is called
-project(minetest)
+project(multicraft)
-set(PROJECT_NAME_CAPITALIZED "Minetest")
+set(PROJECT_NAME_CAPITALIZED "MultiCraft")
 
 # Works only for cmake 3.1 and greater
 set(CMAKE_CXX_STANDARD 11)
@@ -15,8 +15,8 @@ set(GCC_MINIMUM_VERSION "4.8")
 set(CLANG_MINIMUM_VERSION "3.4")
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
-set(VERSION_MAJOR 5)
+set(VERSION_MAJOR 2)
-set(VERSION_MINOR 3)
+set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
@@ -165,7 +165,7 @@ if(RUN_IN_PLACE)
 	install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/texture_packs_here.txt" DESTINATION "${SHAREDIR}/textures")
 endif()
 
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game" DESTINATION "${SHAREDIR}/games/" 
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game" DESTINATION "${SHAREDIR}/games/"
 	COMPONENT "SUBGAME_MINETEST_GAME" OPTIONAL PATTERN ".git*" EXCLUDE )
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/devtest" DESTINATION "${SHAREDIR}/games/"
 	COMPONENT "SUBGAME_MINIMAL" OPTIONAL PATTERN ".git*" EXCLUDE )
@@ -186,16 +186,16 @@ install(FILES "doc/client_lua_api.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
 install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
 install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
 install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
-install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
+install(FILES "multicraft.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
 	install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
 	install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
 	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-	install(FILES "misc/minetest-xorg-icon-128.png"
+	install(FILES "misc/multicraft-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
-		RENAME "minetest.png")
+		RENAME "multicraft.png")
 endif()
 
 if(APPLE)
@@ -284,13 +284,13 @@ if(WIN32)
 		set(CPACK_PACKAGE_EXECUTABLES ${PROJECT_NAME} "${PROJECT_NAME_CAPITALIZED}")
 		set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME})
 
-		set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico")
+		set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/multicraft-icon.ico")
-		# Supported languages can be found at 
+		# Supported languages can be found at
 		# http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html
 		#set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE")
 		set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/misc/CPACK_WIX_UI_BANNER.BMP")
 		set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/misc/CPACK_WIX_UI_DIALOG.BMP")
-		
+
 		set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/doc/lgpl-2.1.txt")
 
 		# The correct way would be to include both x32 and x64 into one installer

Dockerfile

@@ -2,21 +2,21 @@ FROM alpine:3.11
 
 ENV MINETEST_GAME_VERSION master
 
-COPY .git /usr/src/minetest/.git
+COPY .git /usr/src/multicraft/.git
-COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt
+COPY CMakeLists.txt /usr/src/multicraft/CMakeLists.txt
-COPY README.md /usr/src/minetest/README.md
+COPY README.md /usr/src/multicraft/README.md
-COPY minetest.conf.example /usr/src/minetest/minetest.conf.example
+COPY multicraft.conf.example /usr/src/multicraft/multicraft.conf.example
-COPY builtin /usr/src/minetest/builtin
+COPY builtin /usr/src/multicraft/builtin
-COPY cmake /usr/src/minetest/cmake
+COPY cmake /usr/src/multicraft/cmake
-COPY doc /usr/src/minetest/doc
+COPY doc /usr/src/multicraft/doc
-COPY fonts /usr/src/minetest/fonts
+COPY fonts /usr/src/multicraft/fonts
-COPY lib /usr/src/minetest/lib
+COPY lib /usr/src/multicraft/lib
-COPY misc /usr/src/minetest/misc
+COPY misc /usr/src/multicraft/misc
-COPY po /usr/src/minetest/po
+COPY po /usr/src/multicraft/po
-COPY src /usr/src/minetest/src
+COPY src /usr/src/multicraft/src
-COPY textures /usr/src/minetest/textures
+COPY textures /usr/src/multicraft/textures
 
-WORKDIR /usr/src/minetest
+WORKDIR /usr/src/multicraft
 
 RUN apk add --no-cache git build-base irrlicht-dev cmake bzip2-dev libpng-dev \
 		jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \
@@ -36,7 +36,7 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
 	make -j2 && \
 	make install
 
-WORKDIR /usr/src/minetest
+WORKDIR /usr/src/multicraft
 RUN mkdir build && \
 	cd build && \
 	cmake .. \
@@ -52,17 +52,17 @@ RUN mkdir build && \
 FROM alpine:3.11
 
 RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq && \
-	adduser -D minetest --uid 30000 -h /var/lib/minetest && \
+	adduser -D multicraft --uid 30000 -h /var/lib/multicraft && \
-	chown -R minetest:minetest /var/lib/minetest
+	chown -R multicraft:multicraft /var/lib/multicraft
 
-WORKDIR /var/lib/minetest
+WORKDIR /var/lib/multicraft
 
-COPY --from=0 /usr/local/share/minetest /usr/local/share/minetest
+COPY --from=0 /usr/local/share/multicraft /usr/local/share/multicraft
-COPY --from=0 /usr/local/bin/minetestserver /usr/local/bin/minetestserver
+COPY --from=0 /usr/local/bin/multicraftserver /usr/local/bin/multicraftserver
-COPY --from=0 /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf
+COPY --from=0 /usr/local/share/doc/multicraft/multicraft.conf.example /etc/multicraft/multicraft.conf
 
-USER minetest:minetest
+USER multicraft:multicraft
 
 EXPOSE 30000/udp 30000/tcp
 
-CMD ["/usr/local/bin/minetestserver", "--config", "/etc/minetest/minetest.conf"]
+CMD ["/usr/local/bin/multicraftserver", "--config", "/etc/multicraft/multicraft.conf"]

README.md

@@ -1,20 +1,14 @@
-Minetest
+MultiCraft Open Source
-========
+======================
 
-![Build Status](https://github.com/minetest/minetest/workflows/build/badge.svg)
+![Build Status](https://github.com/MultiCraft/MultiCraft5.3/workflows/build/badge.svg)
-[![Translation status](https://hosted.weblate.org/widgets/minetest/-/svg-badge.svg)](https://hosted.weblate.org/engage/minetest/?utm_source=widget)
+[![License](https://img.shields.io/badge/license-LGPLv3.0%2B-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0.en.html)
-[![License](https://img.shields.io/badge/license-LGPLv2.1%2B-blue.svg)](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)
 
-Minetest is a free open-source voxel game engine with easy modding and game creation.
+MultiCraft Open Source is a free open-source voxel game engine with easy modding and game creation.
 
-Copyright (C) 2010-2020 Perttu Ahola <celeron55@gmail.com>
+MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors).
-and contributors (see source file comments and the version control log)
 
-In case you downloaded the source code
+Copyright © 2014-2020 Maksim Gamarnik [MoNTE48] <MoNTE48@mail.ua> & MultiCraft Development Team.
---------------------------------------
-If you downloaded the Minetest Engine source code in which this file is
-contained, you probably want to download the [Minetest Game](https://github.com/minetest/minetest_game/)
-project too. See its README.txt for more information.
 
 Table of Contents
 ------------------
@@ -31,11 +25,11 @@ Table of Contents
 
 Further documentation
 ----------------------
-- Website: http://minetest.net/
+- Minetest Website: http://minetest.net/
-- Wiki: http://wiki.minetest.net/
+- Minetest Wiki: http://wiki.minetest.net/
-- Developer wiki: http://dev.minetest.net/
+- Minetest Developer wiki: http://dev.minetest.net/
-- Forum: http://forum.minetest.net/
+- Minetest Forum: http://forum.minetest.net/
-- GitHub: https://github.com/minetest/minetest/
+- Minetest GitHub: https://github.com/minetest/minetest/
 - [doc/](doc/) directory of source distribution
 
 Default controls
@@ -96,29 +90,29 @@ Where each location is on each platform:
     * `share` = `.`
     * `user`  = `.`
 * Windows installed:
-    * `bin`   = `C:\Program Files\Minetest\bin (Depends on the install location)`
+    * `bin`   = `C:\Program Files\MultiCraft\bin (Depends on the install location)`
-    * `share` = `C:\Program Files\Minetest (Depends on the install location)`
+    * `share` = `C:\Program Files\MultiCraft (Depends on the install location)`
-    * `user`  = `%APPDATA%\Minetest`
+    * `user`  = `%APPDATA%\MultiCraft`
 * Linux installed:
     * `bin`   = `/usr/bin`
-    * `share` = `/usr/share/minetest`
+    * `share` = `/usr/share/multicraft`
-    * `user`  = `~/.minetest`
+    * `user`  = `~/.multicraft`
 * macOS:
     * `bin`   = `Contents/MacOS`
     * `share` = `Contents/Resources`
-    * `user`  = `Contents/User OR ~/Library/Application Support/minetest`
+    * `user`  = `Contents/User OR ~/Library/Application Support/multicraft`
 
 Worlds can be found as separate folders in: `user/worlds/`
 
 Configuration file
 ------------------
 - Default location:
-    `user/minetest.conf`
+    `user/multicraft.conf`
-- This file is created by closing Minetest for the first time.
+- This file is created by closing MultiCraft for the first time.
 - A specific file can be specified on the command line:
     `--config <path-to-file>`
 - A run-in-place build will look for the configuration file in
-    `location_of_exe/../minetest.conf` and also `location_of_exe/../../minetest.conf`
+    `location_of_exe/../multicraft.conf` and also `location_of_exe/../../multicraft.conf`
 
 Command-line options
 --------------------
@@ -170,26 +164,14 @@ For Fedora users:
 
 Download source (this is the URL to the latest of source repository, which might not work at all times) using Git:
 
-    git clone --depth 1 https://github.com/minetest/minetest.git
+    git clone --depth 1 https://github.com/MultiCraft/MultiCraft.git
-    cd minetest
+    cd MultiCraft
-
-Download minetest_game (otherwise only the "Development Test" game is available) using Git:
-
-    git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
 
 Download source, without using Git:
 
-    wget https://github.com/minetest/minetest/archive/master.tar.gz
+    wget https://github.com/MultiCraft/MultiCraft/archive/master.tar.gz
     tar xf master.tar.gz
-    cd minetest-master
+    cd MultiCraft-master
-
-Download minetest_game, without using Git:
-
-    cd games/
-    wget https://github.com/minetest/minetest_game/archive/master.tar.gz
-    tar xf master.tar.gz
-    mv minetest_game-master minetest_game
-    cd ..
 
 #### Build
 
@@ -200,7 +182,7 @@ Build a version that runs directly from the source directory:
 
 Run it:
 
-    ./bin/minetest
+    ./bin/multicraft
 
 - Use `cmake . -LH` to see all CMake options and their current state.
 - If you want to install it system-wide (or are making a distribution package),
@@ -216,8 +198,8 @@ Run it:
 
 General options and their default values:
 
-    BUILD_CLIENT=TRUE          - Build Minetest client
+    BUILD_CLIENT=TRUE          - Build MultiCraft client
-    BUILD_SERVER=FALSE         - Build Minetest server
+    BUILD_SERVER=FALSE         - Build MultiCraft server
     BUILD_UNITTESTS=TRUE       - Build unittest sources
     CMAKE_BUILD_TYPE=Release   - Type of build (Release vs. Debug)
         Release                - Release build
@@ -242,7 +224,7 @@ General options and their default values:
     OPENGL_GL_PREFERENCE=LEGACY - Linux client build only; See CMake Policy CMP0072 for reference
     RUN_IN_PLACE=FALSE         - Create a portable install (worlds, settings etc. in current directory)
     USE_GPROF=FALSE            - Enable profiling using GProf
-    VERSION_EXTRA=             - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar)
+    VERSION_EXTRA=             - Text to append to version (e.g. VERSION_EXTRA=foobar -> MultiCraft 0.4.9-foobar)
 
 Library specific options:
 
@@ -330,12 +312,12 @@ Use `--triplet` to specify the target triplet, e.g. `x64-windows` or `x86-window
 
 This is outdated and not recommended. Follow the instructions on https://dev.minetest.net/Build_Win32_Minetest_including_all_required_libraries#VS2012_Build
 
-### Compile Minetest
+### Compile MultiCraft
 
 #### a) Using the vcpkg toolchain and CMake GUI
 1. Start up the CMake GUI
-2. Select **Browse Source...** and select DIR/minetest
+2. Select **Browse Source...** and select DIR/multicraft
-3. Select **Browse Build...** and select DIR/minetest-build
+3. Select **Browse Build...** and select DIR/multicraft-build
 4. Select **Configure**
 5. Choose the right visual Studio version and target platform. It has to match the version of the installed dependencies
 6. Choose **Specify toolchain file for cross-compiling**
@@ -346,7 +328,7 @@ This is outdated and not recommended. Follow the instructions on https://dev.min
 11. If there are any errors, solve them and hit **Configure**
 12. Click **Generate**
 13. Click **Open Project**
-14. Compile Minetest inside Visual studio.
+14. Compile MultiCraft inside Visual studio.
 
 #### b) Using the vcpkg toolchain and the commandline
 
@@ -376,45 +358,3 @@ Build the binaries as described above, but make sure you unselect `RUN_IN_PLACE`
 
 Open the generated project file with Visual Studio. Right-click **Package** and choose **Generate**.
 It may take some minutes to generate the installer.
-
-
-Docker
-------
-We provide Minetest server Docker images using the GitLab mirror registry.
-
-Images are built on each commit and available using the following tag scheme:
-
-* `registry.gitlab.com/minetest/minetest/server:latest` (latest build)
-* `registry.gitlab.com/minetest/minetest/server:<branch/tag>` (current branch or current tag)
-* `registry.gitlab.com/minetest/minetest/server:<commit-id>` (current commit id)
-
-If you want to test it on a Docker server you can easily run:
-
-	sudo docker run registry.gitlab.com/minetest/minetest/server:<docker tag>
-
-If you want to use it in a production environment you should use volumes bound to the Docker host
-to persist data and modify the configuration:
-
-	sudo docker create -v /home/minetest/data/:/var/lib/minetest/ -v /home/minetest/conf/:/etc/minetest/ registry.gitlab.com/minetest/minetest/server:master
-
-Data will be written to `/home/minetest/data` on the host, and configuration will be read from `/home/minetest/conf/minetest.conf`.
-
-**Note:** If you don't understand the previous commands please read the official Docker documentation before use.
-
-You can also host your Minetest server inside a Kubernetes cluster. See our example implementation in [`misc/kubernetes.yml`](misc/kubernetes.yml).
-
-
-Version scheme
---------------
-We use `major.minor.patch` since 5.0.0-dev. Prior to that we used `0.major.minor`.
-
-- Major is incremented when the release contains breaking changes, all other
-numbers are set to 0.
-- Minor is incremented when the release contains new non-breaking features,
-patch is set to 0.
-- Patch is incremented when the release only contains bugfixes and very
-minor/trivial features considered necessary.
-
-Since 5.0.0-dev and 0.4.17-dev, the dev notation refers to the next release,
-i.e.: 5.0.0-dev is the development version leading to 5.0.0.
-Prior to that we used `previous_version-dev`.

builtin/mainmenu/dlg_settings_advanced.lua

@@ -1098,7 +1098,7 @@ function create_adv_settings_dlg()
 				return dlg
 end
 
--- Uncomment to generate 'minetest.conf.example' and 'settings_translation_file.cpp'.
+-- Uncomment to generate 'multicraft.conf.example' and 'settings_translation_file.cpp'.
 -- For RUN_IN_PLACE the generated files may appear in the 'bin' folder.
 -- See comment and alternative line at the end of 'generate_from_settingtypes.lua'.
 

builtin/mainmenu/generate_from_settingtypes.lua

@@ -6,16 +6,16 @@ local sprintf = string.format
 local rep = string.rep
 
 local minetest_example_header = [[
-#    This file contains a list of all available settings and their default value for minetest.conf
+#    This file contains a list of all available settings and their default value for multicraft.conf
 
 #    By default, all the settings are commented and not functional.
 #    Uncomment settings by removing the preceding #.
 
-#    minetest.conf is read by default from:
+#    multicraft.conf is read by default from:
-#    ../minetest.conf
+#    ../multicraft.conf
-#    ../../minetest.conf
+#    ../../multicraft.conf
 #    Any other path can be chosen by passing the path as a parameter
-#    to the program, eg. "minetest.exe --config ../minetest.conf.example".
+#    to the program, eg. "multicraft.exe --config ../multicraft.conf.example".
 
 #    Further documentation:
 #    http://wiki.minetest.net/
@@ -116,12 +116,12 @@ local function create_translation_file()
 	return concat(result, "\n")
 end
 
-local file = assert(io.open("minetest.conf.example", "w"))
+local file = assert(io.open("multicraft.conf.example", "w"))
 file:write(create_minetest_conf_example())
 file:close()
 
 file = assert(io.open("src/settings_translation_file.cpp", "w"))
--- If 'minetest.conf.example' appears in the 'bin' folder, the line below may have to be
+-- If 'multicraft.conf.example' appears in the 'bin' folder, the line below may have to be
 -- used instead. The file will also appear in the 'bin' folder.
 --file = assert(io.open("settings_translation_file.cpp", "w"))
 file:write(create_translation_file())

doc/client_lua_api.txt

@@ -32,7 +32,7 @@ the `init.lua` scripts in a shared environment.
 
 In order to load client-side mods, the following conditions need to be satisfied:
 
-1) `$path_user/minetest.conf` contains the setting `enable_client_modding = true`
+1) `$path_user/multicraft.conf` contains the setting `enable_client_modding = true`
 
 2) The client-side mod located in `$path_user/clientmods/<modname>` is added to
     `$path_user/clientmods/mods.conf` as `load_mod_<modname> = true`.
@@ -1117,7 +1117,7 @@ Methods:
     * Returns `true` on success, otherwise returns `nil`
 
 ### Settings
-An interface to read config files in the format of `minetest.conf`.
+An interface to read config files in the format of `multicraft.conf`.
 
 It can be created via `Settings(filename)`.
 

doc/lua_api.txt

@@ -79,7 +79,7 @@ The game directory can contain the following files:
       e.g. `disallowed_mapgen_settings = mgv5_spflags`
       These settings are hidden for this game in the world creation
       dialog and game start menu.
-* `minetest.conf`:
+* `multicraft.conf`:
   Used to set default settings when running this game.
 * `settingtypes.txt`:
   In the same format as the one in builtin.
@@ -4042,7 +4042,7 @@ Callbacks:
 * `on_step(self, dtime)`
     * Called on every server tick, after movement and collision processing.
       `dtime` is usually 0.1 seconds, as per the `dedicated_server_step` setting
-      in `minetest.conf`.
+      in `multicraft.conf`.
 * `on_punch(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)`
     * Called when somebody punches the object.
     * Note that you probably want to handle most punches using the automatic
@@ -4363,7 +4363,7 @@ Call these functions only at load time!
     * If it is a description, the priv will be granted to singleplayer and admin
       by default.
     * To allow players with `basic_privs` to grant, see the `basic_privs`
-      minetest.conf setting.
+      multicraft.conf setting.
 * `minetest.register_authentication_handler(authentication handler definition)`
     * Registers an auth handler that overrides the builtin one.
     * This function can be called by a single mod once only.
@@ -4565,7 +4565,7 @@ Setting-related
 ---------------
 
 * `minetest.settings`: Settings object containing all of the settings from the
-  main config file (`minetest.conf`).
+  main config file (`multicraft.conf`).
 * `minetest.setting_get_pos(name)`: Loads a setting from the main settings and
   parses it as a position (in the format `(1,2,3)`). Returns a position or nil.
 
@@ -4794,14 +4794,14 @@ Environment access
     * `flags` contains a comma-delimited string of flags to set, or if the
       prefix `"no"` is attached, clears instead.
     * `flags` is in the same format and has the same options as `mg_flags` in
-      `minetest.conf`.
+      `multicraft.conf`.
 * `minetest.get_mapgen_setting(name)`
     * Gets the *active* mapgen setting (or nil if none exists) in string
       format with the following order of precedence:
         1) Settings loaded from map_meta.txt or overrides set during mod
            execution.
         2) Settings set by mods without a metafile override
-        3) Settings explicitly set in the user config file, minetest.conf
+        3) Settings explicitly set in the user config file, multicraft.conf
         4) Settings set as the user config default
 * `minetest.get_mapgen_setting_noiseparams(name)`
     * Same as above, but returns the value as a NoiseParams table if the
@@ -6442,7 +6442,7 @@ secure random device cannot be found on the system.
 `Settings`
 ----------
 
-An interface to read config files in the format of `minetest.conf`.
+An interface to read config files in the format of `multicraft.conf`.
 
 It can be created via `Settings(filename)`.
 

doc/mkdocs/docs/img/favicon.ico

@@ -1 +1 @@
-../../../../misc/minetest-icon.ico
+../../../../misc/multicraft-icon.ico

misc/winresource.rc

@@ -20,7 +20,7 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"
 #endif
 
 LANGUAGE 0, SUBLANG_NEUTRAL
-130        ICON         "minetest-icon.ico"
+130        ICON         "multicraft-icon.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

multicraft.conf.example

@@ -1,13 +1,13 @@
-#    This file contains a list of all available settings and their default value for minetest.conf
+#    This file contains a list of all available settings and their default value for multicraft.conf
 
 #    By default, all the settings are commented and not functional.
 #    Uncomment settings by removing the preceding #.
 
-#    minetest.conf is read by default from:
+#    multicraft.conf is read by default from:
-#    ../minetest.conf
+#    ../multicraft.conf
-#    ../../minetest.conf
+#    ../../multicraft.conf
 #    Any other path can be chosen by passing the path as a parameter
-#    to the program, eg. "minetest.exe --config ../minetest.conf.example".
+#    to the program, eg. "minetest.exe --config ../multicraft.conf.example".
 
 #    Further documentation:
 #    http://wiki.minetest.net/

po/ar/minetest.po

@@ -1788,7 +1788,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/be/minetest.po

@@ -1831,9 +1831,9 @@ msgid "Key already in use"
 msgstr "Клавіша ўжо выкарыстоўваецца"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"Прывязкі клавіш. (Калі меню сапсавана, выдаліце налады з minetest.conf)"
+"Прывязкі клавіш. (Калі меню сапсавана, выдаліце налады з multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/ca/minetest.po

@@ -1906,7 +1906,7 @@ msgid "Key already in use"
 msgstr "La tecla s'està utilitzant"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Combinacions de tecles. (Si aquest menú espatlla, esborrar coses de minetest."
 "conf)"

po/cs/minetest.po

@@ -1828,10 +1828,10 @@ msgid "Key already in use"
 msgstr "Klávesa je již používána"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Nastavení kláves (pokud toto menu je špatně naformátované, upravte nastavení "
-"v minetest.conf)"
+"v multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/da/minetest.po

@@ -1866,7 +1866,7 @@ msgid "Key already in use"
 msgstr "Tast allerede i brug"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Tastebindinger. (Hvis denne menu fucker op, fjern elementer fra minetest."
 "conf)"

po/de/minetest.po

@@ -1819,7 +1819,7 @@ msgid "Key already in use"
 msgstr "Taste bereits in Benutzung"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Steuerung (Falls dieses Menü defekt ist, entfernen Sie Zeugs aus minetest."
 "conf)"

po/dv/minetest.po

@@ -1816,8 +1816,8 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "ފިތްތައް. (މި މެނޫ މައްސަލަ ޖެހިއްޖެނަމަ minetest.confއިން ތަކެތި ފުހެލައްވާ)"
+msgstr "ފިތްތައް. (މި މެނޫ މައްސަލަ ޖެހިއްޖެނަމަ multicraft.confއިން ތަކެތި ފުހެލައްވާ)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/el/minetest.po

@@ -1773,7 +1773,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/eo/minetest.po

@@ -1814,9 +1814,9 @@ msgid "Key already in use"
 msgstr "Klavo jam estas uzata"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"Klavagordoj. (Se tiu menuo misfunkcias, forigu agordojn el minetest.conf)"
+"Klavagordoj. (Se tiu menuo misfunkcias, forigu agordojn el multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/es/minetest.po

@@ -1819,7 +1819,7 @@ msgid "Key already in use"
 msgstr "La tecla ya se está utilizando"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Combinaciones de teclas. (Si este menú da error, elimina líneas en minetest."
 "conf)"

po/et/minetest.po

@@ -1821,7 +1821,7 @@ msgid "Key already in use"
 msgstr "Nupp juba kasutuses"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Nupusätted. (Kui see menüü sassi läheb, siis kustuta asju failist minetest."
 "conf)"

po/eu/minetest.po

@@ -1788,7 +1788,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/fil/minetest.po

@@ -1771,7 +1771,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/fr/minetest.po

@@ -1819,7 +1819,7 @@ msgid "Key already in use"
 msgstr "Touche déjà utilisée"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr "Raccourcis"
 
 #: src/gui/guiKeyChangeMenu.cpp

po/gd/minetest.po

@@ -1733,7 +1733,7 @@ msgid "Proceed"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/gl/minetest.po

@@ -1703,7 +1703,7 @@ msgid "Proceed"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/he/minetest.po

@@ -1813,7 +1813,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/hi/minetest.po

@@ -1814,8 +1814,8 @@ msgid "Key already in use"
 msgstr "की पहले से इस्तेमाल में है"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "कीबोर्ड सेटिंग (अगर यह मेनू खराब हो जाए तो minetest.conf से सब कुछ खाली कर दें)"
+msgstr "कीबोर्ड सेटिंग (अगर यह मेनू खराब हो जाए तो multicraft.conf से सब कुछ खाली कर दें)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/hu/minetest.po

@@ -1816,10 +1816,10 @@ msgid "Key already in use"
 msgstr "A gomb már használatban van"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Billentyűzetkiosztás. (Ha ez a menü összeomlik, távolíts el néhány dolgot a "
-"minetest.conf-ból)"
+"multicraft.conf-ból)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/id/minetest.po

@@ -1813,10 +1813,10 @@ msgid "Key already in use"
 msgstr "Tombol telah terpakai"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Pengaturan tombol. (Jika menu ini kacau, hapus pengaturan kontrol dari "
-"minetest.conf)"
+"multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/it/minetest.po

@@ -1814,9 +1814,9 @@ msgid "Key already in use"
 msgstr "Tasto già usato"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"Associamenti tasti. (Se questo menu si incasina, togli roba da minetest.conf)"
+"Associamenti tasti. (Se questo menu si incasina, togli roba da multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/ja/minetest.po

@@ -1808,9 +1808,9 @@ msgid "Key already in use"
 msgstr "キーが重複しています"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"キー設定です。 (このメニューで失敗する場合は、minetest.confから該当する設定を"
+"キー設定です。 (このメニューで失敗する場合は、multicraft.confから該当する設定を"
 "削除してください)"
 
 #: src/gui/guiKeyChangeMenu.cpp

po/ja_KS/minetest.po

@@ -1770,7 +1770,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/jbo/minetest.po

@@ -1847,7 +1847,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/kk/minetest.po

@@ -1770,7 +1770,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/kn/minetest.po

@@ -1784,7 +1784,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/ko/minetest.po

@@ -1903,7 +1903,7 @@ msgid "Key already in use"
 msgstr "이미 사용하고 있는 키입니다"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Keybindings. (이 메뉴를 고정하려면 minetest.cof에서 stuff를 제거해야합니다.)"
 

po/ky/minetest.po

@@ -1886,7 +1886,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/lo/minetest.po

@@ -1770,7 +1770,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/lt/minetest.po

@@ -1911,8 +1911,8 @@ msgid "Key already in use"
 msgstr "Klavišas jau naudojamas"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "Klavišai. (Jei šis meniu sugenda, pašalinkite įrašus iš minetest.conf)"
+msgstr "Klavišai. (Jei šis meniu sugenda, pašalinkite įrašus iš multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy

po/lv/minetest.po

@@ -1825,10 +1825,10 @@ msgid "Key already in use"
 msgstr "Šis taustiņš jau tiek izmantots"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Taustiņu iestatījumi. (Ja šī izvēlne salūzt, izdzēsiet iestatījumus no "
-"minetest.conf)"
+"multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/minetest.pot

@@ -1701,7 +1701,7 @@ msgid "Proceed"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/ms/minetest.po

@@ -1815,10 +1815,10 @@ msgid "Key already in use"
 msgstr "Kekunci telah digunakan untuk fungsi lain"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Ikatan kekunci. (Jika menu ini berselerak, padam sesetengah benda dari fail "
-"minetest.conf)"
+"multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/ms_Arab/minetest.po

@@ -1742,9 +1742,9 @@ msgid "Proceed"
 msgstr "تروسکن"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"ايکتن ککونچي. (جيک مينو اين برسليرق⹁ ڤادم سستڠه بندا دري فايل minetest.conf)"
+"ايکتن ککونچي. (جيک مينو اين برسليرق⹁ ڤادم سستڠه بندا دري فايل multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "\"Special\" = climb down"

po/my/minetest.po

@@ -1770,7 +1770,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/nb/minetest.po

@@ -1825,7 +1825,7 @@ msgid "Key already in use"
 msgstr "Tast allerede i bruk"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Tastaturtilknytninger. (Hvis dette byr på problemer, fjern ting fra minetest."
 "conf)"

po/nl/minetest.po

@@ -1834,10 +1834,10 @@ msgid "Key already in use"
 msgstr "Toets is al in gebruik"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Sneltoetsen. (Als dit menu stuk gaat, verwijder dan instellingen uit "
-"minetest.conf)"
+"multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/nn/minetest.po

@@ -1823,7 +1823,7 @@ msgid "Key already in use"
 msgstr "Knapp er allereie i bruk"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Knappebindinger. (Om denne menyen går galen, ta bort tinga fra \"minetest."
 "conf\")"

po/pl/minetest.po

@@ -1830,10 +1830,10 @@ msgid "Key already in use"
 msgstr "Klawisz już zdefiniowany"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Zdefiniowane klawisze. (Jeżeli to menu nie działa, usuń skonfigurowane "
-"klawisze z pliku minetest.conf)"
+"klawisze z pliku multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/pt/minetest.po

@@ -1844,8 +1844,8 @@ msgid "Key already in use"
 msgstr "Tecla já em uso"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "Teclas. (Se este menu se estragar, remova as linhas do minetest.conf)"
+msgstr "Teclas. (Se este menu se estragar, remova as linhas do multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/pt_BR/minetest.po

@@ -1847,7 +1847,7 @@ msgid "Key already in use"
 msgstr "Essa tecla já está em uso"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Teclas (se este menu estiver com problema, remova itens do arquivo minetest."
 "conf)"

po/ro/minetest.po

@@ -1825,9 +1825,9 @@ msgid "Key already in use"
 msgstr "Tastă deja folosită"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
-"Keybindings. (Dacă acest meniu apare, șterge lucrurile din minetest.conf)"
+"Keybindings. (Dacă acest meniu apare, șterge lucrurile din multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/ru/minetest.po

@@ -1835,7 +1835,7 @@ msgid "Key already in use"
 msgstr "Клавиша уже используется"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Привязки клавиш. (Если это меню сломается, удалите настройки из minetest."
 "conf)"

po/sk/minetest.po

@@ -1716,7 +1716,7 @@ msgid "Proceed"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/sl/minetest.po

@@ -1829,7 +1829,7 @@ msgid "Key already in use"
 msgstr "Tipka je že v uporabi"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/sr_Cyrl/minetest.po

@@ -1890,10 +1890,10 @@ msgid "Key already in use"
 msgstr "Дугме се већ користи"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Подешавање контрола.(Ако овај мени нешто поквари, обришите ствари из "
-"minetest.conf)"
+"multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/sv/minetest.po

@@ -1872,7 +1872,7 @@ msgid "Key already in use"
 msgstr "Tangent används redan"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Tangentbindningar. (Om den här menyn strular, radera saker från minetest."
 "conf)"

po/sw/minetest.po

@@ -1912,8 +1912,8 @@ msgid "Key already in use"
 msgstr "Muhimu tayari katika matumizi"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka minetest.conf)"
+msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy

po/th/minetest.po

@@ -1856,8 +1856,8 @@ msgid "Key already in use"
 msgstr "คีย์ใช้"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "โหวต. (ถ้าเมนูนี้สกรูขึ้น เอาข้อมูลจาก minetest.conf)"
+msgstr "โหวต. (ถ้าเมนูนี้สกรูขึ้น เอาข้อมูลจาก multicraft.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/tr/minetest.po

@@ -1811,8 +1811,8 @@ msgid "Key already in use"
 msgstr "Tuş zaten kullanımda"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "Tuş ayaları. (Eğer bu menü çalışmaz ise, minetest.conf 'tan kaldırın)"
+msgstr "Tuş ayaları. (Eğer bu menü çalışmaz ise, multicraft.conf 'tan kaldırın)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/uk/minetest.po

@@ -1816,7 +1816,7 @@ msgid "Key already in use"
 msgstr "Клавіша вже використовується"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 "Комбінації клавіш. (Якщо це меню зламалося, видаліть налаштування з minetest."
 "conf)"

po/vi/minetest.po

@@ -1778,7 +1778,7 @@ msgid "Key already in use"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp

po/zh_CN/minetest.po

@@ -1817,8 +1817,8 @@ msgid "Key already in use"
 msgstr "按键已被占用"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "键位配置。（如果这个菜单被弄乱，从 minetest.conf 中删掉点东西）"
+msgstr "键位配置。（如果这个菜单被弄乱，从 multicraft.conf 中删掉点东西）"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

po/zh_TW/minetest.po

@@ -1821,8 +1821,8 @@ msgid "Key already in use"
 msgstr "已使用此按鍵"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
+msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)"
-msgstr "按鍵綁定。（若此選單鎖住了，從 minetest.conf 移除相關參數）"
+msgstr "按鍵綁定。（若此選單鎖住了，從 multicraft.conf 移除相關參數）"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-project(minetest)
+project(multicraft)
 
 INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckLibraryExists)
@@ -858,7 +858,7 @@ if(BUILD_CLIENT)
 	if(USE_GETTEXT)
 		foreach(LOCALE ${GETTEXT_USED_LOCALES})
 			set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
-			set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
+			set(MO_BUILD_PATH "${MO_BUILD_PATH}/minetest.mo")
 			install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
 		endforeach()
 	endif()
@@ -896,9 +896,9 @@ if (USE_GETTEXT)
 	set(MO_FILES)
 
 	foreach(LOCALE ${GETTEXT_USED_LOCALES})
-		set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po")
+		set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po")
 		set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
-		set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
+		set(MO_FILE_PATH "${MO_BUILD_PATH}/minetest.mo")
 
 		add_custom_command(OUTPUT ${MO_BUILD_PATH}
 			COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH}

src/config.h

@@ -12,8 +12,8 @@
 #if defined USE_CMAKE_CONFIG_H
 	#include "cmake_config.h"
 #elif defined (__ANDROID__)
-	#define PROJECT_NAME "minetest"
+	#define PROJECT_NAME "multicraft"
-	#define PROJECT_NAME_C "Minetest"
+	#define PROJECT_NAME_C "MultiCraft"
 	#define STATIC_SHAREDIR ""
 	#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA)
 #ifdef NDEBUG

src/content/subgames.cpp

@@ -31,9 +31,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/tile.h" // getImagePath
 #endif
 
-bool getGameMinetestConfig(const std::string &game_path, Settings &conf)
+bool getGameMinetestConfig(
+		const std::string &game_path, Settings &conf, const std::string &file)
 {
-	std::string conf_path = game_path + DIR_DELIM + "minetest.conf";
+	std::string conf_path = game_path + DIR_DELIM + file;
 	return conf.readConfigFile(conf_path.c_str());
 }
 
@@ -297,7 +298,9 @@ bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamesp
 	g_settings->clearDefaults();
 	set_default_settings(g_settings);
 	Settings game_defaults;
-	getGameMinetestConfig(gamespec.path, game_defaults);
+	getGameMinetestConfig(gamespec.path, game_defaults, "minetest.conf");
+	g_settings->overrideDefaults(&game_defaults);
+	getGameMinetestConfig(gamespec.path, game_defaults, "multicraft.conf");
 	g_settings->overrideDefaults(&game_defaults);
 
 	infostream << "Initializing world at " << path << std::endl;

src/content/subgames.h

@@ -53,8 +53,9 @@ struct SubgameSpec
 	bool isValid() const { return (!id.empty() && !path.empty()); }
 };
 
-// minetest.conf
+// minetest.conf and multicraft.conf
-bool getGameMinetestConfig(const std::string &game_path, Settings &conf);
+bool getGameMinetestConfig(
+		const std::string &game_path, Settings &conf, const std::string &file);
 
 SubgameSpec findSubgame(const std::string &id);
 SubgameSpec findWorldSubgame(const std::string &world_path);

src/defaultsettings.cpp

@@ -352,7 +352,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("max_simultaneous_block_sends_per_client", "40");
 	settings->setDefault("time_send_interval", "5");
 
-	settings->setDefault("default_game", "minetest");
+	settings->setDefault("default_game", "default");
 	settings->setDefault("motd", "");
 	settings->setDefault("max_users", "15");
 	settings->setDefault("creative_mode", "false");

src/gettext.cpp

@@ -217,7 +217,7 @@ void init_gettext(const char *path, const std::string &configured_language,
 #endif
 #endif
 
-	std::string name = lowercase(PROJECT_NAME);
+	std::string name = "minetest";;
 	infostream << "Gettext: domainname=\"" << name
 		<< "\" path=\"" << path << "\"" << std::endl;
 

src/gui/guiKeyChangeMenu.cpp

@@ -135,7 +135,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 		core::rect<s32> rect(0, 0, 600 * s, 40 * s);
 		rect += topleft + v2s32(25 * s, 3 * s);
 		//gui::IGUIStaticText *t =
-		const wchar_t *text = wgettext("Keybindings. (If this menu screws up, remove stuff from minetest.conf)");
+		const wchar_t *text = wgettext("Keybindings. (If this menu screws up, remove stuff from multicraft.conf)");
 		Environment->addStaticText(text,
 								   rect, false, true, this, -1);
 		delete[] text;

src/main.cpp

@@ -521,16 +521,16 @@ static bool read_config_file(const Settings &cmd_args)
 		g_settings_path = cmd_args.get("config");
 	} else {
 		std::vector<std::string> filenames;
-		filenames.push_back(porting::path_user + DIR_DELIM + "minetest.conf");
+		filenames.push_back(porting::path_user + DIR_DELIM + "multicraft.conf");
 		// Legacy configuration file location
 		filenames.push_back(porting::path_user +
-				DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+				DIR_DELIM + ".." + DIR_DELIM + "multicraft.conf");
 
 #if RUN_IN_PLACE
 		// Try also from a lower level (to aid having the same configuration
 		// for many RUN_IN_PLACE installs)
 		filenames.push_back(porting::path_user +
-				DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
+				DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "multicraft.conf");
 #endif
 
 		for (const std::string &filename : filenames) {
@@ -868,7 +868,7 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
 		if (!name_ok) {
 			if (admin_nick.empty()) {
 				errorstream << "No name given for admin. "
-					<< "Please check your minetest.conf that it "
+					<< "Please check your multicraft.conf that it "
 					<< "contains a 'name = ' to your main admin account."
 					<< std::endl;
 			} else {

src/server.cpp

@@ -468,14 +468,6 @@ void Server::start()
 	// Start thread
 	m_thread->start();
 
-	// ASCII art for the win!
-	std::cerr
-		<< "        .__               __                   __   " << std::endl
-		<< "  _____ |__| ____   _____/  |_  ____   _______/  |_ " << std::endl
-		<< " /     \\|  |/    \\_/ __ \\   __\\/ __ \\ /  ___/\\   __\\" << std::endl
-		<< "|  Y Y  \\  |   |  \\  ___/|  | \\  ___/ \\___ \\  |  |  " << std::endl
-		<< "|__|_|  /__|___|  /\\___  >__|  \\___  >____  > |__|  " << std::endl
-		<< "      \\/        \\/     \\/          \\/     \\/        " << std::endl;
 	actionstream << "World at [" << m_path_world << "]" << std::endl;
 	actionstream << "Server for gameid=\"" << m_gamespec.id
 			<< "\" listening on " << m_bind_addr.serializeString() << ":"