From 9cb53652b35a90bbba4cde9c08c67649a9cb9510 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Tue, 25 Aug 2020 09:59:52 +0200 Subject: [PATCH] Rename to MultiCraft --- .github/workflows/build.yml | 14 +- .gitignore | 7 +- CMakeLists.txt | 22 +-- Dockerfile | 46 +++---- README.md | 126 +++++------------- builtin/mainmenu/dlg_settings_advanced.lua | 2 +- .../mainmenu/generate_from_settingtypes.lua | 14 +- doc/client_lua_api.txt | 4 +- doc/lua_api.txt | 14 +- doc/mkdocs/docs/img/favicon.ico | 2 +- misc/minetest-icon.ico | Bin 9662 -> 0 bytes misc/minetest-xorg-icon-128.png | Bin 11241 -> 0 bytes misc/multicraft-icon.ico | Bin 0 -> 67646 bytes misc/multicraft-xorg-icon-128.png | Bin 0 -> 17237 bytes misc/winresource.rc | 2 +- ...st.conf.example => multicraft.conf.example | 10 +- po/ar/minetest.po | 2 +- po/be/minetest.po | 4 +- po/ca/minetest.po | 2 +- po/cs/minetest.po | 4 +- po/da/minetest.po | 2 +- po/de/minetest.po | 2 +- po/dv/minetest.po | 4 +- po/el/minetest.po | 2 +- po/eo/minetest.po | 4 +- po/es/minetest.po | 2 +- po/et/minetest.po | 2 +- po/eu/minetest.po | 2 +- po/fil/minetest.po | 2 +- po/fr/minetest.po | 2 +- po/gd/minetest.po | 2 +- po/gl/minetest.po | 2 +- po/he/minetest.po | 2 +- po/hi/minetest.po | 4 +- po/hu/minetest.po | 4 +- po/id/minetest.po | 4 +- po/it/minetest.po | 4 +- po/ja/minetest.po | 4 +- po/ja_KS/minetest.po | 2 +- po/jbo/minetest.po | 2 +- po/kk/minetest.po | 2 +- po/kn/minetest.po | 2 +- po/ko/minetest.po | 2 +- po/ky/minetest.po | 2 +- po/lo/minetest.po | 2 +- po/lt/minetest.po | 4 +- po/lv/minetest.po | 4 +- po/minetest.pot | 2 +- po/ms/minetest.po | 4 +- po/ms_Arab/minetest.po | 4 +- po/my/minetest.po | 2 +- po/nb/minetest.po | 2 +- po/nl/minetest.po | 4 +- po/nn/minetest.po | 2 +- po/pl/minetest.po | 4 +- po/pt/minetest.po | 4 +- po/pt_BR/minetest.po | 2 +- po/ro/minetest.po | 4 +- po/ru/minetest.po | 2 +- po/sk/minetest.po | 2 +- po/sl/minetest.po | 2 +- po/sr_Cyrl/minetest.po | 4 +- po/sv/minetest.po | 2 +- po/sw/minetest.po | 4 +- po/th/minetest.po | 4 +- po/tr/minetest.po | 4 +- po/uk/minetest.po | 2 +- po/vi/minetest.po | 2 +- po/zh_CN/minetest.po | 4 +- po/zh_TW/minetest.po | 4 +- src/CMakeLists.txt | 8 +- src/config.h | 4 +- src/content/subgames.cpp | 9 +- src/content/subgames.h | 5 +- src/defaultsettings.cpp | 2 +- src/gettext.cpp | 2 +- src/gui/guiKeyChangeMenu.cpp | 2 +- src/main.cpp | 8 +- src/server.cpp | 8 -- 79 files changed, 201 insertions(+), 264 deletions(-) delete mode 100644 misc/minetest-icon.ico delete mode 100644 misc/minetest-xorg-icon-128.png create mode 100644 misc/multicraft-icon.ico create mode 100644 misc/multicraft-xorg-icon-128.png rename minetest.conf.example => multicraft.conf.example (99%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae359f5d8..58f4f0f2d 100644 --- a/.github/workflows/build.yml +++ b/.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" diff --git a/.gitignore b/.gitignore index 52f8bc4f4..0be7d139b 100644 --- a/.gitignore +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d33a2a7e..5510670a2 100644 --- a/CMakeLists.txt +++ b/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) -set(PROJECT_NAME_CAPITALIZED "Minetest") +project(multicraft) +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_MINOR 3) +set(VERSION_MAJOR 2) +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") - # Supported languages can be found at + set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/multicraft-icon.ico") + # 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 diff --git a/Dockerfile b/Dockerfile index 72343ab9c..51e13f848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,21 +2,21 @@ FROM alpine:3.11 ENV MINETEST_GAME_VERSION master -COPY .git /usr/src/minetest/.git -COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt -COPY README.md /usr/src/minetest/README.md -COPY minetest.conf.example /usr/src/minetest/minetest.conf.example -COPY builtin /usr/src/minetest/builtin -COPY cmake /usr/src/minetest/cmake -COPY doc /usr/src/minetest/doc -COPY fonts /usr/src/minetest/fonts -COPY lib /usr/src/minetest/lib -COPY misc /usr/src/minetest/misc -COPY po /usr/src/minetest/po -COPY src /usr/src/minetest/src -COPY textures /usr/src/minetest/textures +COPY .git /usr/src/multicraft/.git +COPY CMakeLists.txt /usr/src/multicraft/CMakeLists.txt +COPY README.md /usr/src/multicraft/README.md +COPY multicraft.conf.example /usr/src/multicraft/multicraft.conf.example +COPY builtin /usr/src/multicraft/builtin +COPY cmake /usr/src/multicraft/cmake +COPY doc /usr/src/multicraft/doc +COPY fonts /usr/src/multicraft/fonts +COPY lib /usr/src/multicraft/lib +COPY misc /usr/src/multicraft/misc +COPY po /usr/src/multicraft/po +COPY src /usr/src/multicraft/src +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 && \ - chown -R minetest:minetest /var/lib/minetest + adduser -D multicraft --uid 30000 -h /var/lib/multicraft && \ + 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/bin/minetestserver /usr/local/bin/minetestserver -COPY --from=0 /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf +COPY --from=0 /usr/local/share/multicraft /usr/local/share/multicraft +COPY --from=0 /usr/local/bin/multicraftserver /usr/local/bin/multicraftserver +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"] diff --git a/README.md b/README.md index 6a3c11f40..63ba0ea51 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,14 @@ -Minetest -======== +MultiCraft Open Source +====================== -![Build Status](https://github.com/minetest/minetest/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-LGPLv2.1%2B-blue.svg)](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html) +![Build Status](https://github.com/MultiCraft/MultiCraft5.3/workflows/build/badge.svg) +[![License](https://img.shields.io/badge/license-LGPLv3.0%2B-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0.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 -and contributors (see source file comments and the version control log) +MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors). -In case you downloaded the source code --------------------------------------- -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. +Copyright © 2014-2020 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. Table of Contents ------------------ @@ -31,11 +25,11 @@ Table of Contents Further documentation ---------------------- -- Website: http://minetest.net/ -- Wiki: http://wiki.minetest.net/ -- Developer wiki: http://dev.minetest.net/ -- Forum: http://forum.minetest.net/ -- GitHub: https://github.com/minetest/minetest/ +- Minetest Website: http://minetest.net/ +- Minetest Wiki: http://wiki.minetest.net/ +- Minetest Developer wiki: http://dev.minetest.net/ +- Minetest Forum: http://forum.minetest.net/ +- 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)` - * `share` = `C:\Program Files\Minetest (Depends on the install location)` - * `user` = `%APPDATA%\Minetest` + * `bin` = `C:\Program Files\MultiCraft\bin (Depends on the install location)` + * `share` = `C:\Program Files\MultiCraft (Depends on the install location)` + * `user` = `%APPDATA%\MultiCraft` * Linux installed: * `bin` = `/usr/bin` - * `share` = `/usr/share/minetest` - * `user` = `~/.minetest` + * `share` = `/usr/share/multicraft` + * `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` -- This file is created by closing Minetest for the first time. + `user/multicraft.conf` +- This file is created by closing MultiCraft for the first time. - A specific file can be specified on the command line: `--config ` - 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 - cd minetest - -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 + git clone --depth 1 https://github.com/MultiCraft/MultiCraft.git + cd MultiCraft 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 - -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 .. + cd MultiCraft-master #### 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_SERVER=FALSE - Build Minetest server + BUILD_CLIENT=TRUE - Build MultiCraft client + 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 -3. Select **Browse Build...** and select DIR/minetest-build +2. Select **Browse Source...** and select DIR/multicraft +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:` (current branch or current tag) -* `registry.gitlab.com/minetest/minetest/server:` (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: - -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`. diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index c16e4aad0..f2d9f270f 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/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'. diff --git a/builtin/mainmenu/generate_from_settingtypes.lua b/builtin/mainmenu/generate_from_settingtypes.lua index 43fc57bb9..7d36af9d8 100644 --- a/builtin/mainmenu/generate_from_settingtypes.lua +++ b/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: -# ../minetest.conf -# ../../minetest.conf +# multicraft.conf is read by default from: +# ../multicraft.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()) diff --git a/doc/client_lua_api.txt b/doc/client_lua_api.txt index c9cd8ac93..462682a3a 100644 --- a/doc/client_lua_api.txt +++ b/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/` is added to `$path_user/clientmods/mods.conf` as `load_mod_ = 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)`. diff --git a/doc/lua_api.txt b/doc/lua_api.txt index f2a83eca5..43d57aa4f 100644 --- a/doc/lua_api.txt +++ b/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)`. diff --git a/doc/mkdocs/docs/img/favicon.ico b/doc/mkdocs/docs/img/favicon.ico index cac34a30c..04ba712f5 120000 --- a/doc/mkdocs/docs/img/favicon.ico +++ b/doc/mkdocs/docs/img/favicon.ico @@ -1 +1 @@ -../../../../misc/minetest-icon.ico \ No newline at end of file +../../../../misc/multicraft-icon.ico \ No newline at end of file diff --git a/misc/minetest-icon.ico b/misc/minetest-icon.ico deleted file mode 100644 index 82af67bf918ad7683dfc7b63da97757d8b37d23c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9662 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 diff --git a/misc/minetest-xorg-icon-128.png b/misc/minetest-xorg-icon-128.png deleted file mode 100644 index 0241a911ce70586f2b1a59a665661ef4115e14cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11241 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 TH&;SP00000NkvXXu0mjf3!wJT diff --git a/misc/multicraft-icon.ico b/misc/multicraft-icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..daba9bc1b7e77d7d5469f19436e33e1eef145454 GIT binary patch literal 67646 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 B>d62A literal 0 HcmV?d00001 diff --git a/misc/multicraft-xorg-icon-128.png b/misc/multicraft-xorg-icon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..9faad9de36dbd86753d059697bd4933acce9d6c0 GIT binary patch literal 17237 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 literal 0 HcmV?d00001 diff --git a/misc/winresource.rc b/misc/winresource.rc index ffb493873..0165be1ff 100644 --- a/misc/winresource.rc +++ b/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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/minetest.conf.example b/multicraft.conf.example similarity index 99% rename from minetest.conf.example rename to multicraft.conf.example index a5f98ee5e..af7dc72e6 100644 --- a/minetest.conf.example +++ b/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: -# ../minetest.conf -# ../../minetest.conf +# multicraft.conf is read by default from: +# ../multicraft.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/ diff --git a/po/ar/minetest.po b/po/ar/minetest.po index 9bda5109d..96c368e42 100644 --- a/po/ar/minetest.po +++ b/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 diff --git a/po/be/minetest.po b/po/be/minetest.po index ed091587d..f8747d8da 100644 --- a/po/be/minetest.po +++ b/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" diff --git a/po/ca/minetest.po b/po/ca/minetest.po index 5ce219f7f..f31c5570d 100644 --- a/po/ca/minetest.po +++ b/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)" diff --git a/po/cs/minetest.po b/po/cs/minetest.po index f710ac43f..cba1b3ff5 100644 --- a/po/cs/minetest.po +++ b/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" diff --git a/po/da/minetest.po b/po/da/minetest.po index 931e3dbbf..a89b6a157 100644 --- a/po/da/minetest.po +++ b/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)" diff --git a/po/de/minetest.po b/po/de/minetest.po index be63088d2..c154e65a0 100644 --- a/po/de/minetest.po +++ b/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)" diff --git a/po/dv/minetest.po b/po/dv/minetest.po index c5d325108..5afd7638e 100644 --- a/po/dv/minetest.po +++ b/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)" -msgstr "ފިތްތައް. (މި މެނޫ މައްސަލަ ޖެހިއްޖެނަމަ minetest.confއިން ތަކެތި ފުހެލައްވާ)" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "ފިތްތައް. (މި މެނޫ މައްސަލަ ޖެހިއްޖެނަމަ multicraft.confއިން ތަކެތި ފުހެލައްވާ)" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/el/minetest.po b/po/el/minetest.po index 1992676a4..a501ca84f 100644 --- a/po/el/minetest.po +++ b/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 diff --git a/po/eo/minetest.po b/po/eo/minetest.po index 752538f5e..e86bff41f 100644 --- a/po/eo/minetest.po +++ b/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" diff --git a/po/es/minetest.po b/po/es/minetest.po index f0a5e38dd..9b9e53fe2 100644 --- a/po/es/minetest.po +++ b/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)" diff --git a/po/et/minetest.po b/po/et/minetest.po index 67b8210b3..48b821b5a 100644 --- a/po/et/minetest.po +++ b/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)" diff --git a/po/eu/minetest.po b/po/eu/minetest.po index 17c4325df..1f4ccae15 100644 --- a/po/eu/minetest.po +++ b/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 diff --git a/po/fil/minetest.po b/po/fil/minetest.po index c78b043ed..9890c9f4a 100644 --- a/po/fil/minetest.po +++ b/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 diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 34fcda843..aaf0af263 100644 --- a/po/fr/minetest.po +++ b/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 diff --git a/po/gd/minetest.po b/po/gd/minetest.po index c3347ecda..977f1eca7 100644 --- a/po/gd/minetest.po +++ b/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 diff --git a/po/gl/minetest.po b/po/gl/minetest.po index 115597bf8..247d52d5d 100644 --- a/po/gl/minetest.po +++ b/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 diff --git a/po/he/minetest.po b/po/he/minetest.po index f0a49f82e..7f1f09506 100644 --- a/po/he/minetest.po +++ b/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 diff --git a/po/hi/minetest.po b/po/hi/minetest.po index a45a5ae89..ec70e31e0 100644 --- a/po/hi/minetest.po +++ b/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)" -msgstr "कीबोर्ड सेटिंग (अगर यह मेनू खराब हो जाए तो minetest.conf से सब कुछ खाली कर दें)" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "कीबोर्ड सेटिंग (अगर यह मेनू खराब हो जाए तो multicraft.conf से सब कुछ खाली कर दें)" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/hu/minetest.po b/po/hu/minetest.po index 725c12629..826342635 100644 --- a/po/hu/minetest.po +++ b/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" diff --git a/po/id/minetest.po b/po/id/minetest.po index 21fd705bb..5331274f8 100644 --- a/po/id/minetest.po +++ b/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" diff --git a/po/it/minetest.po b/po/it/minetest.po index c7ce03705..7ce829227 100644 --- a/po/it/minetest.po +++ b/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" diff --git a/po/ja/minetest.po b/po/ja/minetest.po index f274682c4..aa5eeda3c 100644 --- a/po/ja/minetest.po +++ b/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 diff --git a/po/ja_KS/minetest.po b/po/ja_KS/minetest.po index 2bb9891ae..86b95c94f 100644 --- a/po/ja_KS/minetest.po +++ b/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 diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po index 016dd43ed..0935ecbf7 100644 --- a/po/jbo/minetest.po +++ b/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 diff --git a/po/kk/minetest.po b/po/kk/minetest.po index 3f68fbc97..6817087b4 100644 --- a/po/kk/minetest.po +++ b/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 diff --git a/po/kn/minetest.po b/po/kn/minetest.po index 91fc52c2a..9fcdaf484 100644 --- a/po/kn/minetest.po +++ b/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 diff --git a/po/ko/minetest.po b/po/ko/minetest.po index c28e410a4..ccc1d4642 100644 --- a/po/ko/minetest.po +++ b/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를 제거해야합니다.)" diff --git a/po/ky/minetest.po b/po/ky/minetest.po index 1d4de9d90..b7a82ca32 100644 --- a/po/ky/minetest.po +++ b/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 diff --git a/po/lo/minetest.po b/po/lo/minetest.po index 731a7957d..c7ad7c858 100644 --- a/po/lo/minetest.po +++ b/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 diff --git a/po/lt/minetest.po b/po/lt/minetest.po index c4c658629..616b47b0b 100644 --- a/po/lt/minetest.po +++ b/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)" -msgstr "Klavišai. (Jei šis meniu sugenda, pašalinkite įrašus iš 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š multicraft.conf)" #: src/gui/guiKeyChangeMenu.cpp #, fuzzy diff --git a/po/lv/minetest.po b/po/lv/minetest.po index 5e63284a3..aecede551 100644 --- a/po/lv/minetest.po +++ b/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" diff --git a/po/minetest.pot b/po/minetest.pot index 3f343389a..3de6f5b18 100644 --- a/po/minetest.pot +++ b/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 diff --git a/po/ms/minetest.po b/po/ms/minetest.po index fb3989a3f..113792837 100644 --- a/po/ms/minetest.po +++ b/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" diff --git a/po/ms_Arab/minetest.po b/po/ms_Arab/minetest.po index e7e4c7167..b9ce4e222 100644 --- a/po/ms_Arab/minetest.po +++ b/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" diff --git a/po/my/minetest.po b/po/my/minetest.po index 549653ac5..f3a34efd5 100644 --- a/po/my/minetest.po +++ b/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 diff --git a/po/nb/minetest.po b/po/nb/minetest.po index ed5bab6db..ca67c3c37 100644 --- a/po/nb/minetest.po +++ b/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)" diff --git a/po/nl/minetest.po b/po/nl/minetest.po index c4d3da53a..7308f2f0d 100644 --- a/po/nl/minetest.po +++ b/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" diff --git a/po/nn/minetest.po b/po/nn/minetest.po index 9a0b036d3..1219dc74b 100644 --- a/po/nn/minetest.po +++ b/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\")" diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 015692182..273de2dc7 100644 --- a/po/pl/minetest.po +++ b/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" diff --git a/po/pt/minetest.po b/po/pt/minetest.po index 466428c35..6befdffcb 100644 --- a/po/pt/minetest.po +++ b/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)" -msgstr "Teclas. (Se este menu se estragar, remova as linhas do 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 multicraft.conf)" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po index fc31640c4..088a63da5 100644 --- a/po/pt_BR/minetest.po +++ b/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)" diff --git a/po/ro/minetest.po b/po/ro/minetest.po index f7c6b6fef..5bcd084e4 100644 --- a/po/ro/minetest.po +++ b/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" diff --git a/po/ru/minetest.po b/po/ru/minetest.po index e626d58b3..3f076c2ba 100644 --- a/po/ru/minetest.po +++ b/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)" diff --git a/po/sk/minetest.po b/po/sk/minetest.po index 843c924e3..3de12657d 100644 --- a/po/sk/minetest.po +++ b/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 diff --git a/po/sl/minetest.po b/po/sl/minetest.po index 16d224c40..49a372655 100644 --- a/po/sl/minetest.po +++ b/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 diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po index 67ee37bd0..f2a2ae369 100644 --- a/po/sr_Cyrl/minetest.po +++ b/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" diff --git a/po/sv/minetest.po b/po/sv/minetest.po index 296e0b5bb..fb98ed277 100644 --- a/po/sv/minetest.po +++ b/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)" diff --git a/po/sw/minetest.po b/po/sw/minetest.po index a34b6c98b..b0d713c61 100644 --- a/po/sw/minetest.po +++ b/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)" -msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka minetest.conf)" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "Keybindings. (Kama Menyu hii screws, Ondoa vitu kutoka multicraft.conf)" #: src/gui/guiKeyChangeMenu.cpp #, fuzzy diff --git a/po/th/minetest.po b/po/th/minetest.po index 72490f111..d221fca7f 100644 --- a/po/th/minetest.po +++ b/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)" -msgstr "โหวต. (ถ้าเมนูนี้สกรูขึ้น เอาข้อมูลจาก minetest.conf)" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "โหวต. (ถ้าเมนูนี้สกรูขึ้น เอาข้อมูลจาก multicraft.conf)" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/tr/minetest.po b/po/tr/minetest.po index 5101b66fa..2568aeb2f 100644 --- a/po/tr/minetest.po +++ b/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)" -msgstr "Tuş ayaları. (Eğer bu menü çalışmaz ise, minetest.conf 'tan kaldırın)" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "Tuş ayaları. (Eğer bu menü çalışmaz ise, multicraft.conf 'tan kaldırın)" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/uk/minetest.po b/po/uk/minetest.po index a87362951..0ed067cf0 100644 --- a/po/uk/minetest.po +++ b/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)" diff --git a/po/vi/minetest.po b/po/vi/minetest.po index f2574e132..dc42a37a9 100644 --- a/po/vi/minetest.po +++ b/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 diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index 80f2d86fa..77b281282 100644 --- a/po/zh_CN/minetest.po +++ b/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)" -msgstr "键位配置。（如果这个菜单被弄乱，从 minetest.conf 中删掉点东西）" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "键位配置。（如果这个菜单被弄乱，从 multicraft.conf 中删掉点东西）" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po index 646c292b5..0a03cac75 100644 --- a/po/zh_TW/minetest.po +++ b/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)" -msgstr "按鍵綁定。（若此選單鎖住了，從 minetest.conf 移除相關參數）" +msgid "Keybindings. (If this menu screws up, remove stuff from multicraft.conf)" +msgstr "按鍵綁定。（若此選單鎖住了，從 multicraft.conf 移除相關參數）" #: src/gui/guiKeyChangeMenu.cpp msgid "Local command" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3d6d1b0ea..00e208345 100644 --- a/src/CMakeLists.txt +++ b/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} diff --git a/src/config.h b/src/config.h index 5e1164642..699256273 100644 --- a/src/config.h +++ b/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_C "Minetest" + #define PROJECT_NAME "multicraft" + #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 diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp index 0c39cd827..df686748a 100644 --- a/src/content/subgames.cpp +++ b/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; diff --git a/src/content/subgames.h b/src/content/subgames.h index a5e5df9c5..77af1a9f2 100644 --- a/src/content/subgames.h +++ b/src/content/subgames.h @@ -53,8 +53,9 @@ struct SubgameSpec bool isValid() const { return (!id.empty() && !path.empty()); } }; -// minetest.conf -bool getGameMinetestConfig(const std::string &game_path, Settings &conf); +// minetest.conf and multicraft.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); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 245413b97..a517ff3ec 100644 --- a/src/defaultsettings.cpp +++ b/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"); diff --git a/src/gettext.cpp b/src/gettext.cpp index 98a53971f..dda8d53b4 100644 --- a/src/gettext.cpp +++ b/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; diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp index 08229cbdc..7e77857d1 100644 --- a/src/gui/guiKeyChangeMenu.cpp +++ b/src/gui/guiKeyChangeMenu.cpp @@ -135,7 +135,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) core::rect 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; diff --git a/src/main.cpp b/src/main.cpp index a617baade..ee28c65fc 100644 --- a/src/main.cpp +++ b/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 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 { diff --git a/src/server.cpp b/src/server.cpp index 85d649e59..0c1012cc4 100644 --- a/src/server.cpp +++ b/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() << ":"