diff --git a/CMakeLists.txt b/CMakeLists.txt index 0717b432..cd87189e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,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 15) -set(VERSION_PATCH 2) +set(VERSION_PATCH 6) set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") # Change to false for releases diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index 442bc866..42d79f66 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '30.0.3' - ndkVersion '22.0.7026061' + ndkVersion '22.1.7171670' defaultConfig { applicationId 'com.multicraft.game' minSdkVersion 16 //noinspection OldTargetApi targetSdkVersion 29 - versionCode 135 - versionName "1.15.1" + versionCode 150 + versionName "1.15.6" multiDexEnabled true } @@ -66,13 +66,14 @@ dependencies { implementation 'androidx.appcompat:appcompat-resources:1.2.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.preference:preference:1.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.20' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.12.12' //noinspection GradleDependency implementation 'commons-io:commons-io:2.5' implementation 'gun0912.ted:tedpermission-rx2:2.2.3' + //noinspection GradleDependency implementation 'net.lingala.zip4j:zip4j:2.6.4' /* Analytics libraries */ diff --git a/build/android/build.gradle b/build/android/build.gradle index bc053af4..60161838 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -3,10 +3,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.2.0' //noinspection GradleDynamicVersion /*classpath 'com.bugsnag:bugsnag-android-gradle-plugin:5.+'*/ classpath 'de.undercouch:gradle-download-task:4.1.1' @@ -18,7 +19,8 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } } } diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties index 4bea75d3..8ab187ef 100644 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ b/build/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 06 00:00:38 CET 2021 +#Sun May 09 00:39:14 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle index 6673e4af..4a343447 100644 --- a/build/android/native/build.gradle +++ b/build/android/native/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 29 buildToolsVersion '30.0.3' - ndkVersion '22.0.7026061' + ndkVersion '22.1.7171670' defaultConfig { minSdkVersion 16 //noinspection OldTargetApi diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index aa31d40e..f123e2fc 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -182,11 +182,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args) const wchar_t *text = wgettext("Main Menu"); device->setWindowCaption((utf8_to_wide(PROJECT_NAME_C) + L" " + utf8_to_wide(g_version_hash) + -#if defined(__MACH__) && defined(__APPLE__) - L"").c_str()); -#else L" [" + text + L"]").c_str()); -#endif delete[] text; try { // This is used for catching disconnects diff --git a/src/config.h b/src/config.h index b5ad11c7..87e7e11c 100644 --- a/src/config.h +++ b/src/config.h @@ -18,7 +18,7 @@ #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 #define VERSION_MINOR 15 - #define VERSION_PATCH 2 + #define VERSION_PATCH 6 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif diff --git a/textures/base/bg.png b/textures/base/bg.png index 55afbb6f..209d3019 100644 Binary files a/textures/base/bg.png and b/textures/base/bg.png differ diff --git a/textures/base/gui_hotbar.png b/textures/base/gui_hotbar.png index 92c6eeb3..ba0bdfe5 100644 Binary files a/textures/base/gui_hotbar.png and b/textures/base/gui_hotbar.png differ