minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Version 2.0.6-release but not yet!

Browse Source
This commit is contained in:
Maksym H 2024-01-12 00:40:12 +01:00 committed by mckaygerhard
parent 9a733f881b
commit 59b2c7be48
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android/build.gradle
View File

@ -2,9 +2,9 @@
project.ext.set("versionMajor", 2) // Version Major project.ext.set("versionMajor", 2) // Version Major
project.ext.set("versionMinor", 0) // Version Minor project.ext.set("versionMinor", 0) // Version Minor
project.ext.set("versionPatch", 5) // Version Patch project.ext.set("versionPatch", 6) // Version Patch
project.ext.set("versionExtra", "") // Version Extra project.ext.set("versionExtra", "") // Version Extra
project.ext.set("versionCode", 100) // Android Version Code project.ext.set("versionCode", 200) // Android Version Code
project.ext.set("developmentBuild", 0) // Whether it is a development build, or a release project.ext.set("developmentBuild", 0) // Whether it is a development build, or a release
// NOTE: +3 after each release! // NOTE: +3 after each release!
// +1 for ARM, +1 for ARM64 and +1 for x86_64 APK's, because // +1 for ARM, +1 for ARM64 and +1 for x86_64 APK's, because

12
Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -2196,7 +2196,7 @@
"ENABLE_UPDATE_CHECKER=1", "ENABLE_UPDATE_CHECKER=1",
"VERSION_MAJOR=2", "VERSION_MAJOR=2",
"VERSION_MINOR=0", "VERSION_MINOR=0",
"VERSION_PATCH=5", "VERSION_PATCH=6",
"VERSION_EXTRA=\"\"", "VERSION_EXTRA=\"\"",
"DEVELOPMENT_BUILD=1", "DEVELOPMENT_BUILD=1",
); );
@ -2221,10 +2221,10 @@
); );
INFOPLIST_FILE = MultiCraft/Info.plist; INFOPLIST_FILE = MultiCraft/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games";
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Minetest.org. All rights reserved."; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Minetest.org. All rights reserved.";
INFOPLIST_KEY_NSPrincipalClass = NSApplication; INFOPLIST_KEY_NSPrincipalClass = NSApplication;
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 2.0.5; MARKETING_VERSION = 2.0.6;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/freetype", "-L${SRCROOT}/../deps/freetype",
@ -2269,7 +2269,7 @@
"ENABLE_UPDATE_CHECKER=1", "ENABLE_UPDATE_CHECKER=1",
"VERSION_MAJOR=2", "VERSION_MAJOR=2",
"VERSION_MINOR=0", "VERSION_MINOR=0",
"VERSION_PATCH=5", "VERSION_PATCH=6",
"VERSION_EXTRA=\"\"", "VERSION_EXTRA=\"\"",
"DEVELOPMENT_BUILD=0", "DEVELOPMENT_BUILD=0",
); );
@ -2294,10 +2294,10 @@
); );
INFOPLIST_FILE = MultiCraft/Info.plist; INFOPLIST_FILE = MultiCraft/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.adventure-games";
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 MultiCraft Studio OÜ. All rights reserved."; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 minetest.org All rights reserved.";
INFOPLIST_KEY_NSPrincipalClass = NSApplication; INFOPLIST_KEY_NSPrincipalClass = NSApplication;
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 2.0.5; MARKETING_VERSION = 2.0.6;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/freetype", "-L${SRCROOT}/../deps/freetype",

2
CMakeLists.txt
View File

@ -48,7 +48,7 @@ endif()
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
set(VERSION_MAJOR 2) set(VERSION_MAJOR 2)
set(VERSION_MINOR 0) set(VERSION_MINOR 0)
set(VERSION_PATCH 5) set(VERSION_PATCH 6)
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Change to false for releases # Change to false for releases

2
builtin/mainmenu/dlg_version_info.lua
View File

@ -151,7 +151,7 @@ local function on_version_info_received(update_info)
-- Show version info dialog (once) -- Show version info dialog (once)
maintab:hide() maintab:hide()
local url = update_info.url or "https://multicraft.world/downloads" local url = "" -- update_info.url or ""
if not url:find("://", 1, true) then if not url:find("://", 1, true) then
url = "https://" .. url url = "https://" .. url
end end

16
builtin/mainmenu/tab_credits.lua
View File

@ -17,6 +17,14 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local minenux_developers = {
"PICCORO Lenz McKAY <mckaygerhard@gmail.com>",
"Mckay Gerhard (supertodo) <mckayshirou@gmail.com>",
"OldCoder <me@minetest.org>",
"Poikilos Jake Gustafson <tertiary@expertmultimedia.com>",
"And also VenenuX collaborators..!"
}
local multicraft_developers = { local multicraft_developers = {
"Maksim Gamarnik (MoNTE48) <Maksym48@pm.me>", "Maksim Gamarnik (MoNTE48) <Maksym48@pm.me>",
"Bektur Mambetov (ubulem) <berkut87@gmail.com>", "Bektur Mambetov (ubulem) <berkut87@gmail.com>",
@ -122,7 +130,7 @@ return {
local fs = "image[-0.25,-0.3;2,2;" .. logofile .. "]" .. local fs = "image[-0.25,-0.3;2,2;" .. logofile .. "]" ..
"label[1.3,-0.25;" .. "label[1.3,-0.25;" ..
"MultiCraft Open Source, ver. " .. version.string .. "\n" .. "MultiCraft Open Source, ver. " .. version.string .. "\n" ..
"Copyright (C) 2014–" .. os.date("%Y") .. " MultiCraft Development Team\n" .. "Copyright (C) 2014–" .. os.date("%Y") .. " MINENUX\n" ..
"License: GNU LGPLv3.0+ and CC BY-SA 4.0\n" .. "License: GNU LGPLv3.0+ and CC BY-SA 4.0\n" ..
"Created and Powered by Minetest Engine, ver. 5.4.1]" .. "Created and Powered by Minetest Engine, ver. 5.4.1]" ..
@ -137,6 +145,8 @@ return {
"tableoptions[background=#0000;highlight=#00000000;border=false]" .. "tableoptions[background=#0000;highlight=#00000000;border=false]" ..
scrollbar_style("list_credits") .. scrollbar_style("list_credits") ..
"table[0,1.5;11.75,4.05;list_credits;" .. "table[0,1.5;11.75,4.05;list_credits;" ..
"#FFFF00," .. fgettext("Core Developers") .. " (MinenuX),," ..
buildCreditList(minenux_developers) .. ",,," ..
"#FFFF00," .. fgettext("Core Developers") .. " (MultiCraft),," .. "#FFFF00," .. fgettext("Core Developers") .. " (MultiCraft),," ..
buildCreditList(multicraft_developers) .. ",,," .. buildCreditList(multicraft_developers) .. ",,," ..
"#FFFF00," .. fgettext("Core Developers") .. " (Minetest Engine),," .. "#FFFF00," .. fgettext("Core Developers") .. " (Minetest Engine),," ..
@ -159,10 +169,10 @@ return {
end, end,
cbf_button_handler = function(this, fields, name, tabdata) cbf_button_handler = function(this, fields, name, tabdata)
if fields.homepage then if fields.homepage then
core.open_url("https://multicraft.world") core.open_url("https://minetest.org")
end end
if fields.privacy then if fields.privacy then
core.open_url("https://multicraft.world/privacy") core.open_url("https://mt.tijerazo.net")
end end
--[[if fields.userdata then --[[if fields.userdata then