Merge branch 'dev' of https://github.com/Eng1n33r/flipperzero-firmware into dev

assets/resources/nfc/assets/mf_classic_dict.nfc

@@ -1,8 +1,5 @@
 # ----------------------------- 
-# File composed by UberGuidoZ
-# https://github.com/UberGuidoZ
 # Last update June 7, 2022
-# -----------------------------
 # MIFARE DEFAULT KEYS
 #   -- ICEMAN FORK VERSION --
 #   -- CONTRIBUTE TO THIS LIST, SHARING IS CARING --
@@ -64,8 +61,8 @@ F1D83F964314
 47524F555042
 434F4D4D4F41
 434F4D4D4F42
-# 
-4B0B20107CCB# TNP3XXX
+4B0B20107CCB
+# TNP3XXX
 # ACCESS CONTROL SYSTEM
 605F5E5D5C5B
 # MORE KEYS FROM MFC_DEFAULT_KEYS.LUA
@@ -141,7 +138,6 @@ F4A9EF2AFC6D
 # S6 B
 FB0B20DF1F34
 A9F953DEF0A3
-# DATA FROM FORUM
 74A386AD0A6D 
 3F7A5C2DBD81
 21EDF95E7433
@@ -187,7 +183,7 @@ E3429281EFC1
 16F21A82EC84
 460722122510
 # 3DPRINTER
-# EPI ENVISIONTE# 3DPRINTER
+# EPI ENVISIONTE 3DPRINTER
 AAFB06045877
 # GYM
 # FYSIKEN A
@@ -615,7 +611,6 @@ AD4FB33388BF
 2A2C13CC242A
 27FBC86A00D0
 01FA3FC68349
-13B91C226E56# HOTEL
 6D44B5AAF464
 1717E34A7A8A
 # RFIDEAS
@@ -626,8 +621,8 @@ AD4FB33388BF
 # HID MIFARE SO
 3B7E4FD575AD
 11496F97752A
- LUXEO/AZTEK CASHLESS VENDING
-415A54454B4D#
+# LUXEO/AZTEK CASHLESS VENDING
+415A54454B4D
 # BQT
 321958042333
 # APERIO KEY_A SECTOR 1, 12, 13, 14, 15 DATA START 0 LENGTH 48
@@ -700,7 +695,7 @@ C01FC822C6E5
 # MORE KEYS:
 8A19D40CF2B5
 AE8587108640
-135B88A94B8B# SAFLOCK STANDALONE DOOR LOCKS.
+135B88A94B8B
 # RUSSIAN TROIKA CARD
 08B386463229
 0E8F64340BA4
@@ -1075,7 +1070,7 @@ FE04ECFE5577
 4D48414C5648
 # UNKNOWN HOTEL KEY
 6D9B485A4845
-5A7A52D5E20D# BOSCH SOLUTION 6000
+# BOSCH SOLUTION 6000
 # FOUND IN TAGINFO APP
 # RATB KEY
 C1E51C63B8F5 
@@ -1284,11 +1279,10 @@ AE76242931F1
 124578ABFEDC
 ABFEDC124578
 4578ABFEDC12
-# DATA FROM 
 # PREMIER INN HOTEL CHAIN
 5E594208EF02    
 AF9E38D36582 
-#NORWEGIAN BUILDING SITE IDENTICATION CARD. (HMS KORT)
+# NORWEGIAN BUILDING SITE IDENTICATION CARD. (HMS KORT)
 10DF4D1859C8
 # KEY B
 B5244E79B0C8
@@ -1342,7 +1336,7 @@ FED791829013
 29A791829013
 668091829013
 00008627C10A
-#KEYS FROM NSP MANCHESTER UNIVERSITY UK ACCOMODATION STAFF AND STUDENTS 
+# KEYS FROM NSP MANCHESTER UNIVERSITY UK ACCOMODATION STAFF AND STUDENTS 
 199404281970
 199404281998
 # EASYCARD
@@ -1352,10 +1346,6 @@ FED791829013
 562E6EF73DB6
 F53E9F4114A9
 AD38C17DE7D2
-############
-# HTTPS://GITHUB.COM/ICEMAN1001/PROXMARK
-4B0B20107CCB
-415A54454B4D
 # SOME KEYS OF HTTPS://W3BSIT3-DNS.COM AND HTTPS://IKEY.RU
 # STRELKA EXTENSION
 5C83859F2224
@@ -1419,10 +1409,6 @@ F750C0095199
 93EB64ACF43D
 # KEYS FROM RFIDRESEARCHGROUP PROXMARK3 PROJECT
 # HTTPS://GITHUB.COM/RFIDRESEARCHGROUP/PROXMARK3/BLOB/MASTER/CLIENT/DICTIONARIES/MFC_DEFAULT_KEYS.DIC
-135B88A94B8B
-C1E51C63B8F5
-18F34C92A56E
-74A386AD0A6D
 13B91C226E56
 5A7A52D5E20D
 # IRON LOGIC
@@ -1444,53 +1430,8 @@ DEC0CEB0CE24
 D6261A9A4B3F
 CB9D507CE56D
 # MORE KEYS FROM THE PM3 REPO
-DC018FC1D126
-C428C4550A75
-0C4233587119
-540D5E6355CC
-35C649004000
-6307417353C1
-35D152154017
-D1417E431949
-D973D917A4C7
-730956C72BC2
-F678905568C3
-43E69C28F08C
-0F35D5660653
-F7FA2F629BB1
-E2F14D0A0E28
-9C616585E26D
-4927C97F1D57
-155332417E00
-00460740D722
-2E71D3BD262A
-4F75030AD12B
-D75971531042
-1170553E4304
-0E620691B9FE
-10510049D725
-94B6A644DFF6
-130662240200
-05F5EC05133C
-28D70900734C
-C151D998C669
-9386E2A48280
-046154274C11
-E7316853E731
-735175696421
-5D0762D13401
-2803BCB0C7E1
-424C0FFBF657
-AF9E38D36582
-50240A68D1D8
-6B13935CD550
-521B517352C7
-5E594208EF02
-A7765C952DDF
-2CA4A4D68B8E
 # KEYS OF ARMENIAN UNDERGROUND TICKET
 A0A1A2A8A4A5
-#
 # https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_keys_bmp_sorted.dic
 002DE0301481
 004173272D18