Merge remote-tracking branch 'OFW/dev' into dev

assets/dolphin/external/L3_Intruder_alert_128x64/meta.txt

@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 14
+Active frames: 42
+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 53 54 55
+Active cycles: 1
+Frame rate: 2
+Duration: 3600
+Active cooldown: 7
+
+Bubble slots: 0

assets/dolphin/external/manifest.txt

@@ -188,14 +188,21 @@ Min butthurt: 0
 Max butthurt: 12
 Min level: 3
 Max level: 3
-Weight: 5
+Weight: 4
 
 Name: L1_Akira_128x64
 Min butthurt: 0
 Max butthurt: 8
 Min level: 1
 Max level: 3
-Weight: 5
+Weight: 4
+
+Name: L3_Intruder_alert_128x64
+Min butthurt: 0
+Max butthurt: 12
+Min level: 3
+Max level: 3
+Weight: 6
 
 Name: L3_Fireplace_128x64
 Min butthurt: 0

lib/SConscript

@@ -4,7 +4,7 @@ Import("env")
 env.Append(
     CPPPATH=[
         "#/",
-        "#/lib",  # TODO FL-3553: remove!
+        "#/lib",
         # Ugly hack
         Dir("../assets/compiled"),
     ],

scripts/ufbt/commandline.scons

@@ -93,6 +93,11 @@ vars.AddVariables(
         help="Enable strict import check for .faps",
         default=True,
     ),
+    (
+        "ARGS",
+        "Extra arguments to pass to certain scripts supporting it",
+        "",
+    ),
 )
 
 Return("vars")