From 59b2c7be48fdf45680c591eeed53d88d1833c888 Mon Sep 17 00:00:00 2001 From: Maksym H Date: Fri, 12 Jan 2024 00:40:12 +0100 Subject: [PATCH] Version 2.0.6-release but not yet! --- Android/build.gradle | 4 ++-- .../MultiCraft.xcodeproj/project.pbxproj | 12 ++++++------ CMakeLists.txt | 2 +- builtin/mainmenu/dlg_version_info.lua | 2 +- builtin/mainmenu/tab_credits.lua | 16 +++++++++++++--- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Android/build.gradle b/Android/build.gradle index c6c8afd24..0d6beab72 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -2,9 +2,9 @@ project.ext.set("versionMajor", 2) // Version Major 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("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 // NOTE: +3 after each release! // +1 for ARM, +1 for ARM64 and +1 for x86_64 APK's, because diff --git a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 637c910b1..fb6374511 100644 --- a/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/Apple/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -2196,7 +2196,7 @@ "ENABLE_UPDATE_CHECKER=1", "VERSION_MAJOR=2", "VERSION_MINOR=0", - "VERSION_PATCH=5", + "VERSION_PATCH=6", "VERSION_EXTRA=\"\"", "DEVELOPMENT_BUILD=1", ); @@ -2221,10 +2221,10 @@ ); INFOPLIST_FILE = MultiCraft/Info.plist; 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; MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 2.0.5; + MARKETING_VERSION = 2.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/freetype", @@ -2269,7 +2269,7 @@ "ENABLE_UPDATE_CHECKER=1", "VERSION_MAJOR=2", "VERSION_MINOR=0", - "VERSION_PATCH=5", + "VERSION_PATCH=6", "VERSION_EXTRA=\"\"", "DEVELOPMENT_BUILD=0", ); @@ -2294,10 +2294,10 @@ ); INFOPLIST_FILE = MultiCraft/Info.plist; 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; MACOSX_DEPLOYMENT_TARGET = 10.11; - MARKETING_VERSION = 2.0.5; + MARKETING_VERSION = 2.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-L${SRCROOT}/../deps/freetype", diff --git a/CMakeLists.txt b/CMakeLists.txt index 71fb21da8..2284fa30f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ endif() # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing set(VERSION_MAJOR 2) set(VERSION_MINOR 0) -set(VERSION_PATCH 5) +set(VERSION_PATCH 6) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") # Change to false for releases diff --git a/builtin/mainmenu/dlg_version_info.lua b/builtin/mainmenu/dlg_version_info.lua index ff9a1cf18..64326e4a7 100644 --- a/builtin/mainmenu/dlg_version_info.lua +++ b/builtin/mainmenu/dlg_version_info.lua @@ -151,7 +151,7 @@ local function on_version_info_received(update_info) -- Show version info dialog (once) 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 url = "https://" .. url end diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 378adcdd0..2c4c7fbd5 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -17,6 +17,14 @@ -------------------------------------------------------------------------------- +local minenux_developers = { + "PICCORO Lenz McKAY ", + "Mckay Gerhard (supertodo) ", + "OldCoder ", + "Poikilos Jake Gustafson ", + "And also VenenuX collaborators..!" +} + local multicraft_developers = { "Maksim Gamarnik (MoNTE48) ", "Bektur Mambetov (ubulem) ", @@ -122,7 +130,7 @@ return { local fs = "image[-0.25,-0.3;2,2;" .. logofile .. "]" .. "label[1.3,-0.25;" .. "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" .. "Created and Powered by Minetest Engine, ver. 5.4.1]" .. @@ -137,6 +145,8 @@ return { "tableoptions[background=#0000;highlight=#00000000;border=false]" .. scrollbar_style("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),," .. buildCreditList(multicraft_developers) .. ",,," .. "#FFFF00," .. fgettext("Core Developers") .. " (Minetest Engine),," .. @@ -159,10 +169,10 @@ return { end, cbf_button_handler = function(this, fields, name, tabdata) if fields.homepage then - core.open_url("https://multicraft.world") + core.open_url("https://minetest.org") end if fields.privacy then - core.open_url("https://multicraft.world/privacy") + core.open_url("https://mt.tijerazo.net") end --[[if fields.userdata then