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

assets/dolphin/external/L1_My_dude_128x64/meta.txt

@@ -8,7 +8,7 @@ Active frames: 51
 Frames order: 0 1 2 3 4 5 6 0 1 2 7 8 9 10 11 12 7 8 9 13 14 15 14 13 14 15 7 8 9 16 17 18 13 14 19 20 21 22 23 24 21 25 26 27 28 29 30 31 32 33 32 34 35 36 35 34 37 38 39 40 41 42 43 44 45 46 17 47 48 7
 Active cycles: 1
 Frame rate: 2
-Duration: 3600
+Duration: 360
 Active cooldown: 7
 
 Bubble slots: 1

assets/dolphin/external/L1_Sad_song_128x64/meta.txt

@@ -8,7 +8,7 @@ Active frames: 55
 Frames order: 0 1 2 3 4 5 0 1 6 7 8 5 9 10 11 12 13 14 15 0 1 2 3 4 5 0 1 6 7 8 5 9 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 53 54 53 55 56 57 58 59 60 61 62 4 5
 Active cycles: 1
 Frame rate: 2
-Duration: 3600
+Duration: 360
 Active cooldown: 6
 
 Bubble slots: 4

assets/dolphin/external/L2_Coding_in_the_shell_128x64/meta.txt

@@ -8,7 +8,7 @@ Active frames: 44
 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 17 19 20 21 22 23 24 24 25 26 27 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
 Active cycles: 1
 Frame rate: 2
-Duration: 3600
+Duration: 360
 Active cooldown: 7
 
 Bubble slots: 1

assets/dolphin/external/L2_Secret_door_128x64/meta.txt

@@ -8,7 +8,7 @@ Active frames: 24
 Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
 Active cycles: 1
 Frame rate: 2
-Duration: 3600
+Duration: 360
 Active cooldown: 7
 
 Bubble slots: 0

assets/dolphin/external/L3_Freedom_2_dolphins_128x64/meta.txt

@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 20
+Active frames: 38
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 12 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
+Active cycles: 1
+Frame rate: 2
+Duration: 360
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 52
+Y: 46
+Text: Thanks, man!
+AlignH: Left
+AlignV: Top
+StartFrame: 37
+EndFrame: 40

assets/dolphin/external/manifest.txt

@@ -104,7 +104,7 @@ Min butthurt: 0
 Max butthurt: 14
 Min level: 17
 Max level: 30
-Weight: 4
+Weight: 3
 
 Name: L2_Wake_up_128x64
 Min butthurt: 0
@@ -139,7 +139,7 @@ Min butthurt: 0
 Max butthurt: 14
 Min level: 21
 Max level: 30
-Weight: 4
+Weight: 3
 
 Name: L3_Furippa3_128x64
 Min butthurt: 0
@@ -167,18 +167,25 @@ Min butthurt: 11
 Max butthurt: 14
 Min level: 14
 Max level: 30
-Weight: 4
+Weight: 3
 
 Name: L2_Coding_in_the_shell_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 22
 Max level: 30
-Weight: 4
+Weight: 3
 
 Name: L2_Secret_door_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 26
 Max level: 30
-Weight: 4
+Weight: 3
+
+Name: L3_Freedom_2_dolphins_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 16
+Max level: 30
+Weight: 5