Merge branch 'staging' into plant_stages

idea.json

@@ -1,66 +0,0 @@
-// STAGE 1: = = = = = = =
-//   ARGS TO ADD:
-//     X "locals" (sequence),
-//     X "data_type" (parameter_declaration)
-//
-//   NODES TO ADD:
-//     X "identifier" (label),
-//     X "parameter_declaration" (label, data_type)
-//     X "scope_declaration"(contains parameter_declaration),
-//
-// Stage 2: = = = = = = = =
-//   NODES TO ADD:
-//     "local_declaration" (label, data_value),
-//
-//   ARGS TO ADD:
-//     "data_value" (local_declaration)
-//
-{
-  "kind": "sequence",
-  "args": {
-    "is_outdated": false,
-    "version": 4,
-    "locals": { // <= New args
-      "kind": "scope_declaration", // <= New node
-      "args": {},
-      "body": [
-        { // SCENARIO A: Setting the parent value to a 'literal''
-          "kind": "local_declaration", // <= New node
-          "args": {
-            "label": "parent",
-            "data_value": "POINT_LITERAL_OR_WHATEVER_GOES_HERE"
-          }
-        },
-        { // SCENARIO B: Defer assignment to parent, only set expected (eventual) type
-          "kind": "parameter_declaration", // <= New node
-          "args": {
-            "label": "parent",
-            "data_type": "EXPECTED_KIND_GOES_HERE"
-          }
-        }
-      ]
-    }
-  },
-  "body": [
-    {
-      "kind": "move_absolute",
-      "args": {
-        "speed": 800,
-        "location": {
-          "kind": "identifier", // <== New Node- this is how you use variables.
-          "args": {
-            "label": "parent"
-          }
-        },
-        "offset": {
-          "kind": "coordinate",
-          "args": {
-            "x": 0,
-            "y": 0,
-            "z": 0
-          }
-        }
-      }
-    }
-  ]
-}

webpack/farmware/weed_detector/actions.tsx

@@ -55,9 +55,8 @@ export function deletePoints(
           prog.finish();
         })
         .catch(function (e) {
-          error(t("Some {{points}} failed to delete. Please try again.", {
-            points: pointName
-          }));
+          error(t("Some {{points}} failed to delete." +
+            " Are they in use by sequences?", { points: pointName }));
           prog.finish();
         });
     } catch (e) {