From c3a6c876cbd807418a47b71892d833d6376a41f5 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 16 Jun 2024 15:53:19 -0400 Subject: [PATCH] bump rev 4.0.D17 --- bin/electron-pre.js | 3 +++ package.json | 2 +- src/kiri-mode/cam/ops.js | 2 +- src/main/kiri.js | 2 +- src/moto/license.js | 2 +- web/kiri/manifest.json | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/electron-pre.js b/bin/electron-pre.js index 1b85bb86..e31e4462 100644 --- a/bin/electron-pre.js +++ b/bin/electron-pre.js @@ -9,6 +9,9 @@ fs.copySync("src", srcTmp, { dereference: true }); const webTmp = path.join('tmp','web'); fs.copySync("web", webTmp, { dereference: true }); +// const modTmp = path.join('tmp','mod'); +// fs.copySync("mod", modTmp, { dereference: true }); + // pre-build asset cache server({ dryrun: true, diff --git a/package.json b/package.json index 8f0166ee..e218ecc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grid-apps", - "version": "4.0.16D", + "version": "4.0.17D", "description": "grid.space 3d slice & modeling tools", "author": "Stewart Allen ", "license": "MIT", diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js index 255d1e1c..108a4b10 100644 --- a/src/kiri-mode/cam/ops.js +++ b/src/kiri-mode/cam/ops.js @@ -505,7 +505,7 @@ class OpOutline extends CamOp { .map(v => (parseFloat(v) - 0.01).round(5)) .filter(v => v > 0 && indices.indexOf(v) < 0); indices = indices.appendAll(flats).sort((a,b) => b-a); - indices = indices.filter(v => v >= zBottom); + indices = indices.filter(v => v - zBottom >= -0.001); // console.log('indices', ...indices, {zBottom, slicer}); let cnt = 0; let tot = 0; diff --git a/src/main/kiri.js b/src/main/kiri.js index d22892d2..64a7cfe7 100644 --- a/src/main/kiri.js +++ b/src/main/kiri.js @@ -15,7 +15,7 @@ gapp.main("main.kiri", [], (root) => { const modfns = root.kirimod = ( root.kirimod || [] ); const kiri = root.kiri = { - beta: 4016, + beta: 4017, driver: {}, // driver modules load(fn) { modfns.push(fn); diff --git a/src/moto/license.js b/src/moto/license.js index 4506ddf9..8a4d60c0 100644 --- a/src/moto/license.js +++ b/src/moto/license.js @@ -5,7 +5,7 @@ let terms = { COPYRIGHT: "Copyright (C) Stewart Allen - All Rights Reserved", LICENSE: "See the license.md file included with the source distribution", - VERSION: (is_self ? self : this).debug_version || "4.0.D16" + VERSION: (is_self ? self : this).debug_version || "4.0.D17" }; if (typeof(module) === 'object') { diff --git a/web/kiri/manifest.json b/web/kiri/manifest.json index c52dd519..fd08a7d7 100644 --- a/web/kiri/manifest.json +++ b/web/kiri/manifest.json @@ -1,5 +1,5 @@ { - "name": "Kiri:Moto 4.0.D16", + "name": "Kiri:Moto 4.0.D17", "short_name": "Kiri:Moto", "description": "Slicer for 3D printers, CNC mills, laser cutters and more", "start_url": "/kiri/",