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

start 4.1 development

Browse source
This commit is contained in:
Stewart Allen 2024-09-14 11:36:56 -04:00
commit 66199e035b
7 changed files with 40 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "grid-apps", "name": "grid-apps",
"version": "4.0.29", "version": "4.1,0-D0",
"description": "grid.space 3d slice & modeling tools", "description": "grid.space 3d slice & modeling tools",
"author": "Stewart Allen <sa@grid.space>", "author": "Stewart Allen <sa@grid.space>",
"license": "MIT", "license": "MIT",

61
readme.md
View file

@ -1,10 +1,36 @@
## Grid.Space Web Applications ## Grid.Space Applications
[![Website](https://img.shields.io/website?url=https%3A%2F%2Fgrid.space%2F)](https://grid.space/kiri/) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fgrid.space%2F)](https://grid.space/kiri/)
![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.3) ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.9)
![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.4) ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-4.0)
![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.5) ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-4.1)
![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/GridSpace/grid-apps/rel-3.6)
![GitHub commit activity](https://img.shields.io/github/commit-activity/w/GridSpace/grid-apps)
![GitHub last commit](https://img.shields.io/github/last-commit/GridSpace/grid-apps)
![GitHub contributors](https://img.shields.io/github/contributors/GridSpace/grid-apps)
![GitHub](https://img.shields.io/github/license/GridSpace/grid-apps)
## Community & Documentation
[Discord](https://discord.com/invite/suyCCgr)
| [Forums](https://forum.grid.space/)
| [YouTube](https://www.youtube.com/c/gridspace)
| [Twitter](https://twitter.com/grid_space_3d)
| [Documentation](https://docs.grid.space/)
[![Discord](https://img.shields.io/discord/688863523207774209)](https://discord.com/channels/688863523207774209/688863523211968535)
![Twitter Follow](https://img.shields.io/twitter/follow/grid_space_3d?label=follow&style=social)
## Free and Open Source
Kiri:Moto and Mesh:Tool are completely open source and free for use without restriction. Over 12 years in development, this passion project has grown well beyond its original scope. It has consumed most of my free time for many years. Please consider donating to support continued development.
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/gridspace3d?locale.x=en_US)
## HTML5 Web Apps (Installable)
[`Grid.Space`](https://grid.space) hosts [several live versions](https://grid.space/choose) of this code [`Grid.Space`](https://grid.space) hosts [several live versions](https://grid.space/choose) of this code
@ -12,6 +38,7 @@
[`Mesh:Tool`](https://grid.space/mesh) is a browser-based mesh repair and editing tool [`Mesh:Tool`](https://grid.space/mesh) is a browser-based mesh repair and editing tool
## Electron Builds (Desktop Binaries) ## Electron Builds (Desktop Binaries)
https://github.com/GridSpace/grid-apps/releases/ https://github.com/GridSpace/grid-apps/releases/
@ -28,30 +55,6 @@ chmod 755 KiriMoto-linux-x86_64.AppImage
The Windows and Mac binaries are not signed, so you will need to jump through a few safety hoops to get them to open the first time. The Windows and Mac binaries are not signed, so you will need to jump through a few safety hoops to get them to open the first time.
## Primary Documentation
https://docs.grid.space/projects/kiri-moto
https://docs.grid.space/projects/mesh-tool
## Development Activity
![GitHub commit activity](https://img.shields.io/github/commit-activity/w/GridSpace/grid-apps)
![GitHub last commit](https://img.shields.io/github/last-commit/GridSpace/grid-apps)
![GitHub contributors](https://img.shields.io/github/contributors/GridSpace/grid-apps)
## Community Engagement
[Discord](https://discord.com/invite/suyCCgr)
| [YouTube](https://www.youtube.com/c/gridspace)
| [Twitter](https://twitter.com/grid_space_3d)
[![Discord](https://img.shields.io/discord/688863523207774209)](https://discord.com/channels/688863523207774209/688863523211968535)
![GitHub](https://img.shields.io/github/license/GridSpace/grid-apps)
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/gridspace3d?locale.x=en_US)
![Twitter Follow](https://img.shields.io/twitter/follow/grid_space_3d?label=follow&style=social)
## Testing Locally (with Docker) ## Testing Locally (with Docker)
``` ```

3
src/kiri-mode/cam/slice.js
View file

@ -28,8 +28,7 @@ const POLY = polygons;
* @param {Function} output * @param {Function} output
*/ */
CAM.slice = async function(settings, widget, onupdate, ondone) { CAM.slice = async function(settings, widget, onupdate, ondone) {
let mesh = widget.mesh, let proc = settings.process,
proc = settings.process,
stock = settings.stock || {}, stock = settings.stock || {},
isIndexed = proc.camStockIndexed, isIndexed = proc.camStockIndexed,
camOps = widget.camops = [], camOps = widget.camops = [],

4
src/kiri/init.js
View file

@ -2687,7 +2687,9 @@ gapp.register("kiri.init", [], (root, exports) => {
// warn users they are running a beta release // warn users they are running a beta release
if (kiri.beta && kiri.beta > 0 && sdb.kiri_beta != kiri.beta) { if (kiri.beta && kiri.beta > 0 && sdb.kiri_beta != kiri.beta) {
api.show.alert("this is a beta / development release"); api.show.alert("CAUTION");
api.show.alert("this is a development release");
api.show.alert("and may not function properly");
sdb.kiri_beta = kiri.beta; sdb.kiri_beta = kiri.beta;
} }

2
src/main/kiri.js
View file

@ -15,7 +15,7 @@ gapp.main("main.kiri", [], (root) => {
const modfns = root.kirimod = ( root.kirimod || [] ); const modfns = root.kirimod = ( root.kirimod || [] );
const kiri = root.kiri = { const kiri = root.kiri = {
beta: 0, beta: 4100,
driver: {}, // driver modules driver: {}, // driver modules
load(fn) { load(fn) {
modfns.push(fn); modfns.push(fn);

2
src/moto/license.js
View file

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

2
web/kiri/manifest.json
View file

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