Commit Graph

7 Commits

Author SHA1 Message Date
Willy-JL 399f35dc8a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-05 08:53:38 +00:00
CaitSith2 41bfa2979c Update mf_classic_dict.nfc
Add keys for Bubble Land Play Card
2023-12-04 11:01:00 -08:00
Cory Parker 05479103a6 Update mf_classic_dict.nfc
Added in new mf classic keys
2023-11-29 21:41:10 -10:00
Mihai f2f2035bf7 Update mf_classic_dict.nfc
Re-added STB Public transport keys and also new Metrorex Subway keys
2023-11-13 09:08:30 +02:00
Willy-JL 418f44fef1 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-11-12 02:56:30 +00:00
MX bee48f483c Merge branch 'ofw_dev' into nfcrefactoring 2023-11-01 21:07:33 +03:00
hedger 917410a0a8 [FL-3629] fbt: reworked assets & resources handling (#3160)
* fbt: reworking targets & assets handling WIP
* fbt: dist fixes
* fbt: moved SD card resources to owning apps
* unit_tests: moved resources to app folder
* github: updated unit_tests paths
* github: packaging fixes
* unit_tests: fixes
* fbt: assets: internal cleanup
* fbt: reworked assets handling
* github: unit_tests: reintroducing fixes
* minor cleanup
* fbt: naming changes to reflect private nature of scons tools
* fbt: resources: fixed dist archive paths
* docs: updated paths
* docs: updated more paths
* docs: included "resources" parameter in app manifest docs; updated assets readme
* updated gitignore for assets
* github: updated action versions
* unit_tests: restored timeout; scripts: assets: logging changes
* gh: don't upload desktop animations for unit test run

Co-authored-by: あく <alleteam@gmail.com>
2023-10-31 00:17:30 +09:00