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

Merge branch 'rel-4.3' into helical-op

Browse source
This commit is contained in:
bakedpotatolord 2025-07-17 13:50:34 -06:00
commit 45ba762d1e
60 changed files with 1116 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

9
web/kiri/engine.html
View file

@ -88,8 +88,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js"></script>
<!-- <script src="/lib/kiri-run/engine.js" type="module"></script> -->
<script type="module">
import { Engine } from '/lib/kiri-run/engine.js';
const engine = new Engine();
import { Engine } from '/lib/kiri/run/engine.js';
let edit, saveit = "";
function $(id) { return document.getElementById(id) }
function onload() {
@ -127,7 +126,7 @@
eval(`(function(){${code}})()`);
}
function demoFDM() {
engine
new Engine()
.setListener(display_message)
.load("/obj/cube.stl")
.then(eng => eng.setProcess({
@ -144,7 +143,7 @@
}
function demoCAM(){
engine
new Engine()
.setListener(display_message)
.load("/obj/cube.stl")
// should to call widget.setTopZ here ideally
@ -244,7 +243,7 @@
}
function demoLASER(){
engine
new Engine()
.setListener(display_message)
.load("/obj/cube.stl")
// should to call widget.setTopZ here ideally

2
web/kiri/frame.html
View file

@ -82,7 +82,7 @@
}
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js"></script>
<script src="/lib/kiri-run/frame.js"></script>
<script src="/lib/kiri/run/frame.js"></script>
<script>
let defc = [
"let api = kiri.frame;",

2
web/kiri/index.css
View file

@ -34,7 +34,7 @@
/* surface size configuration and font import */
@font-face {
font-family: 'Russo One';
src: url('/moto/russo-one.ttf');
src: url('../moto/russo-one.ttf');
}
@media only screen and (max-width : 1000px) {
.top-menu > span > label {

2
web/kiri/index.html
View file

@ -14,7 +14,7 @@
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta http-equiv="origin-trial" content="Aixo1di7jfA+ystPFy70vGYyODYVAju1y8EQWwdkdtl5sB7i990oDCnqLQntpfl7NsW74wz99Og7xgQqeLKiBQsAAAB0eyJvcmlnaW4iOiJodHRwczovL2dyaWQuc3BhY2U6NDQzIiwiZmVhdHVyZSI6IlVucmVzdHJpY3RlZFNoYXJlZEFycmF5QnVmZmVyIiwiZXhwaXJ5IjoxNzUzMTQyNDAwLCJpc1N1YmRvbWFpbiI6dHJ1ZX0=">
<meta http-equiv="origin-trial" content="AobHyD9RXtmfFOTcY506ANNJjG8lYuuvQ3/C7YJvprSP6Kk2pjKIBSKAUbUh64Nx6aCZaqlZ+7sSSswiIFHflgYAAAB0eyJvcmlnaW4iOiJodHRwczovL2dyaWQuc3BhY2U6NDQzIiwiZmVhdHVyZSI6IlVucmVzdHJpY3RlZFNoYXJlZEFycmF5QnVmZmVyIiwiZXhwaXJ5IjoxNzY5NDcyMDAwLCJpc1N1YmRvbWFpbiI6dHJ1ZX0=">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
<title>Kiri:Moto</title>
<link rel="icon" href="favicon.ico">

2
web/kiri/lang/en.js
View file

@ -875,6 +875,8 @@ self.lang['en-us'] = {
cx_fast_l: ["disable overhang detection","can be faster and use less","memory with complex models","but fails with overhangs","try enabling if slicing","hangs during shadowing"],
cx_true_s: "true shadow",
cx_true_l: ["computationally correct shadow","will be slower but produce","better cuts for complex parts"],
cx_arce_s: "arc output",
cx_arce_l: ["EXPERIMENTAL: enable path to arc conversion"],
cx_arct_s: "arc tolerance",
cx_arct_l: ["convert cicrular paths to arcs;","center point drift tolerance","when matching arc points","consider values around 0.15","in mm, or 0.006 inches;","High values may cause","unexpected behavior","0 to disable"],
cx_arcr_s: "arc resolution",

6
web/kiri/manifest.json
View file

@ -1,5 +1,5 @@
{
"name": "Kiri:Moto 4.2.0",
"name": "Kiri:Moto 4.3.0",
"short_name": "Kiri:Moto",
"description": "Slicer for 3D printers, CNC mills, laser cutters and more",
"start_url": "/kiri/",
@ -9,7 +9,7 @@
"background_color": "#ffffff",
"orientation": "landscape-primary",
"icons": [
{ "src": "/kiri/logo-cube-512.png", "type": "image/png", "sizes": "512x512" },
{ "src": "/kiri/logo-cube-144.png", "type": "image/png", "sizes": "144x144" }
{ "src": "./logo-cube-512.png", "type": "image/png", "sizes": "512x512" },
{ "src": "./logo-cube-144.png", "type": "image/png", "sizes": "144x144" }
]
}