Rename to Luanti (#15294)
The new header intentionally isn't in MTG stone design (or any other MTG-esque design), since we want to distance Luanti and MTG from each other. The font "undefined medium" (https://undefined-medium.com/) was used. ASCII art generated by https://patorjk.com/software/taag/#p=display&f=Graffiti&t=luanti https://github.com/minetest/minetest/pull/11952#issuecomment-1013364703 --------- Co-authored-by: sfan5 <sfan5@live.de>
2
.github/CONTRIBUTING.md
vendored
@ -37,7 +37,7 @@ Contributions are welcome! Here's how you can help:
|
||||
[Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines.
|
||||
- Check your code works as expected and document any changes to the Lua API.
|
||||
- To avoid conflicting changes between contributions, do not do the following manually. They will be done before each release.
|
||||
- Run `updatepo.sh` or update `minetest.po{,t}` even if your code adds new translatable strings.
|
||||
- Run `updatepo.sh` or update `luanti.po{,t}` even if your code adds new translatable strings.
|
||||
- Update `minetest.conf.example` and `settings_translation_file.cpp` even if your code adds new core settings.
|
||||
|
||||
4. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch)
|
||||
|
10
.github/workflows/android.yml
vendored
@ -50,25 +50,25 @@ jobs:
|
||||
- name: Save AAB artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Minetest-release.aab
|
||||
name: Luanti-release.aab
|
||||
path: android/app/build/outputs/bundle/release/app-release.aab
|
||||
- name: Save armeabi artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Minetest-armeabi-v7a.apk
|
||||
name: Luanti-armeabi-v7a.apk
|
||||
path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
|
||||
- name: Save arm64 artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Minetest-arm64-v8a.apk
|
||||
name: Luanti-arm64-v8a.apk
|
||||
path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
|
||||
- name: Save x86 artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Minetest-x86.apk
|
||||
name: Luanti-x86.apk
|
||||
path: android/app/build/outputs/apk/release/app-x86-release-unsigned.apk
|
||||
- name: Save x86_64 artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Minetest-x86_64.apk
|
||||
name: Luanti-x86_64.apk
|
||||
path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk
|
||||
|
6
.github/workflows/docker_image.yml
vendored
@ -72,8 +72,8 @@ jobs:
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||
labels: |
|
||||
org.opencontainers.image.title=Minetest
|
||||
org.opencontainers.image.vendor=Minetest
|
||||
org.opencontainers.image.title=Luanti
|
||||
org.opencontainers.image.vendor=Luanti
|
||||
org.opencontainers.image.licenses=LGPL-2.1-only
|
||||
|
||||
# Build and push Docker image
|
||||
@ -94,5 +94,5 @@ jobs:
|
||||
|
||||
- name: Test Docker Image
|
||||
run: |
|
||||
docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") minetestserver --version
|
||||
docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") luantiserver --version
|
||||
shell: bash
|
||||
|
10
.github/workflows/linux.yml
vendored
@ -54,7 +54,7 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
run: |
|
||||
./bin/minetest --run-unittests
|
||||
./bin/luanti --run-unittests
|
||||
|
||||
# Current gcc version
|
||||
gcc_14:
|
||||
@ -78,7 +78,7 @@ jobs:
|
||||
mkdir nowrite
|
||||
chmod a-w nowrite
|
||||
cd nowrite
|
||||
../bin/minetest --run-unittests
|
||||
../bin/luanti --run-unittests
|
||||
|
||||
# Older clang version (should be close to our minimum supported version)
|
||||
clang_7:
|
||||
@ -100,7 +100,7 @@ jobs:
|
||||
|
||||
- name: Unittest
|
||||
run: |
|
||||
./bin/minetest --run-unittests
|
||||
./bin/luanti --run-unittests
|
||||
|
||||
# Do this here because we have ASan and error paths are sensitive to dangling pointers
|
||||
- name: Test error cases
|
||||
@ -126,7 +126,7 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
run: |
|
||||
./bin/minetest --run-unittests
|
||||
./bin/luanti --run-unittests
|
||||
|
||||
- name: Integration test + devtest
|
||||
run: |
|
||||
@ -156,4 +156,4 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
run: |
|
||||
./bin/minetestserver --run-unittests
|
||||
./bin/luantiserver --run-unittests
|
||||
|
4
.github/workflows/macos.yml
vendored
@ -53,7 +53,7 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
run: |
|
||||
./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests
|
||||
./build/macos/luanti.app/Contents/MacOS/luanti --run-unittests
|
||||
|
||||
# Zipping the built .app preserves permissions on the contained files,
|
||||
# which the GitHub artifact pipeline would otherwise strip away.
|
||||
@ -66,5 +66,5 @@ jobs:
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: minetest-macos
|
||||
name: luanti-macos
|
||||
path: ./build/macos/*.zip
|
||||
|
10
.github/workflows/windows.yml
vendored
@ -56,8 +56,8 @@ jobs:
|
||||
run: |
|
||||
dest=$(mktemp -d)
|
||||
unzip -q -d "$dest" B/build/*.zip
|
||||
cd "$dest"/minetest-*-win*
|
||||
wine bin/minetest.exe --version
|
||||
cd "$dest"/luanti-*-win*
|
||||
wine bin/luanti.exe --version
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@ -103,7 +103,7 @@ jobs:
|
||||
vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
|
||||
vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
|
||||
|
||||
- name: Minetest CMake
|
||||
- name: CMake
|
||||
run: |
|
||||
cmake ${{matrix.config.generator}} `
|
||||
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" `
|
||||
@ -113,13 +113,13 @@ jobs:
|
||||
-DREQUIRE_LUAJIT=TRUE `
|
||||
-DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
|
||||
|
||||
- name: Build Minetest
|
||||
- name: Build
|
||||
run: cmake --build . --config Release
|
||||
|
||||
- name: Unittests
|
||||
# need this workaround for stdout to work
|
||||
run: |
|
||||
$proc = start .\bin\Release\minetest.exe --run-unittests -NoNewWindow -Wait -PassThru
|
||||
$proc = start .\bin\Release\luanti.exe --run-unittests -NoNewWindow -Wait -PassThru
|
||||
exit $proc.ExitCode
|
||||
continue-on-error: true # FIXME!!
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
cmake_minimum_required(VERSION 3.12)
|
||||
|
||||
# This can be read from ${PROJECT_NAME} after project() is called
|
||||
project(minetest)
|
||||
set(PROJECT_NAME_CAPITALIZED "Minetest")
|
||||
project(luanti)
|
||||
set(PROJECT_NAME_CAPITALIZED "Luanti")
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
|
||||
@ -92,7 +92,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||
# Load default options for Android
|
||||
if(ANDROID)
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
include(MinetestAndroidLibs)
|
||||
include(AndroidLibs)
|
||||
endif()
|
||||
|
||||
|
||||
@ -261,17 +261,17 @@ install(FILES "doc/world_format.md" DESTINATION "${DOCDIR}" COMPONENT "Docs")
|
||||
install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
|
||||
install(FILES "doc/luanti.6" "doc/luantiserver.6" DESTINATION "${MANDIR}/man6")
|
||||
install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
|
||||
install(FILES "misc/net.minetest.minetest.metainfo.xml" DESTINATION "${METAINFODIR}")
|
||||
install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
|
||||
install(FILES "misc/minetest-xorg-icon-128.png"
|
||||
install(FILES "misc/luanti.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
|
||||
install(FILES "misc/luanti-xorg-icon-128.png"
|
||||
DESTINATION "${ICONDIR}/hicolor/128x128/apps"
|
||||
RENAME "minetest.png")
|
||||
RENAME "luanti.png")
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}")
|
||||
install(FILES "misc/luanti-icon.icns" DESTINATION "${SHAREDIR}")
|
||||
install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
|
||||
endif()
|
||||
|
||||
@ -307,7 +307,7 @@ include(CPackComponent)
|
||||
|
||||
cpack_add_component(Docs
|
||||
DISPLAY_NAME "Documentation"
|
||||
DESCRIPTION "Documentation about Minetest and Minetest modding"
|
||||
DESCRIPTION "Documentation about ${PROJECT_NAME_CAPITALIZED} and ${PROJECT_NAME_CAPITALIZED} modding"
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
@ -331,7 +331,7 @@ if(WIN32)
|
||||
set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME})
|
||||
set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}")
|
||||
|
||||
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico")
|
||||
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/luanti-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")
|
||||
|
38
Dockerfile
@ -32,22 +32,22 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \
|
||||
|
||||
FROM dev as builder
|
||||
|
||||
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 irr /usr/src/minetest/irr
|
||||
COPY textures /usr/src/minetest/textures
|
||||
COPY .git /usr/src/luanti/.git
|
||||
COPY CMakeLists.txt /usr/src/luanti/CMakeLists.txt
|
||||
COPY README.md /usr/src/luanti/README.md
|
||||
COPY minetest.conf.example /usr/src/luanti/minetest.conf.example
|
||||
COPY builtin /usr/src/luanti/builtin
|
||||
COPY cmake /usr/src/luanti/cmake
|
||||
COPY doc /usr/src/luanti/doc
|
||||
COPY fonts /usr/src/luanti/fonts
|
||||
COPY lib /usr/src/luanti/lib
|
||||
COPY misc /usr/src/luanti/misc
|
||||
COPY po /usr/src/luanti/po
|
||||
COPY src /usr/src/luanti/src
|
||||
COPY irr /usr/src/luanti/irr
|
||||
COPY textures /usr/src/luanti/textures
|
||||
|
||||
WORKDIR /usr/src/minetest
|
||||
WORKDIR /usr/src/luanti
|
||||
RUN cmake -B build \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr/local \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
@ -68,9 +68,9 @@ RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \
|
||||
|
||||
WORKDIR /var/lib/minetest
|
||||
|
||||
COPY --from=builder /usr/local/share/minetest /usr/local/share/minetest
|
||||
COPY --from=builder /usr/local/bin/minetestserver /usr/local/bin/minetestserver
|
||||
COPY --from=builder /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf
|
||||
COPY --from=builder /usr/local/share/luanti /usr/local/share/luanti
|
||||
COPY --from=builder /usr/local/bin/luantiserver /usr/local/bin/luantiserver
|
||||
COPY --from=builder /usr/local/share/doc/luanti/minetest.conf.example /etc/minetest/minetest.conf
|
||||
COPY --from=builder /usr/local/lib/libspatialindex* /usr/local/lib/
|
||||
COPY --from=builder /usr/local/lib/libluajit* /usr/local/lib/
|
||||
USER minetest:minetest
|
||||
@ -78,5 +78,5 @@ USER minetest:minetest
|
||||
EXPOSE 30000/udp 30000/tcp
|
||||
VOLUME /var/lib/minetest/ /etc/minetest/
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/minetestserver"]
|
||||
ENTRYPOINT ["/usr/local/bin/luantiserver"]
|
||||
CMD ["--config", "/etc/minetest/minetest.conf"]
|
||||
|
23
LICENSE.txt
@ -1,8 +1,8 @@
|
||||
|
||||
License of Minetest textures and sounds
|
||||
License of Luanti textures and sounds
|
||||
---------------------------------------
|
||||
|
||||
This applies to textures and sounds contained in the main Minetest
|
||||
This applies to textures and sounds contained in the main Luanti
|
||||
distribution.
|
||||
|
||||
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
|
||||
@ -29,7 +29,6 @@ ShadowNinja:
|
||||
textures/base/pack/smoke_puff.png
|
||||
|
||||
paramat:
|
||||
textures/base/pack/menu_header.png
|
||||
textures/base/pack/next_icon.png
|
||||
textures/base/pack/prev_icon.png
|
||||
textures/base/pack/clear.png
|
||||
@ -40,9 +39,9 @@ rubenwardy, paramat:
|
||||
textures/base/pack/end_icon.png
|
||||
|
||||
erle:
|
||||
misc/minetest-icon-24x24.png
|
||||
misc/minetest-icon.ico
|
||||
misc/minetest.svg
|
||||
misc/luanti-icon-24x24.png
|
||||
misc/luanti-icon.ico
|
||||
misc/luanti.svg
|
||||
textures/base/pack/logo.png
|
||||
|
||||
JRottm:
|
||||
@ -88,12 +87,16 @@ DS:
|
||||
|
||||
grorp:
|
||||
textures/base/pack/exit_btn.png
|
||||
textures/base/pack/menu_header.png
|
||||
using the font "undefined medium" (https://undefined-medium.com/),
|
||||
which is licensed under the SIL Open Font License, Version 1.1
|
||||
|
||||
License of Minetest source code
|
||||
License of Luanti source code
|
||||
-------------------------------
|
||||
|
||||
Minetest
|
||||
Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
Luanti
|
||||
Copyright (C) 2010-2024 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
and contributors (see source file comments and the version control log)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
@ -112,7 +115,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
Irrlicht
|
||||
---------------
|
||||
|
||||
This program uses IrrlichtMt, Minetest's fork of
|
||||
This program uses IrrlichtMt, Luanti's fork of
|
||||
the Irrlicht Engine. http://irrlicht.sourceforge.net/
|
||||
|
||||
The Irrlicht Engine License
|
||||
|
@ -95,7 +95,7 @@ task prepareAssets() {
|
||||
def moPath = "${assetsFolder}/locale/${poFile.parentFile.name}/LC_MESSAGES/"
|
||||
file(moPath).mkdirs()
|
||||
exec {
|
||||
commandLine 'msgfmt', '-o', "${moPath}/minetest.mo", poFile
|
||||
commandLine 'msgfmt', '-o', "${moPath}/luanti.mo", poFile
|
||||
}
|
||||
}
|
||||
|
||||
@ -103,7 +103,7 @@ task prepareAssets() {
|
||||
}
|
||||
|
||||
task zipAssets(dependsOn: prepareAssets, type: Zip) {
|
||||
archiveFileName = "Minetest.zip"
|
||||
archiveFileName = "assets.zip"
|
||||
from assetsFolder
|
||||
destinationDirectory = file("src/main/assets")
|
||||
}
|
||||
@ -113,7 +113,7 @@ preBuild.dependsOn zipAssets
|
||||
prepareAssets.dependsOn ':native:getDeps'
|
||||
|
||||
clean {
|
||||
delete new File("src/main/assets", "Minetest.zip")
|
||||
delete new File("src/main/assets", "assets.zip")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
@ -43,9 +43,6 @@
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.lib_name"
|
||||
android:value="minetest" />
|
||||
</activity>
|
||||
|
||||
<service
|
||||
|
@ -52,7 +52,7 @@ import java.util.Objects;
|
||||
public class GameActivity extends SDLActivity {
|
||||
@Override
|
||||
protected String getMainSharedObject() {
|
||||
return getContext().getApplicationInfo().nativeLibraryDir + "/libminetest.so";
|
||||
return getContext().getApplicationInfo().nativeLibraryDir + "/libluanti.so";
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -63,7 +63,7 @@ public class GameActivity extends SDLActivity {
|
||||
@Override
|
||||
protected String[] getLibraries() {
|
||||
return new String[] {
|
||||
"minetest"
|
||||
"luanti"
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -73,7 +73,7 @@ public class UnzipService extends IntentService {
|
||||
@Override
|
||||
protected void onHandleIntent(Intent intent) {
|
||||
Notification.Builder notificationBuilder = createNotification();
|
||||
final File zipFile = new File(getCacheDir(), "Minetest.zip");
|
||||
final File zipFile = new File(getCacheDir(), "assets.zip");
|
||||
try {
|
||||
setIsRunning(true);
|
||||
File userDataDirectory = Utils.getUserDataDirectory(this);
|
||||
|
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="label">Minetest</string>
|
||||
<string name="label">Luanti</string>
|
||||
<string name="loading">Loading…</string>
|
||||
<string name="notification_channel_name">General notification</string>
|
||||
<string name="notification_channel_description">Notifications from Minetest</string>
|
||||
<string name="unzip_notification_title">Loading Minetest</string>
|
||||
<string name="notification_channel_description">Notifications from Luanti</string>
|
||||
<string name="unzip_notification_title">Loading Luanti</string>
|
||||
<string name="unzip_notification_description">Less than 1 minute…</string>
|
||||
<string name="ime_dialog_done">Done</string>
|
||||
<string name="no_web_browser">No web browser found</string>
|
||||
|
@ -1,2 +1,2 @@
|
||||
rootProject.name = "Minetest"
|
||||
rootProject.name = "Luanti"
|
||||
include ':app', ':native'
|
||||
|
@ -18,7 +18,7 @@
|
||||
if not core.get_http_api then
|
||||
function create_contentdb_dlg()
|
||||
return messagebox("contentdb",
|
||||
fgettext("ContentDB is not available when Minetest was compiled without cURL"))
|
||||
fgettext("ContentDB is not available when Luanti was compiled without cURL"))
|
||||
end
|
||||
return
|
||||
end
|
||||
|
@ -64,7 +64,7 @@
|
||||
"superfloh247"
|
||||
],
|
||||
"previous_contributors": [
|
||||
"Ælla Chiana Moskopp (erle) <erle@dieweltistgarnichtso.net> [Minetest logo]",
|
||||
"Ælla Chiana Moskopp (erle) <erle@dieweltistgarnichtso.net> [Logo]",
|
||||
"red-001 <red-001@outlook.ie>",
|
||||
"Giuseppe Bilotta",
|
||||
"HybridDog",
|
||||
|
@ -78,7 +78,7 @@ return {
|
||||
"style[label_button;border=false]" ..
|
||||
"button[0.1,3.4;5.3,0.5;label_button;" ..
|
||||
core.formspec_escape(version.project .. " " .. version.string) .. "]" ..
|
||||
"button_url[1.5,4.1;2.5,0.8;homepage;minetest.net;https://www.minetest.net/]" ..
|
||||
"button_url[1.5,4.1;2.5,0.8;homepage;luanti.org;https://www.luanti.org/]" ..
|
||||
"hypertext[5.5,0.25;9.75,6.6;credits;" .. minetest.formspec_escape(hypertext) .. "]"
|
||||
|
||||
-- Render information
|
||||
|
@ -166,8 +166,8 @@ local function get_formspec(tabview, name, tabdata)
|
||||
local H = tabview.height
|
||||
|
||||
local hypertext = "<global valign=middle halign=center size=18>" ..
|
||||
fgettext_ne("Minetest is a game-creation platform that allows you to play many different games.") .. "\n" ..
|
||||
fgettext_ne("Minetest doesn't come with a game by default.") .. " " ..
|
||||
fgettext_ne("Luanti is a game-creation platform that allows you to play many different games.") .. "\n" ..
|
||||
fgettext_ne("Luanti doesn't come with a game by default.") .. " " ..
|
||||
fgettext_ne("You need to install a game before you can create a world.")
|
||||
|
||||
local button_y = H * 2/3 - 0.6
|
||||
|
@ -41,7 +41,7 @@ if(GETTEXTLIB_FOUND)
|
||||
endif()
|
||||
set(GETTEXT_MO_DEST_PATH ${LOCALEDIR}/<locale>/LC_MESSAGES)
|
||||
file(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
|
||||
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
|
||||
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES ${PROJECT_NAME}.pot)
|
||||
list(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES timestamp)
|
||||
macro(SET_MO_PATHS _buildvar _destvar _locale)
|
||||
string(REPLACE "<locale>" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH})
|
||||
|
@ -1,26 +1,21 @@
|
||||
.TH minetest 6 "2 February 2019" "" ""
|
||||
.TH luanti 6 "2 February 2019" "" ""
|
||||
|
||||
.SH NAME
|
||||
minetest, minetestserver \- Multiplayer infinite-world block sandbox
|
||||
luanti, luantiserver \- voxel game engine
|
||||
|
||||
.SH SYNOPSIS
|
||||
.B minetest
|
||||
.B luanti
|
||||
[\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR]
|
||||
[\fBCOMMON OPTIONS\fR]
|
||||
[\fBWORLD PATH\fR]
|
||||
|
||||
.B minetestserver
|
||||
.B luantiserver
|
||||
[\fBSERVER OPTIONS\fR]
|
||||
[\fBCOMMON OPTIONS\fR]
|
||||
[\fBWORLD PATH\fR]
|
||||
|
||||
.SH DESCRIPTION
|
||||
.B Minetest is one of the first InfiniMiner/Minecraft(/whatever) inspired games
|
||||
(started October 2010), with a goal of taking the survival multiplayer gameplay
|
||||
in a slightly different direction.
|
||||
.PP
|
||||
The main design philosophy is to keep it technically simple, stable and
|
||||
portable. It will be kept lightweight enough to run on fairly old hardware.
|
||||
.B Luanti (formerly Minetest) is a voxel game engine with easy modding and game creation.
|
||||
|
||||
.SH COMMON OPTIONS
|
||||
.TP
|
||||
@ -126,7 +121,7 @@ Colon delimited list of directories to search for games.
|
||||
Colon delimited list of directories to search for mods.
|
||||
.TP
|
||||
.B MINETEST_USER_PATH
|
||||
Path to Minetest user data directory.
|
||||
Path to Luanti user data directory.
|
||||
|
||||
.SH BUGS
|
||||
Please report all bugs at https://github.com/minetest/minetest/issues.
|
2
doc/luantiserver.6
Normal file
@ -0,0 +1,2 @@
|
||||
.so man6/luanti.6
|
||||
|
@ -1,2 +0,0 @@
|
||||
.so man6/minetest.6
|
||||
|
@ -1 +1 @@
|
||||
../../../../misc/minetest-icon.ico
|
||||
../../../../misc/luanti-icon.ico
|
@ -286,10 +286,10 @@ void CIrrDeviceLinux::setupTopLevelXorgWindow()
|
||||
os::Printer::log("Configuring X11-specific top level window properties", ELL_DEBUG);
|
||||
|
||||
// Set application name and class hints. For now name and class are the same.
|
||||
// Note: SDL uses the executable name here (i.e. "minetest").
|
||||
// Note: SDL uses the executable name here (i.e. "luanti").
|
||||
XClassHint *classhint = XAllocClassHint();
|
||||
classhint->res_name = const_cast<char *>("Minetest");
|
||||
classhint->res_class = const_cast<char *>("Minetest");
|
||||
classhint->res_name = const_cast<char *>("Luanti");
|
||||
classhint->res_class = const_cast<char *>("Luanti");
|
||||
|
||||
XSetClassHint(XDisplay, XWindow, classhint);
|
||||
XFree(classhint);
|
||||
|
@ -341,7 +341,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters ¶m) :
|
||||
SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
|
||||
|
||||
#if defined(SDL_HINT_APP_NAME)
|
||||
SDL_SetHint(SDL_HINT_APP_NAME, "Minetest");
|
||||
SDL_SetHint(SDL_HINT_APP_NAME, "Luanti");
|
||||
#endif
|
||||
|
||||
// Set IME hints
|
||||
|
@ -219,7 +219,7 @@ if(USE_SDL2)
|
||||
if(NOT ANDROID)
|
||||
find_package(SDL2 REQUIRED)
|
||||
else()
|
||||
# provided by MinetestAndroidLibs.cmake
|
||||
# provided by AndroidLibs.cmake
|
||||
endif()
|
||||
message(STATUS "Found SDL2: ${SDL2_LIBRARIES}")
|
||||
|
||||
|
@ -4,10 +4,10 @@ AppDir:
|
||||
path: AppDir
|
||||
app_info:
|
||||
id: net.minetest.minetest
|
||||
name: Minetest
|
||||
icon: minetest
|
||||
name: Luanti
|
||||
icon: luanti
|
||||
version: !ENV ${VERSION}
|
||||
exec: usr/bin/minetest
|
||||
exec: usr/bin/luanti
|
||||
exec_args: $@
|
||||
files:
|
||||
include: []
|
||||
@ -54,7 +54,7 @@ script: |
|
||||
cmake --install appimage-build
|
||||
|
||||
# Is a backup icon location in case
|
||||
mkdir -p AppDir/usr/share/minetest/misc
|
||||
cp AppDir/usr/share/icons/hicolor/128x128/apps/minetest.png AppDir/usr/share/minetest/misc/minetest-xorg-icon-128.png
|
||||
mkdir -p AppDir/usr/share/luanti/misc
|
||||
cp AppDir/usr/share/icons/hicolor/128x128/apps/luanti.png AppDir/usr/share/luanti/misc/luanti-xorg-icon-128.png
|
||||
# Validation issues
|
||||
sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop
|
||||
|
@ -5,15 +5,15 @@
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>minetest</string>
|
||||
<string>luanti</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>minetest-icon.icns</string>
|
||||
<string>luanti-icon.icns</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Minetest</string>
|
||||
<string>Luanti</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Minetest</string>
|
||||
<string>Luanti</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>net.minetest.minetest</string>
|
||||
<string>org.luanti.luanti</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 587 B |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity type="win32" name="minetest" version="0.0.0.0" />
|
||||
<assemblyIdentity type="win32" name="luanti" version="0.0.0.0" />
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 8.1 KiB |
@ -1,11 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=Minetest
|
||||
GenericName=Minetest
|
||||
Name=Luanti
|
||||
GenericName=Luanti
|
||||
Comment=Block-based multiplayer game platform
|
||||
Comment[de]=Blockbasierte Mehrspieler-Spieleplattform
|
||||
Comment[fr]=Plate-forme de jeu multijoueurs à base de blocs
|
||||
Exec=minetest
|
||||
Icon=minetest
|
||||
Exec=luanti
|
||||
Icon=luanti
|
||||
Terminal=false
|
||||
PrefersNonDefaultGPU=true
|
||||
Type=Application
|
||||
|
@ -2,7 +2,7 @@
|
||||
<component type="desktop-application">
|
||||
<id>net.minetest.minetest</id>
|
||||
|
||||
<name>Minetest</name>
|
||||
<name>Luanti</name>
|
||||
<summary>Block-based multiplayer game platform</summary>
|
||||
<summary xml:lang="de">Blockbasierte Mehrspieler-Spieleplattform</summary>
|
||||
<summary xml:lang="fr">Plate-forme de jeu multijoueurs à base de blocs</summary>
|
||||
@ -11,7 +11,7 @@
|
||||
<project_license>LGPL-2.1+ AND CC-BY-SA-3.0 AND MIT AND Apache-2.0</project_license>
|
||||
|
||||
<developer id="net.minetest">
|
||||
<name>Minetest Team</name>
|
||||
<name>Luanti Team</name>
|
||||
</developer>
|
||||
|
||||
<supports>
|
||||
@ -34,13 +34,13 @@
|
||||
|
||||
<description>
|
||||
<p>
|
||||
Minetest is a block-based sandbox game platform.
|
||||
Luanti is a block-based sandbox game platform.
|
||||
</p>
|
||||
<p xml:lang="de">
|
||||
Minetest ist eine blockbasierte Sandbox-Spielplattform.
|
||||
Luanti ist eine blockbasierte Sandbox-Spielplattform.
|
||||
</p>
|
||||
<p xml:lang="fr">
|
||||
Minetest est une plateforme de jeu de type bac à sable à base de blocs.
|
||||
Luanti est une plateforme de jeu de type bac à sable à base de blocs.
|
||||
</p>
|
||||
<p>
|
||||
Players can create and destroy various types of blocks in a
|
||||
@ -58,25 +58,25 @@
|
||||
formes possibles, sur des serveurs multijoueurs ou en solo.
|
||||
</p>
|
||||
<p>
|
||||
Minetest is designed to be simple, stable, and portable.
|
||||
Luanti is designed to be simple, stable, and portable.
|
||||
It is lightweight enough to run on fairly old hardware.
|
||||
</p>
|
||||
<p xml:lang="de">
|
||||
Minetest wurde entworfen, um einfach, stabil und portabel zu sein.
|
||||
Luanti wurde entworfen, um einfach, stabil und portabel zu sein.
|
||||
Es ist leichtgewichtig genug, um auf relativ alter Hardware zu laufen.
|
||||
</p>
|
||||
<p xml:lang="fr">
|
||||
Minetest est conçu pour être simple, stable et portable.
|
||||
Luanti est conçu pour être simple, stable et portable.
|
||||
Il est suffisamment léger pour fonctionner sur du matériel relativement ancien.
|
||||
</p>
|
||||
<p>
|
||||
Minetest has many features, including:
|
||||
Luanti has many features, including:
|
||||
</p>
|
||||
<p xml:lang="de">
|
||||
Minetest besitzt viele Features, unter anderem:
|
||||
Luanti besitzt viele Features, unter anderem:
|
||||
</p>
|
||||
<p xml:lang="fr">
|
||||
Minetest offre de nombreuses fonctionnalités, notamment :
|
||||
Luanti offre de nombreuses fonctionnalités, notamment :
|
||||
</p>
|
||||
<ul>
|
||||
<li>Ability to walk around, dig, and build in a near-infinite voxel world</li>
|
||||
@ -113,7 +113,7 @@
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
|
||||
<icon type="stock">minetest</icon>
|
||||
<icon type="stock">luanti</icon>
|
||||
|
||||
<categories>
|
||||
<category>Game</category>
|
||||
@ -141,10 +141,10 @@
|
||||
<url type="contribute">https://www.minetest.net/get-involved</url>
|
||||
|
||||
<provides>
|
||||
<binary>minetest</binary>
|
||||
<binary>luanti</binary>
|
||||
</provides>
|
||||
|
||||
<translation type="gettext">minetest</translation>
|
||||
<translation type="gettext">luanti</translation>
|
||||
|
||||
<update_contact>celeron55@gmail.com</update_contact>
|
||||
|
||||
|
@ -16,11 +16,11 @@
|
||||
#endif
|
||||
|
||||
#ifdef __MINGW32__
|
||||
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "minetest.exe.manifest"
|
||||
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "luanti.exe.manifest"
|
||||
#endif
|
||||
|
||||
LANGUAGE 0, SUBLANG_NEUTRAL
|
||||
130 ICON "minetest-icon.ico"
|
||||
130 ICON "luanti-icon.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@ -49,9 +49,8 @@ BEGIN
|
||||
VALUE "FileDescription", PROJECT_NAME_C " engine"
|
||||
VALUE "FileVersion", VERSION_STRING
|
||||
VALUE "InternalName", PROJECT_NAME
|
||||
VALUE "LegalCopyright", "(c) 2011-2015 celeron55"
|
||||
VALUE "LegalTrademarks", """Minetest"" is the property of the Minetest community, don't use it without permission!"
|
||||
VALUE "OriginalFilename", "minetest.exe"
|
||||
VALUE "LegalCopyright", "(c) 2010-2024 Perttu Ahola (celeron55) and contributors"
|
||||
VALUE "OriginalFilename", PROJECT_NAME ".exe"
|
||||
VALUE "PrivateBuild", VERSION_EXTRA
|
||||
VALUE "ProductName", PROJECT_NAME_C
|
||||
VALUE "ProductVersion", PRODUCT_VERSION_STRING
|
||||
|