Merge branch 'main' of https://github.com/prettyboycosmo/skeletonkey

Author: PrettyBoyCosmo

install.sh

@@ -58,7 +58,7 @@ function alias_workflow {
     fi
 
     #check if it already exists in zshrc
-    elif ! cat ~/.zshrc | grep "SkeletonKey_PATH" > /dev/null; then
+    if ! cat ~/.zshrc | grep "SkeletonKey_PATH" > /dev/null; then
         # Do it in one command instead of repeating yourself.
         echo "export SkeletonKey_PATH=\"~/.SkeletonKey\"\nalias key=\"python3 ~/.SkeletonKey/main.py\"
         " >> ~/.zshrc

mods/bits.py

@@ -17,7 +17,6 @@
 
 version = open(f'{local_path}/version.txt').read().strip()
 banner = Fore.RED + f'''
-<<<<<<< HEAD
                      _,=;::::::;=,,_
                  _,;,ss*\":::::\'""sss;;,_
                ,;,sSSSss::::::::*\"sSSss;;,
@@ -45,10 +44,7 @@
                       n,nN::::nNN*\"
                         \"Nn,_,nN"
 
-              SkeletonKey Version : 0.{version}\n
-=======
             SkeletonKey Version : {version}\n
->>>>>>> 156829c16b0f8691ffc27211154d3e99ead03298
 ''' + Fore.RESET
 
 help_menu = Fore.CYAN + """

requirements.txt

@@ -1,8 +1,8 @@
-qrcode
-Cryptography
+colorama==0.4.4
 googletrans==3.1.0a0
-colorama
-Pillow
+numpy==1.24.2
+Pillow==9.4.0
+pyenchant==3.2.2
+qrcode
 twofish
 blowfish
-numpy