From 025d3251e723a26eeaeb523dcb7fa424cc8b67e8 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Wed, 19 Apr 2017 09:08:22 -0400
Subject: [PATCH] sync package and license ver update todo list

---
 js/license.js |  2 +-
 notes.md      | 31 ++++++++++----------------
 package.json  | 62 +++++++++++++++++++++++++++------------------------
 3 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/js/license.js b/js/license.js
index d5c5d593..ca3247db 100644
--- a/js/license.js
+++ b/js/license.js
@@ -1,7 +1,7 @@
 var exports = {
     COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
     LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
-    VERSION:"1.0.59"
+    VERSION:"1.0.60"
 };
 if (!module) var module = {};
 module.exports = exports;
diff --git a/notes.md b/notes.md
index a2c5968b..8ce23406 100644
--- a/notes.md
+++ b/notes.md
@@ -1,13 +1,12 @@
---( global )--
+# Kiri:Moto todo
 
 * prevent text selection of non-input
 * widget general add-ons (fdm supports, cam tabs)
 * bail on decimation if it's proving ineffective
 * improve decimation speed by avoiding in/out of Point
 * dismissable transient message/alert
-* modal non-alert-based dialog
-* modal spinner
-* ability to cancel slice operations!
+* modal non-alert-based dialog & spinner
+* ability to cancel slice operations
 * server-side processing
 * saving workspace doesn't preserve widget positions
 * move more kiri code (like printing) into modules like serial
@@ -21,7 +20,7 @@
 * remember object's original position/orientation for reset/multi-object import alignment
 * gcode import break up "layers" on z move with no x/y move
 
---( onshape )--
+# Onshape todo
 
 * popup warning when detect 3rd party storage blocked (chrome)
 * watch for changed part version to prompt re-import
@@ -29,7 +28,7 @@
 * remap mouse/kbd to match onshape when running inside?
 * assembly import
 
---( cam )--
+# CAM todo
 
 * ease-in and ease-out especially on tab cut-out start/stop
 * import options: unify bodies.
@@ -59,7 +58,7 @@
 * check normals for downward facing facets. mark top for slice skirt/pancake
 * detect holes thru bottom and cutout outline vs mill out entire void
 
---( fdm )--
+# FDM todo
 
 * implement gyroid infill * https://en.wikipedia.org/wiki/Gyroid
 * fan / layer control * update forum
@@ -82,20 +81,21 @@
 * bottom layer of a bridge: underextrude/stretch?
 * dual extruder support
 
---( laser )--
+# Laser todo
 
 * overcuts, radii for drag knives
 * sla :: svg modified from http://garyhodgson.github.io/slic3rsvgviewer/?file=examples/belt_pulley3.svg
 
---( reference )--
+
+# References
 
 * shader examples to enable object-clipping
-* -----
+  -----
 * http://jsfiddle.net/LK84y/9/
 * http://www.html5rocks.com/en/tutorials/webgl/shaders/
 
-* more reading
-* -----
+* other
+  -----
 * http://lcamtuf.coredump.cx/gcnc/full/
 * http://www.tcs.fudan.edu.cn/rudolf/Courses/Algorithms/Alg_cs_07w/Webprojects/Zhaobo_hull/
 * https://en.wikipedia.org/wiki/Graham_scan
@@ -103,10 +103,3 @@
 * http://hackaday.com/2016/01/22/pack-your-plywood-cuts-with-genetic-algortihms/
 * http://wiki.imal.org/howto/cnc-milling-introduction-cutting-tools
 * http://www.twak.co.uk/2011/01/degeneracy-in-weighted-straight.html
-
-* grbl & universal json serial port sender
-* -----
-* https://github.com/johnlauer/serial-port-json-server
-* https://github.com/grbl/grbl/wiki/Interfacing-with-Grbl
-* https://github.com/synthetos/TinyG/wiki/TinyG-Command-Line
-* https://github.com/synthetos/TinyG/wiki/Tinyg-Communications-Programming
diff --git a/package.json b/package.json
index 38ef820b..561062e5 100644
--- a/package.json
+++ b/package.json
@@ -1,31 +1,35 @@
 {
-  "name": "gridspace",
-  "version": "1.0.0",
-  "description": "gridspace 3d slice & modeling tools",
-  "author": "Stewart Allen <stewart.allen@gmail.com>",
-  "private": true,
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/stewartoallen/gridspace.git"
-  },
-  "keywords": ["gridspace", "kiri", "kirimoto", "3d", "slicer", "CAM", "laser", "gcode"],
-  "scripts": {
-    "start": "node js/web-server debug",
-    "start-web": "node js/web-server nolocal"
-  },
-  "dependencies": {
-    "connect": "3.3.x",
-    "compression": "1.4.x",
-    "serve-static": "1.10.x",
-    "n3d-threejs": "72.0.x",
-    "tween.js": "0.14.x",
-    "uglify-js": "2.7.x",
-    "leveldown": "latest",
-    "levelup": "latest",
-    "validator": "4.2.x",
-    "pixi.js": "3.0.x",
-    "moment": "2.11.x",
-    "request": "2.67.x",
-    "express-useragent": "0.2.x"
-  }
+    "name": "grid.space webgl apps",
+    "version": "1.0.60",
+    "description": "grid.space 3d slice & modeling tools",
+    "author": "Stewart Allen <sa@grid.space>",
+    "private": false,
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/gridspace/apps.git"
+    },
+    "keywords": [
+            "grid.space", "3d",
+            "kiri:moto", "kirimoto", "kiri", "slicer", "CAM", "laser", "gcode",
+            "meta:moto", "metamoto"
+    ],
+    "scripts": {
+        "start": "node js/web-server debug",
+        "start-web": "node js/web-server nolocal"
+    },
+    "dependencies": {
+        "connect": "3.3.x",
+        "compression": "1.4.x",
+        "serve-static": "1.10.x",
+        "n3d-threejs": "72.0.x",
+        "tween.js": "0.14.x",
+        "uglify-js": "2.7.x",
+        "leveldown": "latest",
+        "levelup": "latest",
+        "validator": "4.2.x",
+        "pixi.js": "3.0.x",
+        "moment": "2.11.x",
+        "request": "2.67.x",
+        "express-useragent": "0.2.x"
+    }
 }