Merge branch 'amfid2' into revamp

CONTRIBUTING.md

@@ -0,0 +1,84 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. 
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+   build.
+2. Update the README.md with details of changes to the interface, this includes new environment 
+   variables, exposed ports, useful file locations and container parameters.
+3. Increase the version numbers in any examples files and the README.md to the new version that this
+   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+   do not have permission to do that, you may request the second reviewer to merge it for you.
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.

README.md

@@ -1,6 +1,6 @@
 # Manticore Jailbreak
 Manticore Jailbreak is an Free and Open-Source Jailbreak utility developed by the Manticore Team.
-Current compatibility: iOS 14.0 -> iOS 14.3 using cicuta_virosa exploit. The tool is a work-in-progress. Expect changes and exxpansions in the future.
+Current compatibility: iOS 14.0 -> iOS 14.3 using cicuta_virosa exploit. The tool is a work-in-progress. Expect changes and expansions in the future.
 
 ## About us
 The Manticore Jailbreak is an independent jailbreaking tool for all devices, including A14 and below, running iOS 14.3 down to iOS 14.0.

manticore.xcodeproj/project.pbxproj

@@ -82,6 +82,8 @@
 		23652B1C25E7B04F004D7F7E /* user_kernel_alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user_kernel_alloc.h; sourceTree = "<group>"; };
 		23652B1D25E7B04F004D7F7E /* user_kernel_alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = user_kernel_alloc.c; sourceTree = "<group>"; };
 		23652B2225E7B39B004D7F7E /* iosurface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = iosurface.h; sourceTree = "<group>"; };
+		2367F20A26D7DE6200959B29 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
+		2367F20B26D7DE6300959B29 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		23B644E72652681B00531BCC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		23B644EC26526CD700531BCC /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		23B644EE2652700300531BCC /* cs_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cs_common.h; sourceTree = "<group>"; };
@@ -586,6 +588,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				23C704FE25DB2EE80078DC37 /* Base */,
+				2367F20A26D7DE6200959B29 /* de */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -594,6 +597,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				23C7050625DB2EE90078DC37 /* Base */,
+				2367F20B26D7DE6300959B29 /* de */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";

manticore/Base.lproj/Main.storyboard

@@ -735,7 +735,7 @@
                         </sections>
                         <connections>
                             <outlet property="dataSource" destination="I5H-bE-iec" id="UjB-rS-0q7"/>
-                            <outlet property="delegate" destination="I5H-bE-iec" id="wBt-pg-Ud5"/>
+                            <outlet property="delegate" destination="I5H-bE-iec" id="uqW-9l-EJt"/>
                         </connections>
                     </tableView>
                     <value key="contentSizeForViewInPopover" type="size" width="320" height="340"/>

manticore/ja.lproj/LaunchScreen.strings

@@ -0,0 +1 @@
+

manticore/ja.lproj/Main.strings

@@ -0,0 +1,57 @@
+
+/* Class = "UILabel"; text = "Manticore"; ObjectID = "0il-tf-sNa"; */
+"0il-tf-sNa.text" = "Manticore";
+
+/* Class = "UILabel"; text = "Set APNonce"; ObjectID = "0yi-4F-L8u"; */
+"0yi-4F-L8u.text" = "APNonceをセット";
+
+/* Class = "UILabel"; text = "Enable Tweaks"; ObjectID = "2Nf-dY-FJy"; */
+"2Nf-dY-FJy.text" = "Tweaksの有効化";
+
+/* Class = "UIButton"; normalTitle = "Jailbreak"; ObjectID = "6hM-Fc-FDp"; */
+"6hM-Fc-FDp.normalTitle" = "脱獄";
+
+/* Class = "UILabel"; text = "Restore RootFS"; ObjectID = "AVZ-qX-0ms"; */
+"AVZ-qX-0ms.text" = "RootFSの復元";
+
+/* Class = "UIButton"; normalTitle = "Jailbreak"; ObjectID = "B09-wX-UeI"; */
+"B09-wX-UeI.normalTitle" = "脱獄";
+
+/* Class = "UITextField"; placeholder = "0x1111111111111111"; ObjectID = "JaD-0s-nbo"; */
+"JaD-0s-nbo.placeholder" = "0x1111111111111111";
+
+/* Class = "UILabel"; text = "iOS 14.0 - 14.3"; ObjectID = "Kda-OK-gFg"; */
+"Kda-OK-gFg.text" = "iOS 14.0 - 14.3";
+
+/* Class = "UIButton"; normalTitle = "Save & Set APNonce"; ObjectID = "WEh-zy-xS5"; */
+"WEh-zy-xS5.normalTitle" = "APNonceの保存 & セット";
+
+/* Class = "UIButton"; normalTitle = "Options"; ObjectID = "czz-vo-cHF"; */
+"czz-vo-cHF.normalTitle" = "設定";
+
+/* Class = "UILabel"; text = "Block OTA Updates"; ObjectID = "efL-nQ-xsh"; */
+"efL-nQ-xsh.text" = "OTAアップデートの無効化";
+
+/* Class = "UILabel"; text = "Compatibility"; ObjectID = "i1H-yX-3n8"; */
+"i1H-yX-3n8.text" = "互換性";
+
+/* Class = "UILabel"; text = "Remove ScreenTime"; ObjectID = "kyq-MK-M3C"; */
+"kyq-MK-M3C.text" = "スクリーンタイムの無効化";
+
+/* Class = "UILabel"; text = "Manticore"; ObjectID = "mUJ-nK-XHv"; */
+"mUJ-nK-XHv.text" = "Manticore";
+
+/* Class = "UILabel"; text = "Your iPhone 11 Pro on iOS 14.3 is compatible with Manticore!"; ObjectID = "o5h-H3-igh"; */
+"o5h-H3-igh.text" = "iOS 14.3のiPhone11は互換性があります！";
+
+/* Class = "UITextView"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "oZg-Pf-ew7"; */
+"oZg-Pf-ew7.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
+
+/* Class = "UILabel"; text = "Log ECID"; ObjectID = "voS-Ev-D3K"; */
+"voS-Ev-D3K.text" = "ECIDを記録する";
+
+/* Class = "UILabel"; text = "iOS 14.0 - 14.3"; ObjectID = "xtR-ck-MtY"; */
+"xtR-ck-MtY.text" = "iOS 14.0 - 14.3";
+
+/* Class = "UILabel"; text = "Toggle Log Window"; ObjectID = "yiE-wg-tPU"; */
+"yiE-wg-tPU.text" = "ログ画面の切り替え";