Merge pull request #21 from PsychoTea/develop

Merge to master
PsychoTea · Aug 4, 2018 · 6bf0686 · 6bf0686
2 parents 5b9c7f6 + 79af166
commit 6bf0686
Show file tree

Hide file tree

Showing 340 changed files with 13,731 additions and 12,782 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,10 @@
 .DS_Store
-*.DS_Store
 xcuserdata
 *.xcuserstate
-*.xcuserstate
+.theos
+obj
+build_time
+**/bin
+
+!**/meridian-bootstrap/**/*
+
diff --git a/BinPackCreator/bins/arch b/BinPackCreator/bins/arch
diff --git a/BinPackCreator/bins/cat b/BinPackCreator/bins/cat
diff --git a/BinPackCreator/bins/chflags b/BinPackCreator/bins/chflags
diff --git a/BinPackCreator/bins/chmod b/BinPackCreator/bins/chmod
diff --git a/BinPackCreator/bins/chown b/BinPackCreator/bins/chown
diff --git a/BinPackCreator/bins/clear b/BinPackCreator/bins/clear
diff --git a/BinPackCreator/bins/cp b/BinPackCreator/bins/cp
diff --git a/BinPackCreator/bins/cut b/BinPackCreator/bins/cut
diff --git a/BinPackCreator/bins/date b/BinPackCreator/bins/date
diff --git a/BinPackCreator/bins/dbclient b/BinPackCreator/bins/dbclient
diff --git a/BinPackCreator/bins/dmesg b/BinPackCreator/bins/dmesg
diff --git a/BinPackCreator/bins/dropbear b/BinPackCreator/bins/dropbear
diff --git a/BinPackCreator/bins/dropbearconvert b/BinPackCreator/bins/dropbearconvert
diff --git a/BinPackCreator/bins/dropbearkey b/BinPackCreator/bins/dropbearkey
diff --git a/BinPackCreator/bins/du b/BinPackCreator/bins/du
diff --git a/BinPackCreator/bins/false b/BinPackCreator/bins/false
diff --git a/BinPackCreator/bins/filemon b/BinPackCreator/bins/filemon
diff --git a/BinPackCreator/bins/find b/BinPackCreator/bins/find
diff --git a/BinPackCreator/bins/fs_usage b/BinPackCreator/bins/fs_usage
diff --git a/BinPackCreator/bins/grep b/BinPackCreator/bins/grep
diff --git a/BinPackCreator/bins/gunzip b/BinPackCreator/bins/gunzip
diff --git a/BinPackCreator/bins/gzip b/BinPackCreator/bins/gzip
diff --git a/BinPackCreator/bins/head b/BinPackCreator/bins/head
diff --git a/BinPackCreator/bins/hexdump b/BinPackCreator/bins/hexdump
diff --git a/BinPackCreator/bins/hostinfo b/BinPackCreator/bins/hostinfo
diff --git a/BinPackCreator/bins/hostname b/BinPackCreator/bins/hostname
diff --git a/BinPackCreator/bins/id b/BinPackCreator/bins/id
diff --git a/BinPackCreator/bins/ifconfig b/BinPackCreator/bins/ifconfig
diff --git a/BinPackCreator/bins/ioreg b/BinPackCreator/bins/ioreg
diff --git a/BinPackCreator/bins/joreg b/BinPackCreator/bins/joreg
diff --git a/BinPackCreator/bins/jtool b/BinPackCreator/bins/jtool
diff --git a/BinPackCreator/bins/kextstat b/BinPackCreator/bins/kextstat
diff --git a/BinPackCreator/bins/kextunload b/BinPackCreator/bins/kextunload
diff --git a/BinPackCreator/bins/kill b/BinPackCreator/bins/kill
diff --git a/BinPackCreator/bins/killall b/BinPackCreator/bins/killall
diff --git a/BinPackCreator/bins/less b/BinPackCreator/bins/less
diff --git a/BinPackCreator/bins/ln b/BinPackCreator/bins/ln
diff --git a/BinPackCreator/bins/ls b/BinPackCreator/bins/ls
diff --git a/BinPackCreator/bins/lsmp b/BinPackCreator/bins/lsmp
diff --git a/BinPackCreator/bins/ltop b/BinPackCreator/bins/ltop
diff --git a/BinPackCreator/bins/md5 b/BinPackCreator/bins/md5
diff --git a/BinPackCreator/bins/mkdir b/BinPackCreator/bins/mkdir
diff --git a/BinPackCreator/bins/mknod b/BinPackCreator/bins/mknod
diff --git a/BinPackCreator/bins/more b/BinPackCreator/bins/more
diff --git a/BinPackCreator/bins/mv b/BinPackCreator/bins/mv
diff --git a/BinPackCreator/bins/nano b/BinPackCreator/bins/nano
diff --git a/BinPackCreator/bins/netstat b/BinPackCreator/bins/netstat
diff --git a/BinPackCreator/bins/nohup b/BinPackCreator/bins/nohup
diff --git a/BinPackCreator/bins/passwd b/BinPackCreator/bins/passwd
diff --git a/BinPackCreator/bins/ping b/BinPackCreator/bins/ping
diff --git a/BinPackCreator/bins/plconvert b/BinPackCreator/bins/plconvert
diff --git a/BinPackCreator/bins/printf b/BinPackCreator/bins/printf
diff --git a/BinPackCreator/bins/procexp b/BinPackCreator/bins/procexp
diff --git a/BinPackCreator/bins/pwd b/BinPackCreator/bins/pwd
diff --git a/BinPackCreator/bins/renice b/BinPackCreator/bins/renice
diff --git a/BinPackCreator/bins/reset b/BinPackCreator/bins/reset
diff --git a/BinPackCreator/bins/rm b/BinPackCreator/bins/rm
diff --git a/BinPackCreator/bins/rmdir b/BinPackCreator/bins/rmdir
diff --git a/BinPackCreator/bins/sc_usage b/BinPackCreator/bins/sc_usage
diff --git a/BinPackCreator/bins/scp b/BinPackCreator/bins/scp
diff --git a/BinPackCreator/bins/screen b/BinPackCreator/bins/screen
diff --git a/BinPackCreator/bins/script b/BinPackCreator/bins/script
diff --git a/BinPackCreator/bins/sed b/BinPackCreator/bins/sed
diff --git a/BinPackCreator/bins/seq b/BinPackCreator/bins/seq
diff --git a/BinPackCreator/bins/sh b/BinPackCreator/bins/sh
diff --git a/BinPackCreator/bins/shutdown b/BinPackCreator/bins/shutdown
diff --git a/BinPackCreator/bins/sleep b/BinPackCreator/bins/sleep
diff --git a/BinPackCreator/bins/split b/BinPackCreator/bins/split
diff --git a/BinPackCreator/bins/stat b/BinPackCreator/bins/stat
diff --git a/BinPackCreator/bins/stty b/BinPackCreator/bins/stty
diff --git a/BinPackCreator/bins/sync b/BinPackCreator/bins/sync
diff --git a/BinPackCreator/bins/sysctl b/BinPackCreator/bins/sysctl
diff --git a/BinPackCreator/bins/syslog b/BinPackCreator/bins/syslog
diff --git a/BinPackCreator/bins/tail b/BinPackCreator/bins/tail
diff --git a/BinPackCreator/bins/tar b/BinPackCreator/bins/tar
diff --git a/BinPackCreator/bins/taskpolicy b/BinPackCreator/bins/taskpolicy
diff --git a/BinPackCreator/bins/tee b/BinPackCreator/bins/tee
diff --git a/BinPackCreator/bins/time b/BinPackCreator/bins/time
diff --git a/BinPackCreator/bins/true b/BinPackCreator/bins/true
diff --git a/BinPackCreator/bins/tset b/BinPackCreator/bins/tset
diff --git a/BinPackCreator/bins/uname b/BinPackCreator/bins/uname
diff --git a/BinPackCreator/bins/vim b/BinPackCreator/bins/vim
diff --git a/BinPackCreator/bins/vm_stat b/BinPackCreator/bins/vm_stat
diff --git a/BinPackCreator/bins/wc b/BinPackCreator/bins/wc
diff --git a/BinPackCreator/bins/wget b/BinPackCreator/bins/wget
diff --git a/BinPackCreator/bins/what b/BinPackCreator/bins/what
diff --git a/BinPackCreator/bins/which b/BinPackCreator/bins/which
diff --git a/BinPackCreator/bins/xargs b/BinPackCreator/bins/xargs
diff --git a/BinPackCreator/bins/xxd b/BinPackCreator/bins/xxd
diff --git a/BinPackCreator/bins/zsh b/BinPackCreator/bins/zsh
diff --git a/BinPackCreator/packBins b/BinPackCreator/packBins
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
diff --git a/Meridian/Meridian.xcodeproj/project.pbxproj b/Meridian/Meridian.xcodeproj/project.pbxproj
diff --git a/Meridian/Meridian.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Meridian/Meridian.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Meridian/Meridian.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Meridian/Meridian.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/Meridian/Meridian.xcodeproj/xcuserdata/ben.xcuserdatad/xcschemes/xcschememanagement.plist b/Meridian/Meridian.xcodeproj/xcuserdata/ben.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,6 +9,41 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>SafeMode.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>TweakLoader.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+		<key>amfid.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>injector.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>jailbreakd.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>libjailbreak.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>pspawn_hook.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

diff --git a/...an/Meridian/Frontend/Assets.xcassets/AppIcon-1.appiconset/[email protected] b/...an/Meridian/Frontend/Assets.xcassets/AppIcon-1.appiconset/[email protected]
diff --git a/...an/Meridian/Frontend/Assets.xcassets/AppIcon-1.appiconset/[email protected] b/...an/Meridian/Frontend/Assets.xcassets/AppIcon-1.appiconset/[email protected]
diff --git a/...dian/Meridian/Frontend/Assets.xcassets/AppIcon.appiconset/[email protected] b/...dian/Meridian/Frontend/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/...dian/Meridian/Frontend/Assets.xcassets/AppIcon.appiconset/[email protected] b/...dian/Meridian/Frontend/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Meridian/Meridian/Frontend/Base.lproj/LaunchScreen.storyboard b/Meridian/Meridian/Frontend/Base.lproj/LaunchScreen.storyboard