Merge branch 'opa334:2.x' into main

m1337v · Jul 31, 2024 · 98722db · 98722db
2 parents 448656f + 316ec4e
commit 98722db
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Application/Dopamine.xcodeproj/project.pbxproj b/Application/Dopamine.xcodeproj/project.pbxproj
@@ -2243,7 +2243,7 @@
 					"$(PROJECT_DIR)/Dopamine/Dependencies",
 					"$(PROJECT_DIR)/Dopamine/Resources",
 				);
-				MARKETING_VERSION = 2.2;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.opa334.Dopamine;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -2281,7 +2281,7 @@
 					"$(PROJECT_DIR)/Dopamine/Dependencies",
 					"$(PROJECT_DIR)/Dopamine/Resources",
 				);
-				MARKETING_VERSION = 2.2;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.opa334.Dopamine;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Application/Dopamine/UI/Settings/DOSettingsController.m b/Application/Dopamine/UI/Settings/DOSettingsController.m
@@ -134,9 +134,9 @@ - (NSArray *)jetsamOptionTitles
     return @[
         @"1x",
         @"1.5x",
-        [NSString stringWithFormat:@"2x (%@)", DOLocalizedString(@"Recommended")],
+        @"2x",
         @"2.5x",
-        @"3x",
+        [NSString stringWithFormat:@"3x (%@)", DOLocalizedString(@"Recommended")],
         @"3.5x",
         @"4x",
     ];
@@ -243,7 +243,7 @@ - (id)specifiers
             PSSpecifier *jetsamSpecifier = [PSSpecifier preferenceSpecifierNamed:DOLocalizedString(@"Settings_Jetsam_Multiplier") target:self set:@selector(setJetsamMultiplier:specifier:) get:@selector(readJetsamMultiplier:) detail:nil cell:PSLinkListCell edit:nil];
             [jetsamSpecifier setProperty:@YES forKey:@"enabled"];
             [jetsamSpecifier setProperty:@"jetsamMultiplier" forKey:@"key"];
-            [jetsamSpecifier setProperty:@4 forKey:@"default"];
+            [jetsamSpecifier setProperty:@6 forKey:@"default"];
             jetsamSpecifier.detailControllerClass = [DOPSJetsamListItemsController class];
             [jetsamSpecifier setProperty:@"jetsamOptionNumbers" forKey:@"valuesDataSource"];
             [jetsamSpecifier setProperty:@"jetsamOptionTitles" forKey:@"titlesDataSource"];
@@ -431,7 +431,7 @@ - (id)readJetsamMultiplier:(PSSpecifier *)specifier
     DOEnvironmentManager *envManager = [DOEnvironmentManager sharedManager];
     if (envManager.isJailbroken) {
         double v = jbclient_jbsettings_get_double("jetsamMultiplier");
-        return @((v < 1 || isnan(v)) ? 4 : ceil(v * 2));
+        return @((v < 1 || isnan(v)) ? 6 : ceil(v * 2));
     }
     return [self readPreferenceValue:specifier];
 }

diff --git a/BaseBin/_external/basebin/.version b/BaseBin/_external/basebin/.version
@@ -1 +1 @@
-2.2
+2.2.1
diff --git a/BaseBin/systemhook/src/common.c b/BaseBin/systemhook/src/common.c
@@ -219,7 +219,7 @@ int spawn_hook_common(pid_t *restrict pid, const char *restrict path,
 	if (shouldInsertJBEnv) {
 		uint8_t *attrStruct = (uint8_t *)attr;
 		if (attrStruct) {
-			if (jetsamMultiplier == 0 || isnan(jetsamMultiplier)) jetsamMultiplier = 2; // default value (2x)
+			if (jetsamMultiplier == 0 || isnan(jetsamMultiplier)) jetsamMultiplier = 3; // default value (3x)
 			if (jetsamMultiplier > 1) {
 				int memlimit_active = *(int*)(attrStruct + POSIX_SPAWNATTR_OFF_MEMLIMIT_ACTIVE);
 				if (memlimit_active != -1) {

diff --git a/README.md b/README.md
@@ -2,6 +2,6 @@
 
 # Opamine
 
-Rootless arm64e jailbreak for iOS 15.0 - 16.5.1 (arm64e) and iOS 15.0 - 16.6.1 (arm64). More details will follow here soon.
+A rootless semi-untethered jailbreak for iOS 15.0 - 16.5.1 (arm64e) and iOS 15.0 - 16.6.1 (arm64). More details will follow here soon.
 
 Official website / download: https://ellekit.space/dopamine/