Merge branch 'UberGuidoZ:main' into main

Applications/Unleashed/ReadMe.md

@@ -0,0 +1,47 @@
+# Flipper Application Files (FAPs) for [Unleashed](https://github.com/Eng1n33r/flipperzero-firmware)
+
+Thank you [xMasterX](https://github.com/xMasterX) for compiling and maintaining these files. I have decided to not include the "integrated/bundled" FAP files that come with a fresh install of Unleashed. If you need to grab a copy of them for whatever reason, you can do so right from the Unleashed repo.
+
+* Visit the [Releases page](https://github.com/Eng1n33r/flipperzero-firmware/releases) of the Unleashed repo.
+* Scroll down and download the linked ZIP file from the Assets drop down, under the big install from web link.
+* Within that ZIP, you'll find `resources.tar` - open/extract that too and look in the `apps` folder.
+
+## Thank you to the authors!
+
+The Flipper and its community wouldn't be as rich as it is without your contributions and support. Thank you for all you have done.
+
+## Games
+- [2048 (By OlegSchwann)](https://github.com/OlegSchwann/flipperzero-firmware/tree/hackaton/game_2048/applications/game-2048) [(Score By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/186)
+- [Dice Roller Including SEX/WAR/8BALL/WEED DICE (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/applications/dice/dice.c)
+- [Game of Life (Updated to work by tgxn) (By itsyourbedtime)](https://github.com/tgxn/flipperzero-firmware/blob/dev/applications/game_of_life/game_of_life.c)
+- [Mandelbrot Set (By Possibly-Matt)](https://github.com/Possibly-Matt/flipperzero-firmware-wPlugins)
+- [Minesweeper (By panki27)](https://github.com/panki27/minesweeper)
+- [Monty Hall (By DevMilanIan)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/203)
+- [TAMA P1 (By GMMan)](https://github.com/GMMan/flipperzero-firmware/tree/tama-p1) requires [this rom](https://tinyurl.com/tamap1) IN `tama_p1` on SD as `rom.bin` to make it work.
+- [Video Poker (By PixlEmly)](https://github.com/PixlEmly/flipperzero-firmware-testing/blob/420/applications/VideoPoker/poker.c)
+
+## Tools
+- [WiFi (Deauther) (By Timmotools)](https://github.com/Timmotools/flipperzero_esp8266_deautherv2)
+- [Paint (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e)
+- [Mouse Jiggler (By Jacob-Tate)](https://github.com/Jacob-Tate/flipperzero-firmware/blob/dev/applications/mouse_jiggler/mouse_jiggler.c) ([Original By MuddleBox](https://github.com/MuddledBox/))
+- [DTMF Dolphin (By litui)](https://github.com/litui/dtmf_dolphin)
+- [Metronome (By panki27)](https://github.com/panki27/Metronome)
+- [BPM Tapper (By panki27)](https://github.com/panki27/bpm-tapper)
+- [Calculator (By n-o-T-I-n-s-a-n-e)](https://github.com/n-o-T-I-n-s-a-n-e)
+- [Ceasar Cipher (By panki27)](https://github.com/panki27/caesar-cipher)
+
+-----
+
+I've had so many asking for me to add this.<br>
+![Flipper_Blush](https://user-images.githubusercontent.com/57457139/183561666-4424a3cc-679b-4016-a368-24f7e7ad0a88.jpg) ![Flipper_Love](https://user-images.githubusercontent.com/57457139/183561692-381d37bd-264f-4c88-8877-e58d60d9be6e.jpg)
+
+**BTC**: `3AWgaL3FxquakP15ZVDxr8q8xVTc5Q75dS`<br>
+**BCH**: `17nWCvf2YPMZ3F3H1seX8T149Z9E3BMKXk`<br>
+**ETH**: `0x0f0003fCB0bD9355Ad7B124c30b9F3D860D5E191`<br>
+**LTC**: `M8Ujk52U27bkm1ksiWUyteL8b3rRQVMke2`
+
+So, here it is. All donations of *any* size are humbly appreciated.<br>
+![Flipper_Clap](https://user-images.githubusercontent.com/57457139/183561789-2e853ede-8ef7-41e8-a67c-716225177e5d.jpg) ![Flipper_OMG](https://user-images.githubusercontent.com/57457139/183561787-e21bdc1e-b316-4e67-b327-5129503d0313.jpg)
+
+Donations will be used for hardware (and maybe caffeine) to further testing!<br>
+![UberGuidoZ](https://cdn.discordapp.com/emojis/1000632669622767686.gif)

BadUSB/BadUSB-FalsePhilosopher

@@ -1 +1 @@
-Subproject commit bfbcf86e0aa73cf859718424934d2ec023f6b36f
+Subproject commit 75eb24a9e89ba18695aa062c4759d7f65c45f58e

NFC/ReadMe.md

@@ -1,7 +1,8 @@
 # NFC Ramblings and Info
 
 [Fun files](https://github.com/UberGuidoZ/Flipper/tree/main/NFC/Fun_Files) are things I use or things I'm playing with. <br>
-Includes some basic/crude NFC documentation in the ReadMe.
+Includes some basic/crude NFC documentation in the ReadMe.<br>
+Also make sure to check out Toxic_Wolf's [NFC Trolls repo](https://github.com/w0lfzk1n/Flipper-Zero-NFC-Trolls)!
 
 `mf_classic_dict` is an [upgraded NFC keys dictionary](https://github.com/UberGuidoZ/Flipper/tree/main/NFC/mf_classic_dict) (user/default) that almost triples the available keys.<br>
 With it, you can recognize more (usually finding all 32) - now with sources and comments included!

flipper_toolbox

@@ -1 +1 @@
-Subproject commit cfc64db9dae75f596622e5d48c710acdacd6209b
+Subproject commit 1293f0af79d911586ac50615fa25a137f2d01ad8