Просмотр исходного кода

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

# Conflicts:
#	nfc_magic/nfc_magic_app_i.h
#	nfc_magic/scenes/nfc_magic_scene_config.h
#	nfc_magic/scenes/nfc_magic_scene_gen1_save_name.c
Willy-JL 1 год назад
Родитель
Сommit
af10e1c6cd
3 измененных файлов с 6 добавлено и 2 удалено
  1. 4 0
      nfc_magic/.catalog/changelog.md
  2. 1 1
      nfc_magic/.gitsubtree
  3. 1 1
      nfc_magic/application.fam

+ 4 - 0
nfc_magic/.catalog/changelog.md

@@ -1,3 +1,7 @@
+## 1.13
+ - Support for dumping Gen1 cards
+ - Minor error screen changes
+
 ## 1.12
 ## 1.12
  - Removed call to legacy SDK API
  - Removed call to legacy SDK API
 
 

+ 1 - 1
nfc_magic/.gitsubtree

@@ -1,2 +1,2 @@
 https://github.com/xMasterX/all-the-plugins dev base_pack/nfc_magic e7a5fb24f091746d1dce138de2041d070a2902e0
 https://github.com/xMasterX/all-the-plugins dev base_pack/nfc_magic e7a5fb24f091746d1dce138de2041d070a2902e0
-https://github.com/flipperdevices/flipperzero-good-faps dev nfc_magic b791dea234f855155027bb46215dc60f3ddeb243
+https://github.com/flipperdevices/flipperzero-good-faps dev nfc_magic a1e2913ba8c7750943ff06c3ea3826518899e98e

+ 1 - 1
nfc_magic/application.fam

@@ -10,7 +10,7 @@ App(
     ],
     ],
     stack_size=4 * 1024,
     stack_size=4 * 1024,
     fap_description="Application for writing to NFC tags with modifiable sector 0",
     fap_description="Application for writing to NFC tags with modifiable sector 0",
-    fap_version="1.12",
+    fap_version="1.13",
     fap_icon="assets/125_10px.png",
     fap_icon="assets/125_10px.png",
     fap_category="NFC",
     fap_category="NFC",
     fap_icon_assets="assets",
     fap_icon_assets="assets",