MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 1.8.0-release

Browse Source
This commit is contained in:
MoNTE48 2020-02-06 18:11:32 +01:00
parent 49a18aa737
commit 05e98a4979
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -14,8 +14,8 @@ set(CMAKE_CXX_STANDARD 11)
# 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 1) set(VERSION_MAJOR 1)
set(VERSION_MINOR 7) set(VERSION_MINOR 8)
set(VERSION_PATCH 1) set(VERSION_PATCH 0)
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

4
build/android/app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId 'com.multicraft.game' applicationId 'com.multicraft.game'
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 29 targetSdkVersion 29
versionCode 35 versionCode 37
versionName "1.7.1" versionName "1.8.0"
/*multiDexEnabled true /*multiDexEnabled true
useLibrary 'org.apache.http.legacy'*/ useLibrary 'org.apache.http.legacy'*/
} }

2
build/android/build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.android.tools.build:gradle:3.5.3'
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion
/*classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+'*/ /*classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+'*/
classpath 'org.ajoberstar.grgit:grgit-gradle:4.0.0' classpath 'org.ajoberstar.grgit:grgit-gradle:4.0.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }

12
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -1680,7 +1680,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
@ -1706,7 +1706,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
@ -1732,7 +1732,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 80; CURRENT_PROJECT_VERSION = 82;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1768,7 +1768,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.7.1; MARKETING_VERSION = 1.8.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
@ -1800,7 +1800,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 80; CURRENT_PROJECT_VERSION = 82;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1837,7 +1837,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.7.1; MARKETING_VERSION = 1.8.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",

2
build/iOS/assets.sh
View File

@ -40,7 +40,7 @@ done
# remove unnecessary mods # remove unnecessary mods
MODS=$DEST/games/default/files MODS=$DEST/games/default/files
for mods in compatibility experience wieldview; do for mods in experience; do
find $DEST/games/default/files -type d -name $mods -print0 | xargs -0 -- rm -r find $DEST/games/default/files -type d -name $mods -print0 | xargs -0 -- rm -r
done done

4
src/config.h
View File

@ -17,8 +17,8 @@
#define PROJECT_NAME_C "MultiCraft" #define PROJECT_NAME_C "MultiCraft"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 7 #define VERSION_MINOR 8
#define VERSION_PATCH 1 #define VERSION_PATCH 0
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
#endif #endif