AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tool import now does a merge instead of overwrite

Browse source
This commit is contained in:
Stewart Allen 2023-03-04 22:59:49 -05:00
commit 99cc19622d
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
release.md
View file

@ -3,7 +3,7 @@
Full docs @ https://docs.grid.space/projects/kiri-moto Full docs @ https://docs.grid.space/projects/kiri-moto
# Release 3.9 # Release 3.9 (2023-03-11)
* more graceful handling of security contexts blocking SharedArrayBuffer * more graceful handling of security contexts blocking SharedArrayBuffer
* CAM decrease cutting speed when entire tool is engaged in roughing * CAM decrease cutting speed when entire tool is engaged in roughing
@ -16,7 +16,6 @@ Full docs @ https://docs.grid.space/projects/kiri-moto
* CAM add rough all stock to aid lathe mode * CAM add rough all stock to aid lathe mode
* CAM stock is now always on, whether offset or absolute * CAM stock is now always on, whether offset or absolute
* CAM add lathe worker parallelization (2x - 6x speedup) * CAM add lathe worker parallelization (2x - 6x speedup)
- add auto-disable for ops mismatched to axis indexed state
- add "common" overrides in ops (z top/bottom/thru, direction) - add "common" overrides in ops (z top/bottom/thru, direction)

8
src/kiri/settings.js
View file

@ -582,7 +582,13 @@ function settingsImport(data, ask) {
api.space.restore(() => { ui.sync() }, true); api.space.restore(() => { ui.sync() }, true);
} }
if (isTools && Array.isArray(data.tools)) { if (isTools && Array.isArray(data.tools)) {
settings.tools = data.tools; const settool = settings.tools;
for (let tool of data.tools) {
if (settool.filter(t => t.id === tool.id).length === 0) {
settool.push(tool);
}
}
// settings.tools = data.tools;
api.show.tools(); api.show.tools();
} }
} }