diff --git a/CMakeLists.txt b/CMakeLists.txt index d71f3193..c939801c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 11) # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing set(VERSION_MAJOR 1) -set(VERSION_MINOR 12) +set(VERSION_MINOR 13) set(VERSION_PATCH 0) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index 5c1b8815..b1660997 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -8,8 +8,8 @@ android { minSdkVersion 16 //noinspection OldTargetApi targetSdkVersion 29 - versionCode 100 - versionName "1.12.0" + versionCode 108 + versionName "1.13.0" multiDexEnabled true } diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index a439b166..6df58bb2 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1796,7 +1796,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 101; + CURRENT_PROJECT_VERSION = 105; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1827,7 +1827,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.12.1; + MARKETING_VERSION = 1.13.0; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1862,7 +1862,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 101; + CURRENT_PROJECT_VERSION = 105; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1894,7 +1894,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.12.1; + MARKETING_VERSION = 1.13.0; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/build/iOS/deps/gettext.sh b/build/iOS/deps/gettext.sh index dfe27526..92bd5782 100755 --- a/build/iOS/deps/gettext.sh +++ b/build/iOS/deps/gettext.sh @@ -12,7 +12,7 @@ fi cd gettext-src/gettext-runtime -CFLAGS=$IOS_FLAGS \ +CFLAGS="$IOS_FLAGS -Dlocale_charset=intl_locale_charset" \ PKG_CONFIG=/bin/false \ ./configure --host=arm-apple-darwin --prefix=/ \ --disable-shared --enable-static diff --git a/build/macOS/deps/freetype.sh b/build/macOS/deps/freetype.sh index 3ef88f0f..27accdc2 100755 --- a/build/macOS/deps/freetype.sh +++ b/build/macOS/deps/freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -FREETYPE_VERSION=2.10.3 +FREETYPE_VERSION=2.10.4 if [ ! -d freetype-src ]; then wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz diff --git a/src/config.h b/src/config.h index feafb38f..e487e5ef 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,7 @@ #define PROJECT_NAME_C "MultiCraft" #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 - #define VERSION_MINOR 12 + #define VERSION_MINOR 13 #define VERSION_PATCH 0 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif