Remove unneeded parts and update stuff

resources/firmware/iPhone2,1/10A403/sha1sum

@@ -0,0 +1 @@
+85963dfe1c0febf34d9871ee32b891b93d47b2b6

resources/firmware/iPhone2,1/10A523/sha1sum

@@ -0,0 +1 @@
+38bda2110c9b6b2227a61ee57c9e9ad7cb0fbfbc

resources/firmware/iPhone2,1/10B141/sha1sum

@@ -0,0 +1 @@
+db88aa859cb15af1c70e5e4b30e4056367bd998d

resources/firmware/iPhone2,1/10B146/sha1sum

@@ -0,0 +1 @@
+17174031c923080be0b7cfa6f550aa8008b63583

resources/firmware/iPhone2,1/10B329/sha1sum

@@ -0,0 +1 @@
+15e92a89ff3caf51523962fdb125e918d78c1807

resources/firmware/iPhone2,1/7A341/sha1sum

@@ -0,0 +1 @@
+d8534408c8679c830fd0c4e36ef9762c11ef73df

resources/firmware/iPhone2,1/7A400/sha1sum

@@ -0,0 +1 @@
+30006575af931e3da0521febace005152cdb8853

resources/firmware/iPhone2,1/7C144/sha1sum

@@ -0,0 +1 @@
+527c74f87588afa1d69c1e2c08eedc88f113013a

resources/firmware/iPhone2,1/7D11/sha1sum

@@ -0,0 +1 @@
+6998bb7d9e869b2d89a08853312f9457d070fb1f

resources/firmware/iPhone2,1/8A306/sha1sum

@@ -0,0 +1 @@
+c2b6fb9a158547ce726baa1bf8f0558a71518fec

resources/firmware/iPhone2,1/8A400/sha1sum

@@ -0,0 +1 @@
+61d21363ced6e006cc226f9a0a0e9c6ed8e048ab

resources/firmware/iPhone2,1/8C148a/sha1sum

@@ -0,0 +1 @@
+2787bb9fbf18594279d05682e6fd16d2b9612a2a

resources/firmware/iPhone2,1/8F190/sha1sum

@@ -0,0 +1 @@
+d05108c7338f7df7026b2d9a84f632a096bace92

resources/firmware/iPhone2,1/8G4/sha1sum

@@ -0,0 +1 @@
+6de986f2dbd16a65db122e7c54a70f31812d028a

resources/firmware/iPhone2,1/8H7/sha1sum

@@ -0,0 +1 @@
+4021a2d82971fc4c637f1fdb6ce7c4dcfb7ac0d7

resources/firmware/iPhone2,1/8K2/sha1sum

@@ -0,0 +1 @@
+be06903d55dc13d8948ae4cfa619a277df4d4e5b

restore.sh

@@ -1706,8 +1706,7 @@ ipsw_preference_set() {
         echo
     fi
 
-    if [[ $ipsw_jailbreak == 1 && -z $ipsw_hacktivate ]] &&
-       [[ $device_type == "iPhone1"* || $device_type == "iPhone2,1" ]]; then
+    if [[ $ipsw_jailbreak == 1 && -z $ipsw_hacktivate && $device_canhacktivate == 1 ]]; then
         input "Hacktivate Option"
         print "* When this option is enabled, your device will be activated on restore."
         print "* Enable this option if you have no valid SIM card to activate the phone."
@@ -1721,6 +1720,10 @@ ipsw_preference_set() {
             ipsw_hacktivate=
         fi
         echo
+    elif [[ $ipsw_jailbreak != 1 ]] &&
+         [[ $device_type == "iPhone1"* || $device_type == "iPhone2,1" ]]; then
+        log "Hacktivate option is not available. Jailbreak option must be enabled"
+        echo
     fi
 
     if [[ -n $ipsw_memory ]]; then
@@ -2108,13 +2111,6 @@ ipsw_prepare_keys() {
             fi
         ;;
 
-        "LLB" )
-            echo -e "<key>$comp</key><dict><key>File</key><string>Firmware/all_flash/all_flash.${device_model}ap.production/$name</string><key>IV</key><string>$iv</string><key>Key</key><string>$key</string><key>Patch</key><string>LLB.${device_model}ap.RELEASE.img3</string>" >> $NewPlist
-            if [[ $device_proc != 1 ]]; then
-                echo -e "<key>IsPlain</key><true/>" >> $NewPlist
-            fi
-        ;;
-
         "WTF2" )
             echo -e "<key>WTF 2</key><dict><key>File</key><string>Firmware/dfu/WTF.s5l8900xall.RELEASE.dfu</string><key>Patch</key><string>WTF.s5l8900xall.RELEASE.patch</string>" >> $NewPlist
         ;;
@@ -2360,35 +2356,6 @@ ipsw_prepare_bundle() {
         ipsw_prepare_keys iBSS $1
         ipsw_prepare_keys RestoreRamdisk $1
         echo -e "</dict>" >> $NewPlist
-    elif [[ $2 == "old" ]]; then
-        echo -e "<key>FirmwarePatches</key><dict>" >> $NewPlist
-        ipsw_prepare_keys iBSS $1
-        if [[ $vers != "3"* && $vers != "4"* ]]; then
-            ipsw_prepare_keys iBEC $1
-        fi
-        ipsw_prepare_keys RestoreRamdisk $1
-        if [[ $device_type == "iPod2,1" && $device_target_vers == "3.1.3" ]]; then
-            :
-        elif [[ $device_proc == 1 ]]; then
-            ipsw_prepare_keys iBoot $1
-            ipsw_prepare_keys KernelCache $1
-            #ipsw_prepare_keys LLB $1
-            ipsw_prepare_keys WTF2 $1
-        else
-            case $device_target_vers in
-                6.1.6 | 4.2.1 | 4.1 ) :;;
-                3.0* )
-                    ipsw_prepare_keys iBoot $1
-                    #ipsw_prepare_keys LLB $1
-                ;;
-                * )
-                    ipsw_prepare_keys iBoot $1
-                    ipsw_prepare_keys KernelCache $1
-                    #ipsw_prepare_keys LLB $1
-                ;;
-            esac
-        fi
-        echo -e "</dict>" >> $NewPlist
     else
         if [[ -d $FirmwareBundle2 ]]; then
             echo -e "<key>FirmwarePatches</key><dict>" >> $NewPlist
