diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e7d9f14..4fa3bd73 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 11) -set(VERSION_PATCH 2) +set(VERSION_PATCH 3) 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 e1853b39..09de6063 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 92 - versionName "1.11.2" + versionCode 94 + versionName "1.11.3" multiDexEnabled true } diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 7112ff50..a3387050 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -709,17 +709,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F8E6C7C51DCA42F300F64426 /* QuartzCore.framework in Frameworks */, - F8E6C7C71DCA42FA00F64426 /* UIKit.framework in Frameworks */, - 84C32A3724AF7A4500445E92 /* Nantes in Frameworks */, - F8E6C7C91DCA430300F64426 /* OpenGLES.framework in Frameworks */, - F8E6C7CB1DCA430B00F64426 /* OpenAL.framework in Frameworks */, + 84C0FB1B24B35D9200606FAA /* Bugsnag in Frameworks */, F8E6C7CD1DCA431B00F64426 /* Foundation.framework in Frameworks */, F8E6C7D51DCA476800F64426 /* libIrrlicht.a in Frameworks */, F8E6C7D71DCA477600F64426 /* libfreetype.a in Frameworks */, 84FE40E224439C2F008E29DB /* libcurl.a in Frameworks */, - 84C0FB1B24B35D9200606FAA /* Bugsnag in Frameworks */, + 84C32A3724AF7A4500445E92 /* Nantes in Frameworks */, + F8E6C7CB1DCA430B00F64426 /* OpenAL.framework in Frameworks */, + F8E6C7C91DCA430300F64426 /* OpenGLES.framework in Frameworks */, 8E0FFE3234B35EC9603EC82A /* Pods_MultiCraft.framework in Frameworks */, + F8E6C7C51DCA42F300F64426 /* QuartzCore.framework in Frameworks */, + F8E6C7C71DCA42FA00F64426 /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1408,7 +1408,7 @@ }; }; buildConfigurationList = F8E6C4D41DCA3B7900F64426 /* Build configuration list for PBXProject "MultiCraft" */; - compatibilityVersion = "Xcode 11.4"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -1808,7 +1808,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 98; + CURRENT_PROJECT_VERSION = 99; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1839,7 +1839,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.11.2; + MARKETING_VERSION = 1.11.3; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -1873,7 +1873,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 98; + CURRENT_PROJECT_VERSION = 99; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1905,7 +1905,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.11.2; + MARKETING_VERSION = 1.11.3; OTHER_CFLAGS = ( "$(inherited)", "-isystem", diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist index 07d735d2..e970c42a 100755 --- a/build/iOS/MultiCraft/MultiCraft/Info.plist +++ b/build/iOS/MultiCraft/MultiCraft/Info.plist @@ -8,8 +8,6 @@ MultiCraft CFBundleExecutable $(EXECUTABLE_NAME) - CFBundleGetInfoString - CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -37,6 +35,203 @@ MultiCraft needs your location to provide personalised advertising experience tailored to you NSLocationWhenInUseUsageDescription MultiCraft needs your location to provide personalised advertising experience tailored to you + NSUserTrackingUsageDescription + This identifier will be used to deliver personalized ads to you. + SKAdNetworkItems + + + SKAdNetworkIdentifier + 4PFYVQ9L8R.skadnetwork + + + SKAdNetworkIdentifier + YCLNXRL5PM.skadnetwork + + + SKAdNetworkIdentifier + V72QYCH5UU.skadnetwork + + + SKAdNetworkIdentifier + TL55SBB4FM.skadnetwork + + + SKAdNetworkIdentifier + T38B2KH725.skadnetwork + + + SKAdNetworkIdentifier + PRCB7NJMU6.skadnetwork + + + SKAdNetworkIdentifier + PPXM28T8AP.skadnetwork + + + SKAdNetworkIdentifier + MLMMFZH3R3.skadnetwork + + + SKAdNetworkIdentifier + KLF5C3L5U5.skadnetwork + + + SKAdNetworkIdentifier + HS6BDUKANM.skadnetwork + + + SKAdNetworkIdentifier + C6K4G5QG8M.skadnetwork + + + SKAdNetworkIdentifier + 9T245VHMPL.skadnetwork + + + SKAdNetworkIdentifier + 9RD848Q2BZ.skadnetwork + + + SKAdNetworkIdentifier + 8S468MFL3Y.skadnetwork + + + SKAdNetworkIdentifier + 7UG5ZH24HU.skadnetwork + + + SKAdNetworkIdentifier + 4FZDC2EVR5.skadnetwork + + + SKAdNetworkIdentifier + 4468KM3ULZ.skadnetwork + + + SKAdNetworkIdentifier + 3RD42EKR43.skadnetwork + + + SKAdNetworkIdentifier + 2U9PT9HC89.skadnetwork + + + SKAdNetworkIdentifier + LUDVB6Z3BS.skadnetwork + + + SKAdNetworkIdentifier + WG4VFF78ZM.skadnetwork + + + SKAdNetworkIdentifier + 737Z793B9F.skadnetwork + + + SKAdNetworkIdentifier + YDX93A7ASS.skadnetwork + + + SKAdNetworkIdentifier + 44JX6755AQ.skadnetwork + + + SKAdNetworkIdentifier + W9Q455WK68.skadnetwork + + + SKAdNetworkIdentifier + GLQZH8VGBY.skadnetwork + + + SKAdNetworkIdentifier + AV6W8KGT66.skadnetwork + + + SKAdNetworkIdentifier + CJ5566H2GA.skadnetwork + + + SKAdNetworkIdentifier + F38H382JLK.skadnetwork + + + SKAdNetworkIdentifier + CSTR6SUWN9.skadnetwork + + + SKAdNetworkIdentifier + SU67R6K2V3.skadnetwork + + + SKAdNetworkIdentifier + KBD757YWX3.skadnetwork + + + SKAdNetworkIdentifier + 22MMUN2RN5.skadnetwork + + + SKAdNetworkIdentifier + V79KVWWJ4G.skadnetwork + + + SKAdNetworkIdentifier + BVPN9UFA9B.skadnetwork + + + SKAdNetworkIdentifier + 238DA6JT44.skadnetwork + + + SKAdNetworkIdentifier + 3SH42Y64Q3.skadnetwork + + + SKAdNetworkIdentifier + 4DZT52R2T5.skadnetwork + + + SKAdNetworkIdentifier + WZMMZ9FP6W.skadnetwork + + + SKAdNetworkIdentifier + F73KDQ92P3.skadnetwork + + + SKAdNetworkIdentifier + 424M5254LK.skadnetwork + + + SKAdNetworkIdentifier + 44N7HLLDY6.skadnetwork + + + SKAdNetworkIdentifier + 5A6FLPKH64.skadnetwork + + + SKAdNetworkIdentifier + 488R3Q3DTQ.skadnetwork + + + SKAdNetworkIdentifier + ZMVFPC5AQ8.skadnetwork + + + SKAdNetworkIdentifier + M8DBW4SV7C.skadnetwork + + + SKAdNetworkIdentifier + LR83YXWKA7.skadnetwork + + + SKAdNetworkIdentifier + 5LM9LJ6JB7.skadnetwork + + UIBackgroundModes fetch diff --git a/build/iOS/Podfile b/build/iOS/Podfile index b0ab64c6..3443a37d 100755 --- a/build/iOS/Podfile +++ b/build/iOS/Podfile @@ -5,12 +5,12 @@ use_frameworks! def appodeal source 'https://github.com/appodeal/CocoaPods.git' - pod 'APDAdColonyAdapter', '2.7.3.1-Beta' - pod 'APDAppLovinAdapter', '2.7.3.1-Beta' - pod 'APDAppodealAdExchangeAdapter', '2.7.3.1-Beta' - pod 'APDMintegralAdapter', '2.7.3.1-Beta' - pod 'APDTapjoyAdapter', '2.7.3.1-Beta' - pod 'APDUnityAdapter', '2.7.3.1-Beta' + pod 'APDAdColonyAdapter', '2.7.4.1-Beta' + pod 'APDAppLovinAdapter', '2.7.4.1-Beta' + pod 'APDAppodealAdExchangeAdapter', '2.7.4.1-Beta' + pod 'APDMintegralAdapter', '2.7.4.1-Beta' + pod 'APDTapjoyAdapter', '2.7.4.1-Beta' + pod 'APDUnityAdapter', '2.7.4.1-Beta' end target 'MultiCraft' do diff --git a/src/config.h b/src/config.h index 24d40626..44f8f531 100644 --- a/src/config.h +++ b/src/config.h @@ -18,7 +18,7 @@ #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 #define VERSION_MINOR 11 - #define VERSION_PATCH 2 + #define VERSION_PATCH 3 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif