Merge branch 'rel-4.1' of https://github.com/GridSpace/grid-apps into cam-arcs

package.json

@@ -1,6 +1,6 @@
 {
     "name": "grid-apps",
-    "version": "4.1.7",
+    "version": "4.1.8",
     "description": "grid.space 3d slicing & modeling tools",
     "author": "Stewart Allen <sa@grid.space>",
     "license": "MIT",

src/kiri-dev/cam/RatRig.StrongHold.ONE.750x750mm.json

@@ -0,0 +1,30 @@
+{
+    "file-ext": "nc",
+    "token-space": " ",
+    "strip-comments": false,
+    "pre":[
+        "G21 ; set units to MM (required)",
+        "G90 ; absolute position mode (required)",
+        "G94 ; set unit to mm/minute",
+        "G0 F3000 ; default rapid move speed",
+        "; M3 S15000 ; Uncomment if you want to turn the spindle on by default"
+    ],
+    "post":[
+        "M5  ; spindle off",
+        "M30 ; program end"
+    ],
+    "tool-change":[
+        "M6 T{tool} ; change tool to '{tool_name}'"
+    ],
+    "dwell":[
+        "G4 P{time} ; dwell for {time}ms"
+    ],
+    "spindle":[
+        "M3 S{speed}"
+    ],
+    "settings": {
+        "bed_width": 744,
+        "bed_depth": 750,
+        "build_height": 90
+    }
+}

src/moto/license.js

@@ -5,7 +5,7 @@
     let terms = {
         COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved",
         LICENSE: "See the license.md file included with the source distribution",
-        VERSION: (is_self ? self : this).debug_version || "4.1.7"
+        VERSION: (is_self ? self : this).debug_version || "4.1.8"
     };
 
     if (typeof(module) === 'object') {

web/kiri/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name": "Kiri:Moto 4.1.7",
+    "name": "Kiri:Moto 4.1.8",
     "short_name": "Kiri:Moto",
     "description": "Slicer for 3D printers, CNC mills, laser cutters and more",
     "start_url": "/kiri/",