@@ -2417,19 +2384,14 @@ ipsw_prepare_bundle() {
             elif [[ $device_proc == 1 ]]; then
                 ipsw_prepare_keys iBoot $1
                 ipsw_prepare_keys KernelCache $1
-                #ipsw_prepare_keys LLB $1
                 ipsw_prepare_keys WTF2 $1
             else
                 case $device_target_vers in
                     6.1.6 | 4.2.1 | 4.1 ) :;;
-                    3.0* )
-                        ipsw_prepare_keys iBoot $1
-                        #ipsw_prepare_keys LLB $1
-                    ;;
+                    3.0* ) ipsw_prepare_keys iBoot $1;;
                     * )
                         ipsw_prepare_keys iBoot $1
                         ipsw_prepare_keys KernelCache $1
-                        #ipsw_prepare_keys LLB $1
                     ;;
                 esac
             fi
@@ -4538,8 +4500,9 @@ menu_restore_more() {
         menu_items=()
         case $device_type in
             iPhone2,1 )
-                menu_items+=("6.1.3" "6.1.2" "6.1" "6.0.1" "6.0" "5.1" "5.0.1" "5.0" "4.3.2" "4.3.1" "4.3")
-                menu_items+=("4.2.1" "4.0.2" "4.0.1" "4.0" "3.1.2" "3.1" "3.0.1" "3.0")
+                menu_items+=("6.1.3" "6.1.2" "6.1" "6.0.1" "6.0" "5.1" "5.0.1" "5.0")
+                #menu_items+=("4.3.5" "4.3.4" "4.3.2" "4.3.1" "4.3")
+                menu_items+=("4.2.1" "4.0.2" "4.0.1" "4.0" "3.1.2" "3.1" "3.0")
             ;;
             iPod2,1 ) menu_items+=("4.0.2" "4.0");;
         esac
@@ -4615,12 +4578,19 @@ menu_ipsw() {
                     "6.1.6" | "4.2.1" | "3.1.3" ) device_canhacktivate=1;;
                 esac
             ;;
-            5* | 4* | 3* )
+            6* | 5* | 4* | 3* )
                 device_target_vers="$1"
+                if [[ $device_type == "iPhone1"* || $device_type == "iPhone2,1" ]]; then
                     device_canhacktivate=1
+                fi
             ;;
         esac
         case $1 in
+            "6.1.3" ) device_target_build="10B329";;
+            "6.1.2" ) device_target_build="10B146";;
+            "6.1"   ) device_target_build="10B141";;
+            "6.0.1" ) device_target_build="10A523";;
+            "6.0"   ) device_target_build="10A403";;
             "5.1.1" ) device_target_build="9B206";;
             "5.1"   ) device_target_build="9B176";;
             "5.0.1" ) device_target_build="9A405";;
@@ -4676,6 +4646,9 @@ menu_ipsw() {
         fi
         if [[ $1 == "Other (Use SHSH Blobs)" ]]; then
             device_target_other=1
+            if [[ $device_type == "iPhone2,1" ]]; then
+                device_canhacktivate=1
+            fi
         elif [[ $1 == *"powdersn0w"* ]]; then
             device_target_powder=1
         elif [[ $1 == *"Tethered"* ]]; then