Merge branch 'fz-dev' into dev

assets/dolphin/external/L1_Happy_holidays_128x64/meta.txt

@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 10
+Active frames: 18
+Frames order: 0 1 2 1 0 1 2 1 0 1 2 3 4 5 6 5 4 7 2 8 9 10 11 10 9 10 11 12
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 11
+Y: 19
+Text:  HAPPY\nHOLIDAYS!
+AlignH: Right
+AlignV: Center
+StartFrame: 22
+EndFrame: 27

assets/dolphin/external/manifest.txt

@@ -36,10 +36,10 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-Name: L2_Wake_up_128x64
+Name: L1_Happy_holidays_128x64
 Min butthurt: 0
-Max butthurt: 12
-Min level: 2
+Max butthurt: 14
+Min level: 1
 Max level: 3
 Weight: 4
 
@@ -92,6 +92,13 @@ Min level: 1
 Max level: 3
 Weight: 3
 
+Name: L2_Wake_up_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 2
+Max level: 3
+Weight: 4
+
 Name: L2_Furippa2_128x64
 Min butthurt: 0
 Max butthurt: 6