Merge nfc_magic from https://github.com/flipperdevices/flipperzero-good-faps

# Conflicts:
#	nfc_magic/application.fam
#	nfc_magic/lib/magic/protocols/gen4/gen4_poller_i.c
#	nfc_magic/scenes/nfc_magic_scene_key_input.c

nfc_magic/.catalog/changelog.md

@@ -1,9 +1,10 @@
-## 1.4 
+## 1.6
+ - Rework with new bit lib API
 
+## 1.5
  - Fix incorrect max sector configuration
 
 ## 1.4 
-
  - Auth with password option moved into new submenu "Gen4 actions"
  - New function: Get gen4 card revision
  - New function: Get gen4 card config (shows only when debug ON)

nfc_magic/application.fam

@@ -10,8 +10,8 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="Application for writing to NFC tags with modifiable sector 0",
-    fap_version="1.5",
-    fap_icon="125_10px.png",
+    fap_version="1.6",
+    fap_icon="assets/125_10px.png",
     fap_category="NFC",
     fap_private_libs=[
         Lib(

nfc_magic/lib/magic/protocols/gen4/gen4_poller_i.c

@@ -3,7 +3,6 @@
 #include "bit_buffer.h"
 #include "protocols/gen4/gen4_poller.h"
 #include <nfc/protocols/iso14443_3a/iso14443_3a_poller.h>
-#include <bit_lib.h>
 
 #define GEN4_CMD_PREFIX (0xCF)
 

nfc_magic/lib/magic/protocols/gen4/gen4_poller_i.h

@@ -3,6 +3,7 @@
 #include "gen4_poller.h"
 #include <nfc/nfc_poller.h>
 #include <nfc/protocols/iso14443_3a/iso14443_3a_poller.h>
+#include <bit_lib/bit_lib.h>
 
 #define TAG "Gen4Poller"
 

nfc_magic/scenes/nfc_magic_scene_key_input.c

@@ -1,6 +1,6 @@
 #include "../nfc_magic_app_i.h"
 
-#include <bit_lib.h>
+#include <bit_lib/bit_lib.h>
 
 void nfc_magic_scene_key_input_byte_input_callback(void* context) {
     NfcMagicApp* instance = context;