From 2aee317d422937b57dc1218900ec6f9798d0dc48 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 13:09:31 +0100
Subject: [PATCH 001/163] move ultimaker 2 go

---
 src/settings/printer.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 3bc6504..9cab853 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -1,3 +1,11 @@
+ultimaker2go:
+  title: Ultimaker 2 Go
+  heatedBed: false
+  filamentThickness: 2.85
+  dimensions:
+    x: 120
+    y: 120
+    z: 112
 _3Dison_plus:
   title: 3Dison plus
   heatedBed: false
@@ -271,14 +279,6 @@ ultimaker2_plus:
     x: 223
     y: 223
     z: 305
-ultimaker2go:
-  title: Ultimaker 2 Go
-  heatedBed: false
-  filamentThickness: 2.85
-  dimensions:
-    x: 120
-    y: 120
-    z: 112
 ultimaker_original_plus:
   title: Ultimaker Original Plus
   heatedBed: true

From 43af4e05ab76a1023138c47dd6347226ba88bfb4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 13:43:53 +0100
Subject: [PATCH 002/163] add doodle3d printer

---
 src/settings/printer.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 9cab853..18dd9fa 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -1,3 +1,30 @@
+doodle3d_printer:
+  startCode: |-
+    M140 S{bedTemperature}
+    M104 S{temperature}
+    G28
+    M109 S{temperature}
+    M82
+    G1 Z10.0 F6000
+    G92 E0
+    G1 F200 E3
+    G92 E0
+  endCode: |-
+    M104 S0
+    M140 S0
+    G92 E1
+    G1 E-1 F300
+    G28 X0 Y0
+    M84
+    M82
+    M104 S0
+  title: Doodle3D Printer
+  heatedBed: true
+  filamentThickness: 1.75
+  dimensions:
+    x: 120
+    y: 120
+    z: 120
 ultimaker2go:
   title: Ultimaker 2 Go
   heatedBed: false

From 10fb3714c78665d81fbd0e2ac005eb2c14868a12 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 13:44:59 +0100
Subject: [PATCH 003/163] add support for start and end code

---
 src/sliceActions/helpers/GCode.js |  9 +++++++++
 src/sliceActions/slice.js         | 29 ++++++++++++++++++-----------
 src/sliceActions/slicesToGCode.js |  4 ++++
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 6955cbf..4683c10 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -122,6 +122,15 @@ export default class {
     return this;
   }
 
+  addGCode(gcode, { temperature, bedTemperature, heatedbed }) {
+    gcode = gcode
+      .replace(/{temperature}/gi, temperature)
+      .replace(/{bedTemperature}/gi, bedTemperature)
+      .replace(/{if heatedBed}/gi, heatedbed ? '' : ';');
+
+    this._addGCode(gcode);
+  }
+
   getGCode() {
     return {
       gcode: this._gcode,
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 57b8232..a7064e3 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -76,16 +76,20 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
 function gcodeToString(gcode) {
   const currentValues = {};
   return gcode.reduce((string, command) => {
-    let first = true;
-    for (const action in command) {
-      const value = command[action];
-      const currentValue = currentValues[action];
-      if (first) {
-        string += `${action}${value}`;
-        first = false;
-      } else if (currentValue !== value) {
-        string += ` ${action}${value}`;
-        currentValues[action] = value;
+    if (typeof command === 'string') {
+      string += command;
+    } else {
+      let first = true;
+      for (const action in command) {
+        const value = command[action];
+        const currentValue = currentValues[action];
+        if (first) {
+          string += `${action}${value}`;
+          first = false;
+        } else if (currentValue !== value) {
+          string += ` ${action}${value}`;
+          currentValues[action] = value;
+        }
       }
     }
     string += '\n';
@@ -101,7 +105,10 @@ function createGcodeGeometry(gcode) {
 
   let lastPoint = [0, 0, 0];
   for (let i = 0; i < gcode.length; i ++) {
-    const { G, F, X, Y, Z } = gcode[i];
+    const command = gcode[i];
+    if (typeof command === 'string') continue;
+
+    const { G, F, X, Y, Z } = command;
 
     if (X || Y || Z) {
       if (G === 1) {
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 790385d..cbc38a2 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -22,6 +22,8 @@ export default function slicesToGCode(slices, settings) {
 
   const gcode = new GCode(nozzleToFilamentRatio);
 
+  if (settings.startCode) gcode.addGCode(settings.startCode, settings);
+
   const defaultProfile = {
     travelProfile: travel,
     retractionProfile: retraction
@@ -77,6 +79,8 @@ export default function slicesToGCode(slices, settings) {
     }
   }
 
+  if (settings.endCode) gcode.addGCode(settings.endCode, settings);
+
   return gcode.getGCode();
 }
 

From ecc37273caa76baef0e06b90120b1c2a61e89240 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 13:47:16 +0100
Subject: [PATCH 004/163] better error throwing

---
 src/interface/utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 492d26b..5feb1c1 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -131,7 +131,7 @@ export async function slice(target, name, mesh, settings, printers, quality, mat
       steps = 2;
       break;
     default:
-      steps = 1;
+      throw new Error('unknown target');
       break;
   }
 
@@ -197,6 +197,7 @@ export async function slice(target, name, mesh, settings, printers, quality, mat
     }
 
     default:
+      throw new Error('unknown target');
       break;
   }
 }

From 212075e3069832afc1fd0b6256e1c258bc8782c8 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 14:21:42 +0100
Subject: [PATCH 005/163] pack scene state in scene object

---
 src/interface/index.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 6fc92c9..bc31557 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -139,15 +139,15 @@ class Interface extends React.Component {
   }
 
   componentWillUnmount() {
-    const { editorControls, mesh: { material }, renderer } = this.state;
+    const { scene: { editorControls, mesh: { material } }, renderer } = this.state;
     editorControls.dispose();
     material.dispose();
     renderer.dispose();
   }
 
   resetMesh = () => {
-    const { mesh, render, isSlicing } = this.state;
     if (isSlicing) return;
+    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
     if (mesh) {
       mesh.position.set(0, 0, 0);
       mesh.scale.set(1, 1, 1);
@@ -161,8 +161,8 @@ class Interface extends React.Component {
   scaleUp = () => this.scaleMesh(0.9);
   scaleDown = () => this.scaleMesh(1.0 / 0.9);
   scaleMesh = (factor) => {
-    const { mesh, render, isSlicing } = this.state;
     if (isSlicing) return;
+    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
     if (mesh) {
       mesh.scale.multiplyScalar(factor);
       mesh.updateMatrix();
@@ -175,8 +175,8 @@ class Interface extends React.Component {
   rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
   rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
   rotate = (axis, angle) => {
-    const { mesh, render, isSlicing } = this.state;
     if (isSlicing) return;
+    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
     if (mesh) {
       mesh.rotateOnWorldAxis(axis, angle);
       placeOnGround(mesh);
@@ -185,7 +185,7 @@ class Interface extends React.Component {
   };
 
   slice = async (target) => {
-    const { isSlicing, settings, printers, quality, material, mesh: { matrix } } = this.state;
+    const { isSlicing, isLoading, settings, printers, quality, scene: { material, mesh: { matrix } } } = this.state;
     const { name, mesh } = this.props;
 
     if (isSlicing) return;
@@ -233,7 +233,8 @@ class Interface extends React.Component {
   };
 
   componentWillUpdate(nextProps, nextState) {
-    const { box, render, setSize } = this.state;
+    if (!this.state.scene) return;
+    const { scene: { box, render, setSize } } = this.state;
     let changed = false;
     if (box && nextState.settings.dimensions !== this.state.settings.dimensions) {
       const { dimensions } = nextState.settings;
@@ -245,14 +246,14 @@ class Interface extends React.Component {
   }
 
   componentDidUpdate() {
-    const { updateCanvas } = this.state;
+    const { scene: { updateCanvas } } = this.state;
     const { canvas } = this.refs;
     if (updateCanvas && canvas) updateCanvas(canvas);
   }
 
   onResize3dView = (width, height) => {
     window.requestAnimationFrame(() => {
-      const { setSize } = this.state;
+      const { scene: { setSize } } = this.state;
       const { pixelRatio } = this.props;
       if (setSize) setSize(width, height, pixelRatio);
     });

From 0d64b62f12d95cb5a8534628dc2305fec923de1c Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 14:40:52 +0100
Subject: [PATCH 006/163] update bed temperature of doodle3d printer

---
 src/settings/printer.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 18dd9fa..e67a4bb 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -20,6 +20,7 @@ doodle3d_printer:
     M104 S0
   title: Doodle3D Printer
   heatedBed: true
+  bedTemperature: 50
   filamentThickness: 1.75
   dimensions:
     x: 120

From 457f110dd2dd23b2757d2b47c399142a61aa10c4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:17:38 +0100
Subject: [PATCH 007/163] slicer can now fetch d3 files from cloud

---
 index.js               |  25 ++----
 package-lock.json      | 181 ++++++++++++++++++++++++++++++-----------
 package.json           |   3 +-
 src/interface/index.js |  74 ++++++++++++-----
 src/interface/utils.js |  19 +++--
 5 files changed, 209 insertions(+), 93 deletions(-)

diff --git a/index.js b/index.js
index 54d517b..e6ae0cb 100644
--- a/index.js
+++ b/index.js
@@ -1,17 +1,13 @@
 import 'babel-polyfill'
 import React from 'react';
 import { Interface } from 'doodle3d-slicer';
-import doodleURL from '!url-loader!./models/Doodle_2.d3sketch';
 import { render } from 'react-dom';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import injectTapEventPlugin from 'react-tap-event-plugin';
 import jss from 'jss';
 import preset from 'jss-preset-default';
 import normalize from 'normalize-jss';
-import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
-import createSceneData from 'doodle3d-core/d3/createSceneData.js';
-import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
-import { Matrix4 } from 'three/src/math/Matrix4.js';
+import queryString from 'query-string';
 
 injectTapEventPlugin();
 
@@ -26,17 +22,10 @@ jss.createStyleSheet({
   }
 }).attach();
 
-function init(mesh) {
-  render((
-    <MuiThemeProvider>
-      <Interface mesh={mesh} name="doodle"/>
-    </MuiThemeProvider>
-  ), document.getElementById('app'));
-}
+const { file } = queryString.parse(location.search);
 
-fetch(doodleURL)
-  .then(resonse => resonse.json())
-  .then(json => JSONToSketchData(json))
-  .then(file => createSceneData(file))
-  .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
-  .then(init);
+render((
+  <MuiThemeProvider>
+    <Interface file={file} name="doodle"/>
+  </MuiThemeProvider>
+), document.getElementById('app'));
diff --git a/package-lock.json b/package-lock.json
index cd11baa..d1dc294 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
     "@doodle3d/doodle3d-core": {
-      "version": "github:doodle3d/doodle3d-core#0c4e410a27ea2df8336a956e966ee16ad8ac04d7",
+      "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
       "dev": true,
       "requires": {
         "@doodle3d/cal": "0.0.8",
@@ -35,16 +35,18 @@
         "@doodle3d/threejs-export-stl": "0.0.5",
         "@doodle3d/touch-events": "0.0.7",
         "babel-polyfill": "6.26.0",
-        "bezier-js": "2.2.3",
+        "bezier-js": "2.2.5",
         "blueimp-canvas-to-blob": "3.14.0",
         "bowser": "1.8.1",
         "fit-curve": "0.1.6",
+        "google-fonts-webpack-plugin": "0.4.4",
         "imports-loader": "0.7.1",
-        "jss": "9.4.0",
+        "jss": "9.5.1",
         "keycode": "2.1.9",
         "lodash": "4.17.4",
         "memoizee": "0.3.10",
-        "pouchdb": "6.4.0",
+        "normalize-wheel": "1.0.1",
+        "pouchdb": "6.4.1",
         "proptypes": "1.1.0",
         "raf": "3.4.0",
         "ramda": "0.21.0",
@@ -66,9 +68,9 @@
       },
       "dependencies": {
         "jss": {
-          "version": "9.4.0",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.4.0.tgz",
-          "integrity": "sha512-ckJpElL5CimehboeLDQoHeY7mlxn0KPnPn2EZVbn6pomhfbTXiQJ6fAJXSp9rUM2hPtE0PG8Swzdy9vhB2v82w==",
+          "version": "9.5.1",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
+          "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
           "dev": true,
           "requires": {
             "is-in-browser": "1.1.3",
@@ -1716,9 +1718,9 @@
       }
     },
     "bezier-js": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz",
-      "integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU=",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
+      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==",
       "dev": true
     },
     "big.js": {
@@ -1952,6 +1954,12 @@
         "isarray": "1.0.0"
       }
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-from": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
@@ -2456,6 +2464,11 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@@ -2729,9 +2742,9 @@
       }
     },
     "encoding-down": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-3.0.0.tgz",
-      "integrity": "sha1-IGjLZ7E3G14frJtfF44FpVUr+l4=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-3.0.1.tgz",
+      "integrity": "sha512-uvx+39YNqiPLqhXAvOSGBVy/oYBh4p2ShwG9YFCipwgfOhnVIOxuOPE3R9dEGM44bn0VHIrC3ojXq6lNf2ulwg==",
       "dev": true,
       "requires": {
         "abstract-leveldown": "3.0.0",
@@ -2748,9 +2761,9 @@
       }
     },
     "end-of-stream": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
         "once": "1.4.0"
@@ -2836,9 +2849,9 @@
       }
     },
     "es6-error": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz",
-      "integrity": "sha1-7sXHJurO9Rt/a3PCDbbhsTsGnJg=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true
     },
     "es6-iterator": {
@@ -3173,6 +3186,15 @@
         }
       }
     },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
     "file-saver": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
@@ -4081,14 +4103,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -4099,6 +4113,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -4338,6 +4360,36 @@
         "pinkie-promise": "2.0.1"
       }
     },
+    "google-fonts-webpack-plugin": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-0.4.4.tgz",
+      "integrity": "sha512-+e2D9/DVBG9EDydRovzoqMZ658SsTBGbC0c65GyZqkwNvdj8vRSYQKXqbz7/yt7QaXsCPT1MpH45r3ivWOitcw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4",
+        "node-fetch": "1.7.3",
+        "webpack-sources": "0.2.3",
+        "yauzl": "2.9.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
+          "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
+          "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
+          "dev": true,
+          "requires": {
+            "source-list-map": "1.1.2",
+            "source-map": "0.5.6"
+          }
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -5504,7 +5556,7 @@
       "integrity": "sha512-I97zvGOZ6fJ9OFfYv+QmgBpDWbC+UaP5ERJ3oraTyk1v+ABAL4tazris5ym5qL2iLe+qNjXNM/iP8LQcoZMEWw==",
       "dev": true,
       "requires": {
-        "encoding-down": "3.0.0",
+        "encoding-down": "3.0.1",
         "levelup": "2.0.1"
       }
     },
@@ -6198,6 +6250,12 @@
         "white-space-x": "3.0.0"
       }
     },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=",
+      "dev": true
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -6534,6 +6592,12 @@
         "sha.js": "2.4.9"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
     "pepjs": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.4.3.tgz",
@@ -6596,9 +6660,9 @@
       }
     },
     "pouchdb": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.0.tgz",
-      "integrity": "sha512-R9sm7USMctC1/itY9UdtA8iVOF04Ui+rsGnNdO9zLTpolzglWskSL/0B3RQ2OchGYLNgsaZS0UzQ7AQ1SHXobg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.1.tgz",
+      "integrity": "sha512-7YrhsBXbQh/iPA8O5Nzixi9QigaQJjqbbCFr+D7Kc258oeXNW9a0t/tOME1Lh84TJiFRuN9982FGVnrBrUhLiA==",
       "dev": true,
       "requires": {
         "argsarray": "0.0.1",
@@ -6679,7 +6743,7 @@
         "npmlog": "4.1.2",
         "os-homedir": "1.0.2",
         "pump": "1.0.3",
-        "rc": "1.2.2",
+        "rc": "1.2.3",
         "simple-get": "1.4.3",
         "tar-fs": "1.16.0",
         "tunnel-agent": "0.6.0",
@@ -6802,7 +6866,7 @@
       "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.0",
+        "end-of-stream": "1.4.1",
         "once": "1.4.0"
       }
     },
@@ -6818,6 +6882,16 @@
       "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
       "dev": true
     },
+    "query-string": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz",
+      "integrity": "sha512-aM+MkQClojlNiKkO09tiN2Fv8jM/L7GWIjG2liWeKljlOdOPNWr+bW3KQ+w5V/uKprpezC7fAsAMsJtJ+2rLKA==",
+      "requires": {
+        "decode-uri-component": "0.2.0",
+        "object-assign": "4.1.1",
+        "strict-uri-encode": "1.1.0"
+      }
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -6944,9 +7018,9 @@
       "dev": true
     },
     "rc": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
-      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz",
+      "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=",
       "dev": true,
       "requires": {
         "deep-extend": "0.4.2",
@@ -7210,7 +7284,7 @@
       "dev": true,
       "requires": {
         "deep-equal": "1.0.1",
-        "es6-error": "4.0.2",
+        "es6-error": "4.1.1",
         "hoist-non-react-statics": "2.3.1",
         "invariant": "2.2.2",
         "is-promise": "2.1.0",
@@ -7873,14 +7947,10 @@
         "xtend": "4.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-width": {
       "version": "2.1.1",
@@ -7915,6 +7985,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -7991,7 +8070,7 @@
       "dev": true,
       "requires": {
         "bl": "1.2.1",
-        "end-of-stream": "1.4.0",
+        "end-of-stream": "1.4.1",
         "readable-stream": "2.3.3",
         "xtend": "4.0.1"
       }
@@ -9036,6 +9115,16 @@
         }
       }
     },
+    "yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "fd-slicer": "1.0.1"
+      }
+    },
     "yml-loader": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/yml-loader/-/yml-loader-2.1.0.tgz",
diff --git a/package.json b/package.json
index 26cabdb..6d7cfc5 100644
--- a/package.json
+++ b/package.json
@@ -16,11 +16,13 @@
   },
   "dependencies": {
     "@doodle3d/clipper-js": "^1.0.7",
+    "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",
     "lodash": "^4.17.4",
     "material-ui": "^0.19.4",
     "proptypes": "^1.1.0",
+    "query-string": "^5.0.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-jss": "^7.2.0",
@@ -28,7 +30,6 @@
     "three": "^0.88.0"
   },
   "devDependencies": {
-    "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-cli": "6.24.1",
     "babel-loader": "7.0.0",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
diff --git a/src/interface/index.js b/src/interface/index.js
index bc31557..b4e94ec 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -4,7 +4,7 @@ import { Quaternion } from 'three/src/math/Quaternion.js';
 import { Vector3 } from 'three/src/math/Vector3.js';
 import { Mesh } from 'three/src/objects/Mesh.js';
 import PropTypes from 'proptypes';
-import { placeOnGround, createScene, fetchProgress, slice, TabTemplate } from './utils.js';
+import { centerGeometry, placeOnGround, createScene, fetchProgress, slice, TabTemplate } from './utils.js';
 import injectSheet from 'react-jss';
 import RaisedButton from 'material-ui/RaisedButton';
 import FlatButton from 'material-ui/FlatButton';
@@ -21,6 +21,10 @@ import printerSettings from '../settings/printer.yml';
 import materialSettings from '../settings/material.yml';
 import qualitySettings from '../settings/quality.yml';
 import ReactResizeDetector from 'react-resize-detector';
+import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
+import createSceneData from 'doodle3d-core/d3/createSceneData.js';
+import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
+import { Matrix4 } from 'three/src/math/Matrix4.js';
 
 const MAX_FULLSCREEN_WIDTH = 720;
 
@@ -82,7 +86,10 @@ const styles = {
 
 class Interface extends React.Component {
   static propTypes = {
-    mesh: PropTypes.shape({ isMesh: PropTypes.oneOf([true]) }).isRequired,
+    file: PropTypes.oneOfType([
+      PropTypes.shape({ isMesh: PropTypes.oneOf([true]) }),
+      PropTypes.string
+    ]).isRequired,
     classes: PropTypes.objectOf(PropTypes.string),
     defaultSettings: PropTypes.object.isRequired,
     printers: PropTypes.object.isRequired,
@@ -110,9 +117,11 @@ class Interface extends React.Component {
   constructor(props) {
     super(props);
     const { defaultPrinter, defaultQuality, defaultMaterial, printers, quality, material, defaultSettings } = props;
+
     this.state = {
       showFullScreen: false,
       isSlicing: false,
+      isLoading: true,
       error: null,
       printers: defaultPrinter,
       quality: defaultQuality,
@@ -133,9 +142,35 @@ class Interface extends React.Component {
 
   componentDidMount() {
     const { canvas } = this.refs;
-
     const scene = createScene(canvas, this.props, this.state);
-    this.setState({ ...scene });
+
+    this.setState({ scene });
+
+    const { file } = this.props;
+
+    if (!file) {
+      throw new Error('no file provided');
+    } if (typeof file === 'string') {
+      fetch(file)
+        .then(resonse => resonse.json())
+        .then(json => JSONToSketchData(json))
+        .then(file => createSceneData(file))
+        .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
+        .then(mesh => this.updateMesh(mesh, scene));
+    } else if (file.isMesh) {
+      this.updateMesh(file, scene);
+    } else {
+      throw new Error('unknown file property');
+    }
+  }
+
+  updateMesh(mesh, scene) {
+    scene.mesh.geometry = mesh.geometry;
+    centerGeometry(scene.mesh);
+    placeOnGround(scene.mesh);
+    scene.render();
+
+    this.setState({ mesh, isLoading: false });
   }
 
   componentWillUnmount() {
@@ -146,8 +181,8 @@ class Interface extends React.Component {
   }
 
   resetMesh = () => {
-    if (isSlicing) return;
     const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
+    if (isSlicing || isLoading) return;
     if (mesh) {
       mesh.position.set(0, 0, 0);
       mesh.scale.set(1, 1, 1);
@@ -161,8 +196,8 @@ class Interface extends React.Component {
   scaleUp = () => this.scaleMesh(0.9);
   scaleDown = () => this.scaleMesh(1.0 / 0.9);
   scaleMesh = (factor) => {
-    if (isSlicing) return;
     const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
+    if (isSlicing || isLoading) return;
     if (mesh) {
       mesh.scale.multiplyScalar(factor);
       mesh.updateMatrix();
@@ -175,8 +210,8 @@ class Interface extends React.Component {
   rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
   rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
   rotate = (axis, angle) => {
-    if (isSlicing) return;
     const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
+    if (isSlicing || isLoading) return;
     if (mesh) {
       mesh.rotateOnWorldAxis(axis, angle);
       placeOnGround(mesh);
@@ -185,10 +220,10 @@ class Interface extends React.Component {
   };
 
   slice = async (target) => {
-    const { isSlicing, isLoading, settings, printers, quality, scene: { material, mesh: { matrix } } } = this.state;
-    const { name, mesh } = this.props;
+    const { isSlicing, isLoading, settings, printers, quality, mesh, scene: { material, mesh: { matrix } } } = this.state;
+    const { name } = this.props;
 
-    if (isSlicing) return;
+    if (isSlicing || isLoading) return;
 
     this.closePopover();
 
@@ -265,14 +300,15 @@ class Interface extends React.Component {
 
   render() {
     const { classes, defaultPrinter, defaultQuality, defaultMaterial, onCancel } = this.props;
-    const { isSlicing, progress, settings, printers, quality, material, showFullScreen, error } = this.state;
+    const { isSlicing, isLoading, progress, settings, printers, quality, material, showFullScreen, error } = this.state;
 
+    const disableUI = isSlicing || isLoading;
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
 
     const settingsPanel = (
       <div className={classes.settingsBar} style={style}>
         <Settings
-          disabled={isSlicing}
+          disabled={disableUI}
           printers={printerSettings}
           defaultPrinter={defaultPrinter}
           quality={qualitySettings}
@@ -298,7 +334,7 @@ class Interface extends React.Component {
               primary
               className={`${classes.button}`}
               onTouchTap={this.openPopover}
-              disabled={isSlicing}
+              disabled={disableUI}
             />
             <Popover
               open={this.state.popover.open}
@@ -322,12 +358,12 @@ class Interface extends React.Component {
         <ReactResizeDetector handleWidth handleHeight onResize={this.onResize3dView} />
         <canvas className={classes.canvas} ref="canvas" />
         <div className={classes.controlBar}>
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
-          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
+          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
         </div>
       </div>
     );
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 5feb1c1..0d81a2f 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -27,14 +27,16 @@ export function placeOnGround(mesh) {
   mesh.updateMatrix();
 }
 
-export function createScene(canvas, props, state) {
-  const { pixelRatio, mesh: { geometry } } = props;
-  const { settings } = state;
-
+export function centerGeometry(mesh) {
   // center geometry
-  geometry.computeBoundingBox();
-  const center = geometry.boundingBox.getCenter();
-  geometry.applyMatrix(new Matrix4().makeTranslation(-center.x, -center.y, -center.z));
+  mesh.geometry.computeBoundingBox();
+  const center = mesh.geometry.boundingBox.getCenter();
+  mesh.geometry.applyMatrix(new Matrix4().makeTranslation(-center.x, -center.y, -center.z));
+}
+
+export function createScene(canvas, props, state) {
+  const { pixelRatio } = props;
+  const { settings } = state;
 
   const scene = new Scene();
 
@@ -53,8 +55,7 @@ export function createScene(canvas, props, state) {
   scene.add(light);
 
   const material = new MeshPhongMaterial({ color: 0x2194ce, side: DoubleSide, specular: 0xc5c5c5, shininess: 5 });
-  const mesh = new Mesh(geometry, material);
-  placeOnGround(mesh);
+  const mesh = new Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 
   const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), 0x72bcd4);

From 03b957001474b8e566cfd8581dc01862d2cc7a56 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:24:09 +0100
Subject: [PATCH 008/163] change default bed temperature

---
 src/settings/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index 30f552d..ad4daff 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -7,7 +7,7 @@ heatedBed: false
 nozzleDiameter: 0.4
 filamentThickness: 2.85
 temperature: 210
-bedTemperature: 70
+bedTemperature: 50
 layerHeight: 0.15
 combing: true
 thickness:

From 55eadc73debcd10969f640ba0e7fd9a8d5d2910c Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:27:12 +0100
Subject: [PATCH 009/163] lower z offset

---
 src/settings/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index ad4daff..41074fb 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -1,4 +1,4 @@
-zOffset: 0.3
+zOffset: 0.2
 dimensions:
   x: 200
   y: 200

From 700b27e6e04a9d90d82724f215066c5db7924fd4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:29:40 +0100
Subject: [PATCH 010/163] add combing setting

---
 src/interface/Settings.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index ec45c54..8fbfa90 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -123,6 +123,8 @@ class Settings extends React.Component {
               <TextField name="settings.thickness.top" fullWidth floatingLabelText="top" type="number" />
               <TextField name="settings.thickness.bottom" fullWidth floatingLabelText="bottom" type="number" />
               <TextField name="settings.thickness.shell" fullWidth floatingLabelText="shell" type="number" />
+              <p>Combing</p>
+              <Checkbox name="settings.combing" label="Enabled" />
               <p>Retraction</p>
               <Checkbox name="settings.retraction.enabled" label="Enabled" />
               <TextField name="settings.retraction.amount" fullWidth floatingLabelText="Amount" type="number" />

From da3ab2b0e6940b07d004eaefcfcb3e47850593a4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:43:58 +0100
Subject: [PATCH 011/163] Added default line to gcode

---
 src/constants.js                  | 1 +
 src/sliceActions/helpers/GCode.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index 3e117b5..e08c4ca 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1 +1,2 @@
 export const PRECISION = 0.01;
+export const VERSION = '0.0.18';
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 4683c10..cf2fbb4 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,5 +1,5 @@
 import { Vector2 } from 'three/src/math/Vector2.js';
-import { PRECISION } from '../../constants.js';
+import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
 export const M_COMMAND = 'M';
@@ -14,7 +14,7 @@ export default class {
   constructor(nozzleToFilamentRatio) {
     this._nozzleToFilamentRatio = nozzleToFilamentRatio;
 
-    this._gcode = [];
+    this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
     this._currentValues = {};
     this._nozzlePosition = new Vector2(0, 0);
     this._extruder = 0.0;

From 9a37e8a928d1f30bd4dca7eb9cebbea9dc497c90 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 15:55:48 +0100
Subject: [PATCH 012/163] Revert "lower z offset"

This reverts commit 55eadc73debcd10969f640ba0e7fd9a8d5d2910c.
---
 src/settings/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index 41074fb..ad4daff 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -1,4 +1,4 @@
-zOffset: 0.2
+zOffset: 0.3
 dimensions:
   x: 200
   y: 200

From 1ebbe7fc6a0db9931b7ea0d5e297171ca970a0f1 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 16:30:20 +0100
Subject: [PATCH 013/163] implement brim

---
 src/interface/Settings.js   |  2 +-
 src/settings/default.yml    |  2 +-
 src/sliceActions/addBrim.js | 22 +++++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 8fbfa90..b97d634 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -147,7 +147,7 @@ class Settings extends React.Component {
               <TextField name="settings.outerInfill.speed" fullWidth floatingLabelText="Speed" type="number" />
               <TextField name="settings.outerInfill.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
               <p>Brim</p>
-              <TextField name="settings.brim.offset" fullWidth floatingLabelText="Offset" type="number" />
+              <TextField name="settings.brim.size" fullWidth floatingLabelText="Size" type="number" />
               <TextField name="settings.brim.speed" fullWidth floatingLabelText="Speed" type="number" />
               <TextField name="settings.brim.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
               <p>First layer</p>
diff --git a/src/settings/default.yml b/src/settings/default.yml
index ad4daff..df5f42e 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -44,7 +44,7 @@ outerInfill:
   flowRate: 1.0
   speed: 50.0
 brim:
-  offset: 4.0
+  size: 4.0
   flowRate: 1.0
   speed: 40.0
 firstLayer:
diff --git a/src/sliceActions/addBrim.js b/src/sliceActions/addBrim.js
index 122f140..f3e7627 100644
--- a/src/sliceActions/addBrim.js
+++ b/src/sliceActions/addBrim.js
@@ -4,21 +4,33 @@ import { PRECISION } from '../constants.js';
 const offsetOptions = {
   jointType: 'jtRound',
   miterLimit: 2.0,
-  roundPrecision: 0.25
+  roundPrecision: 0.25,
+  endType: 'etClosedPolygon'
 };
 
 export default function addBrim(slices, settings) {
   let {
-    brim: { offset: brimOffset }
+    brim: { size: brimSize },
+    nozzleDiameter
   } = settings;
-  brimOffset /= PRECISION;
+
+  nozzleDiameter /= PRECISION;
+  brimSize /= PRECISION;
+  const nozzleRadius = nozzleDiameter / 2;
 
   const [firstLayer] = slices;
 
-  firstLayer.brim = firstLayer.parts.reduce((brim, { shape }) => (
-    brim.join(shape.offset(brimOffset, {
+  const brim = firstLayer.parts.reduce((brim, { shape }) => (
+    brim.join(shape.offset(nozzleRadius, {
       ...offsetOptions,
       endType: shape.closed ? 'etClosedPolygon' : 'etOpenRound'
     }))
   ), new Shape([], true)).simplify('pftNonZero');
+
+  firstLayer.brim = new Shape([], true);
+
+  for (let offset = 0; offset < brimSize; offset += nozzleDiameter) {
+    const brimPart = brim.offset(offset, offsetOptions);
+    firstLayer.brim = firstLayer.brim.join(brimPart);
+  }
 }

From eee2682f7064a64093c3025fdb3629291561e2e9 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 16:41:06 +0100
Subject: [PATCH 014/163] Fix brim

brim now always prints the most outer layer first
---
 src/sliceActions/addBrim.js         |  5 ++---
 src/sliceActions/optimizePaths.js   | 10 +++++++---
 src/sliceActions/removePrecision.js |  4 +++-
 src/sliceActions/slicesToGCode.js   |  4 +++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/sliceActions/addBrim.js b/src/sliceActions/addBrim.js
index f3e7627..6307e9b 100644
--- a/src/sliceActions/addBrim.js
+++ b/src/sliceActions/addBrim.js
@@ -27,10 +27,9 @@ export default function addBrim(slices, settings) {
     }))
   ), new Shape([], true)).simplify('pftNonZero');
 
-  firstLayer.brim = new Shape([], true);
-
+  firstLayer.brim = [];
   for (let offset = 0; offset < brimSize; offset += nozzleDiameter) {
     const brimPart = brim.offset(offset, offsetOptions);
-    firstLayer.brim = firstLayer.brim.join(brimPart);
+    firstLayer.brim.unshift(brimPart);
   }
 }
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 661e7e0..7def91d 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -7,9 +7,13 @@ export default function optimizePaths(slices, settings) {
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
 
-    if (typeof slice.brim !== 'undefined' && slice.brim.paths.length > 0) {
-      slice.brim = optimizeShape(slice.brim, start);
-      start.copy(slice.brim.lastPoint(true));
+    if (typeof slice.brim !== 'undefined') {
+      for (let i = 0; i < slice.brim.length; i ++) {
+        if (slice.brim[i].paths.length > 0) {
+          slice.brim[i] = optimizeShape(slice.brim[i], start);
+          start.copy(slice.brim[i].lastPoint(true));
+        }
+      }
     }
 
     const parts = [];
diff --git a/src/sliceActions/removePrecision.js b/src/sliceActions/removePrecision.js
index 2ecd8df..a237a06 100644
--- a/src/sliceActions/removePrecision.js
+++ b/src/sliceActions/removePrecision.js
@@ -25,7 +25,9 @@ export default function removePrecision(slices) {
       slice.support.scaleDown(inversePrecision);
     }
     if (typeof slice.brim !== 'undefined') {
-      slice.brim.scaleDown(inversePrecision);
+      for (let i = 0; i < slice.brim.length; i ++) {
+        slice.brim[i].scaleDown(inversePrecision);
+      }
     }
   }
 }
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index cbc38a2..049bab5 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -48,7 +48,9 @@ export default function slicesToGCode(slices, settings) {
     }, {});
 
     if (typeof slice.brim !== 'undefined') {
-      pathToGCode(null, false, gcode, slice.brim, true, true, z, profiles.brim);
+      for (let i = 0; i < slice.brim.length; i ++) {
+        pathToGCode(null, false, gcode, slice.brim[i], false, false, z, profiles.brim);
+      }
     }
 
     for (let i = 0; i < slice.parts.length; i ++) {

From 9d47e8dc237b6ca3e6f5f2ea13bb49de2cb63717 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 15 Jan 2018 17:47:50 +0100
Subject: [PATCH 015/163] change default brim size

---
 src/settings/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index df5f42e..58f1d73 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -44,7 +44,7 @@ outerInfill:
   flowRate: 1.0
   speed: 50.0
 brim:
-  size: 4.0
+  size: 8.0
   flowRate: 1.0
   speed: 40.0
 firstLayer:

From 7b59ba1108d252894f7e428a6babd413f8512959 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 16 Jan 2018 17:57:34 +0100
Subject: [PATCH 016/163] implement local storage

---
 package-lock.json               | 674 +++++++++-----------------------
 package.json                    |   4 +
 src/constants.js                |   1 +
 src/interface/FormComponents.js |  50 ++-
 src/interface/Settings.js       | 280 ++++++++++---
 src/interface/index.js          |  89 ++---
 src/interface/utils.js          |  43 +-
 7 files changed, 512 insertions(+), 629 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1dc294..4aa69e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,7 @@
     "@doodle3d/cal": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/@doodle3d/cal/-/cal-0.0.8.tgz",
-      "integrity": "sha512-1qXg62qaZkc/zYPan37CXvUtaJk4aFVLz2y8cqnkN9Y0r1Er5soIZ5esMz4YYyjUrQGawBoYcGvatRALYnzlvg==",
-      "dev": true
+      "integrity": "sha512-1qXg62qaZkc/zYPan37CXvUtaJk4aFVLz2y8cqnkN9Y0r1Er5soIZ5esMz4YYyjUrQGawBoYcGvatRALYnzlvg=="
     },
     "@doodle3d/clipper-js": {
       "version": "1.0.7",
@@ -25,7 +24,6 @@
     },
     "@doodle3d/doodle3d-core": {
       "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
-      "dev": true,
       "requires": {
         "@doodle3d/cal": "0.0.8",
         "@doodle3d/clipper-js": "1.0.7",
@@ -71,7 +69,6 @@
           "version": "9.5.1",
           "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
           "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
-          "dev": true,
           "requires": {
             "is-in-browser": "1.1.3",
             "symbol-observable": "1.1.0",
@@ -81,8 +78,7 @@
         "symbol-observable": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
-          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==",
-          "dev": true
+          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
         }
       }
     },
@@ -90,7 +86,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz",
       "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==",
-      "dev": true,
       "requires": {
         "@doodle3d/clipper-js": "1.0.7"
       }
@@ -98,14 +93,12 @@
     "@doodle3d/potrace-js": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@doodle3d/potrace-js/-/potrace-js-0.0.6.tgz",
-      "integrity": "sha512-w1+sG3ClsSaQwo3ks5wl6QLe4aWEHBe8QePq0IeAcj+lypqo770sUcWVfEZWUFBumAhSlCJg3GRc8MsycHy8LA==",
-      "dev": true
+      "integrity": "sha512-w1+sG3ClsSaQwo3ks5wl6QLe4aWEHBe8QePq0IeAcj+lypqo770sUcWVfEZWUFBumAhSlCJg3GRc8MsycHy8LA=="
     },
     "@doodle3d/threejs-export-obj": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-obj/-/threejs-export-obj-0.0.8.tgz",
       "integrity": "sha512-HVnJCvrjj3FqHJ5+CLVT1oZ0OjS2eOvrpMKjo71Jg7bdrusluIRlF7w9JdaoZs3ScWASAucu2cvTKJ+OAm3Rhw==",
-      "dev": true,
       "requires": {
         "jszip": "3.1.5",
         "three": "0.88.0"
@@ -115,7 +108,6 @@
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-stl/-/threejs-export-stl-0.0.5.tgz",
       "integrity": "sha512-GeApmYL657Dug8/+WOHGGijJbQ52dN2AWkhz9FsCe9sehZRhCg0fOg4LKXNS0XGKWMQbyumlbrmCWZrK73sfJA==",
-      "dev": true,
       "requires": {
         "babel-preset-env": "1.6.1",
         "three": "0.88.0"
@@ -125,7 +117,6 @@
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/@doodle3d/touch-events/-/touch-events-0.0.7.tgz",
       "integrity": "sha512-EpL8IEGKKy2gqFFlxA4n84IeAyPTrEzle0jwmRv+mmVBzwGr6xDl5Ga5vJIrg2WcYs4Xc7qWbiKSHEXvEpDLlg==",
-      "dev": true,
       "requires": {
         "eventdispatcher.js": "0.0.2",
         "pepjs": "0.4.3"
@@ -135,7 +126,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
       "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
-      "dev": true,
       "requires": {
         "xtend": "4.0.1"
       }
@@ -231,14 +221,12 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-      "dev": true,
       "requires": {
         "delegates": "1.0.0",
         "readable-stream": "2.3.3"
@@ -256,8 +244,7 @@
     "argsarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
-      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs=",
-      "dev": true
+      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
     },
     "arr-diff": {
       "version": "2.0.0",
@@ -331,8 +318,7 @@
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "asn1.js": {
       "version": "4.9.2",
@@ -357,8 +343,7 @@
     "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-      "dev": true
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
     },
     "async": {
       "version": "2.6.0",
@@ -378,26 +363,22 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "attempt-x": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.1.tgz",
-      "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA==",
-      "dev": true
+      "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA=="
     },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-      "dev": true
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
     },
     "aws4": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-      "dev": true
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
     "babel-cli": {
       "version": "6.24.1",
@@ -490,7 +471,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
       "requires": {
         "babel-helper-explode-assignable-expression": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -542,7 +522,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -554,7 +533,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -566,7 +544,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -576,7 +553,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -587,8 +563,7 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -596,7 +571,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-traverse": "6.25.0",
@@ -640,7 +614,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -650,7 +623,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -660,7 +632,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
@@ -671,7 +642,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -681,7 +651,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -692,8 +661,7 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -701,7 +669,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -714,7 +681,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
       "requires": {
         "babel-helper-optimise-call-expression": "6.24.1",
         "babel-messages": "6.23.0",
@@ -757,7 +723,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -765,8 +730,7 @@
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
@@ -806,8 +770,7 @@
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
@@ -842,8 +805,7 @@
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
@@ -860,7 +822,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
       "requires": {
         "babel-helper-remap-async-to-generator": "6.24.1",
         "babel-plugin-syntax-async-functions": "6.13.0",
@@ -916,7 +877,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -925,7 +885,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -934,7 +893,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.26.0",
@@ -947,7 +905,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -958,7 +915,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -968,7 +924,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -981,7 +936,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -998,7 +952,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -1009,14 +962,12 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -1024,7 +975,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
       "requires": {
         "babel-helper-define-map": "6.26.0",
         "babel-helper-function-name": "6.24.1",
@@ -1041,7 +991,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.25.0"
@@ -1051,7 +1000,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1060,7 +1008,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1070,7 +1017,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1079,7 +1025,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1090,7 +1035,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1099,7 +1043,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1110,7 +1053,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-strict-mode": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1122,7 +1064,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -1133,7 +1074,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -1143,7 +1083,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -1156,7 +1095,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -1173,7 +1111,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -1184,14 +1121,12 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -1199,7 +1134,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1210,7 +1144,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-amd": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1221,7 +1154,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
       "requires": {
         "babel-helper-replace-supers": "6.24.1",
         "babel-runtime": "6.26.0"
@@ -1231,7 +1163,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
       "requires": {
         "babel-helper-call-delegate": "6.24.1",
         "babel-helper-get-function-arity": "6.24.1",
@@ -1245,7 +1176,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1255,7 +1185,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1264,7 +1193,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1275,7 +1203,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1284,7 +1211,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1293,7 +1219,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1304,7 +1229,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
       "requires": {
         "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
         "babel-plugin-syntax-exponentiation-operator": "6.13.0",
@@ -1413,7 +1337,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
       "requires": {
         "regenerator-transform": "0.10.1"
       }
@@ -1431,7 +1354,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1441,7 +1363,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "core-js": "2.5.3",
@@ -1452,7 +1373,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.5.3",
             "regenerator-runtime": "0.11.1"
@@ -1461,16 +1381,14 @@
             "regenerator-runtime": {
               "version": "0.11.1",
               "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-              "dev": true
+              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
             }
           }
         },
         "core-js": {
           "version": "2.5.3",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
-          "dev": true
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
         }
       }
     },
@@ -1478,7 +1396,6 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
       "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
-      "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
         "babel-plugin-syntax-trailing-function-commas": "6.22.0",
@@ -1711,7 +1628,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "0.14.5"
@@ -1720,14 +1636,12 @@
     "bezier-js": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
-      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==",
-      "dev": true
+      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
     },
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary-extensions": {
       "version": "1.8.0",
@@ -1738,14 +1652,12 @@
     "bindings": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
-      "dev": true
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
     },
     "bl": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
       "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-      "dev": true,
       "requires": {
         "readable-stream": "2.3.3"
       }
@@ -1759,8 +1671,7 @@
     "blueimp-canvas-to-blob": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz",
-      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ==",
-      "dev": true
+      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ=="
     },
     "bn.js": {
       "version": "4.11.8",
@@ -1821,7 +1732,6 @@
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "dev": true,
       "requires": {
         "hoek": "2.16.3"
       }
@@ -1937,7 +1847,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.8.0.tgz",
       "integrity": "sha512-iiWHM1Et6Q4TQpB7Ar6pxuM3TNMXasVJY4Y/oh3q38EwR3Z+IdZ9MyVf7PI4MJFB4xpwMcZgs9bEUnPG2E3TCA==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000760",
         "electron-to-chromium": "1.3.27"
@@ -1957,14 +1866,12 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "buffer-from": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
       "integrity": "sha1-V7GLHaChnsBvM4N6UnWiQjUb114=",
-      "dev": true,
       "requires": {
         "is-array-buffer-x": "1.7.0"
       }
@@ -2002,8 +1909,7 @@
     "cached-constructors-x": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.0.tgz",
-      "integrity": "sha512-JVP0oilYlPgBTD8bkQ+of7hSIJRtydCCJiMtzdRMXVQ98gdj0NyrJTZzbu5wtlO26Ev/1HXRTtbBNsVlLJ3+3A==",
-      "dev": true
+      "integrity": "sha512-JVP0oilYlPgBTD8bkQ+of7hSIJRtydCCJiMtzdRMXVQ98gdj0NyrJTZzbu5wtlO26Ev/1HXRTtbBNsVlLJ3+3A=="
     },
     "camel-case": {
       "version": "3.0.0",
@@ -2042,14 +1948,12 @@
     "caniuse-lite": {
       "version": "1.0.30000760",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz",
-      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8=",
-      "dev": true
+      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8="
     },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -2103,8 +2007,7 @@
     "chownr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
-      "dev": true
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -2119,8 +2022,7 @@
     "classnames": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
-      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=",
-      "dev": true
+      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
     },
     "clean-css": {
       "version": "4.1.9",
@@ -2145,26 +2047,22 @@
     "clone-buffer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
     },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "dev": true,
       "requires": {
         "delayed-stream": "1.0.0"
       }
@@ -2240,8 +2138,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -2287,8 +2184,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "create-ecdh": {
       "version": "4.0.0",
@@ -2351,7 +2247,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "dev": true,
       "requires": {
         "boom": "2.10.1"
       }
@@ -2422,7 +2317,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
       "requires": {
         "es5-ext": "0.10.35"
       }
@@ -2431,7 +2325,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       },
@@ -2439,8 +2332,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -2472,20 +2364,17 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "deep-extend": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-      "dev": true
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
     },
     "deferred-leveldown": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-2.0.3.tgz",
       "integrity": "sha512-8c2Hv+vIwKNc7qqy4zE3t5DIsln+FQnudcyjLYstHwLFg7XnXZT/H8gQb8lj6xi8xqGM0Bz633ZWcCkonycBTA==",
-      "dev": true,
       "requires": {
         "abstract-leveldown": "3.0.0"
       }
@@ -2525,14 +2414,12 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.1",
@@ -2681,14 +2568,12 @@
     "double-ended-queue": {
       "version": "2.1.0-0",
       "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
-      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=",
-      "dev": true
+      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
     },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "0.1.1"
@@ -2703,8 +2588,7 @@
     "electron-to-chromium": {
       "version": "1.3.27",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
-      "dev": true
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0="
     },
     "elliptic": {
       "version": "6.4.0",
@@ -2724,8 +2608,7 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
     },
     "encodeurl": {
       "version": "1.0.1",
@@ -2745,7 +2628,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-3.0.1.tgz",
       "integrity": "sha512-uvx+39YNqiPLqhXAvOSGBVy/oYBh4p2ShwG9YFCipwgfOhnVIOxuOPE3R9dEGM44bn0VHIrC3ojXq6lNf2ulwg==",
-      "dev": true,
       "requires": {
         "abstract-leveldown": "3.0.0",
         "level-codec": "8.0.0",
@@ -2755,8 +2637,7 @@
         "level-codec": {
           "version": "8.0.0",
           "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz",
-          "integrity": "sha512-gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q==",
-          "dev": true
+          "integrity": "sha512-gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="
         }
       }
     },
@@ -2764,7 +2645,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
       "requires": {
         "once": "1.4.0"
       }
@@ -2773,7 +2653,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz",
       "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=",
-      "dev": true,
       "requires": {
         "write-stream": "0.4.3"
       }
@@ -2800,7 +2679,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "dev": true,
       "requires": {
         "prr": "0.0.0"
       }
@@ -2842,7 +2720,6 @@
       "version": "0.10.35",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
       "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-      "dev": true,
       "requires": {
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
@@ -2851,14 +2728,12 @@
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
     },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35",
@@ -2882,8 +2757,7 @@
     "es6-promise": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
-      "dev": true
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
     },
     "es6-set": {
       "version": "0.1.5",
@@ -2902,7 +2776,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
@@ -2980,7 +2853,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
@@ -2989,8 +2861,7 @@
     "eventdispatcher.js": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/eventdispatcher.js/-/eventdispatcher.js-0.0.2.tgz",
-      "integrity": "sha1-wntZzkEEa2iUEu3M/UzYr8ZM2DU=",
-      "dev": true
+      "integrity": "sha1-wntZzkEEa2iUEu3M/UzYr8ZM2DU="
     },
     "eventemitter3": {
       "version": "1.2.0",
@@ -3059,8 +2930,7 @@
     "expand-template": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz",
-      "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ==",
-      "dev": true
+      "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ=="
     },
     "express": {
       "version": "4.16.2",
@@ -3120,8 +2990,7 @@
     "extend": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-      "dev": true
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extglob": {
       "version": "0.3.2",
@@ -3135,8 +3004,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "1.0.0",
@@ -3147,8 +3015,7 @@
     "fast-future": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz",
-      "integrity": "sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo=",
-      "dev": true
+      "integrity": "sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -3190,7 +3057,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "dev": true,
       "requires": {
         "pend": "1.2.0"
       }
@@ -3269,8 +3135,7 @@
     "fit-curve": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/fit-curve/-/fit-curve-0.1.6.tgz",
-      "integrity": "sha1-w72+b1oqO+j4Aerr2kBpGRJWqVs=",
-      "dev": true
+      "integrity": "sha1-w72+b1oqO+j4Aerr2kBpGRJWqVs="
     },
     "for-in": {
       "version": "1.0.2",
@@ -3296,14 +3161,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-      "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.5",
@@ -4243,7 +4106,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "requires": {
         "aproba": "1.2.0",
         "console-control-strings": "1.1.0",
@@ -4259,7 +4121,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -4290,7 +4151,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       },
@@ -4298,16 +4158,14 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-      "dev": true
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
     },
     "glob": {
       "version": "7.1.2",
@@ -4364,7 +4222,6 @@
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-0.4.4.tgz",
       "integrity": "sha512-+e2D9/DVBG9EDydRovzoqMZ658SsTBGbC0c65GyZqkwNvdj8vRSYQKXqbz7/yt7QaXsCPT1MpH45r3ivWOitcw==",
-      "dev": true,
       "requires": {
         "lodash": "4.17.4",
         "node-fetch": "1.7.3",
@@ -4375,14 +4232,12 @@
         "source-list-map": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
-          "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
-          "dev": true
+          "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE="
         },
         "webpack-sources": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
           "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
-          "dev": true,
           "requires": {
             "source-list-map": "1.1.2",
             "source-map": "0.5.6"
@@ -4405,14 +4260,12 @@
     "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-      "dev": true
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
     },
     "har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-      "dev": true,
       "requires": {
         "ajv": "4.11.8",
         "har-schema": "1.0.5"
@@ -4422,7 +4275,6 @@
           "version": "4.11.8",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
           "requires": {
             "co": "4.6.0",
             "json-stable-stringify": "1.0.1"
@@ -4457,7 +4309,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
       "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "to-object-x": "1.5.0",
@@ -4467,14 +4318,12 @@
     "has-symbol-support-x": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
-      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
-      "dev": true
+      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
     },
     "has-to-string-tag-x": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
       "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "dev": true,
       "requires": {
         "has-symbol-support-x": "1.4.1"
       }
@@ -4482,8 +4331,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "hash-base": {
       "version": "2.0.2",
@@ -4508,7 +4356,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "dev": true,
       "requires": {
         "boom": "2.10.1",
         "cryptiles": "2.0.5",
@@ -4536,8 +4383,7 @@
     "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
     },
     "hoist-non-react-statics": {
       "version": "1.2.0",
@@ -4750,7 +4596,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "dev": true,
       "requires": {
         "assert-plus": "0.2.0",
         "jsprim": "1.4.1",
@@ -4782,8 +4627,7 @@
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
-      "dev": true
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
     "import-local": {
       "version": "0.1.1",
@@ -4819,7 +4663,6 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
       "integrity": "sha1-8gS180cCoywdt9SNidXoZ6BEElM=",
-      "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
         "source-map": "0.5.6"
@@ -4843,8 +4686,7 @@
     "infinity-x": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.0.tgz",
-      "integrity": "sha512-wjy2TupBtZ+aAniKt+xs/PO0xOkuaL6wBysUKbgD7aL1PMW/qY5xXDG59zXZ7dU+gk3zwXOu4yIEWPCEFBTgHQ==",
-      "dev": true
+      "integrity": "sha512-wjy2TupBtZ+aAniKt+xs/PO0xOkuaL6wBysUKbgD7aL1PMW/qY5xXDG59zXZ7dU+gk3zwXOu4yIEWPCEFBTgHQ=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -4859,14 +4701,12 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "inline-style-prefixer": {
       "version": "3.0.8",
@@ -4922,7 +4762,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/is-array-buffer-x/-/is-array-buffer-x-1.7.0.tgz",
       "integrity": "sha512-ufSZRMY2WZX5xyNvk0NOZAG7cgi35B/sGQDGqv8w0X7MoQ2GC9vedanJhuYTPaC4PUCqLQsda1w7NF+dPZmAJw==",
-      "dev": true,
       "requires": {
         "attempt-x": "1.1.1",
         "has-to-string-tag-x": "1.4.1",
@@ -4970,8 +4809,7 @@
     "is-date-object": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -5004,7 +4842,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.1.tgz",
       "integrity": "sha512-XWNZC4A+3FX1ECoMjspuEFgSdio82IWjqY/suE0gZ10QA7nzHd/KraRq7Tc5VEHtFRgTRyTdY6W+ykPrDnyoAQ==",
-      "dev": true,
       "requires": {
         "to-boolean-x": "1.0.1"
       }
@@ -5022,7 +4859,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.2.tgz",
       "integrity": "sha512-HyFrxJZsgmP5RtR1PVlVvHSP4VslZOqr4uoq4x3rDrSOFaYp4R9tfmiWtAzQxPzixXhac3cYEno3NuVn0OHk2Q==",
-      "dev": true,
       "requires": {
         "infinity-x": "1.0.0",
         "is-nan-x": "1.0.1"
@@ -5032,7 +4868,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -5046,7 +4881,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.3.0.tgz",
       "integrity": "sha512-SreSSU1dlgYaXR5c0mm4qJHKYHIiGiEY+7Cd8/aRLLoMP/VvofD2XcWgBnP833ajpU5XzXbUSpfysnfKZLJFlg==",
-      "dev": true,
       "requires": {
         "attempt-x": "1.1.1",
         "has-to-string-tag-x": "1.4.1",
@@ -5076,7 +4910,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.1.0.tgz",
       "integrity": "sha512-qULKLMepQLGC8rSVdi8uF2vI4LiDrU9XSDg1D+Aa657GIB7GV1jHpga7uXgQvkt/cpQ5mVBHUFTpSehYSqT6+A==",
-      "dev": true,
       "requires": {
         "math-clamp-x": "1.2.0",
         "max-safe-integer": "1.0.1",
@@ -5088,14 +4921,12 @@
     "is-nan-x": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.1.tgz",
-      "integrity": "sha512-VfNJgfuT8USqKCYQss8g7sFvCzDnL+OOVMQoXhVoulZAyp0ZTj3oyZaaPrn2dxepAkKSQI2BiKHbBabX1DqVtw==",
-      "dev": true
+      "integrity": "sha512-VfNJgfuT8USqKCYQss8g7sFvCzDnL+OOVMQoXhVoulZAyp0ZTj3oyZaaPrn2dxepAkKSQI2BiKHbBabX1DqVtw=="
     },
     "is-nil-x": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.1.tgz",
       "integrity": "sha512-cfTKWI5iSR04SSCzzugTH5tS2rYG7kwI8yl/AqWkyuxZ7k55cbA47Y7Lezdg1N9aaELd+UxLg628bdQeNQ6BUw==",
-      "dev": true,
       "requires": {
         "lodash.isnull": "3.0.0",
         "validate.io-undefined": "1.0.3"
@@ -5114,7 +4945,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.6.0.tgz",
       "integrity": "sha512-mc3dBMv1jEOdk0f1i2RkJFsZDux0MuHqGwHOoRo770ShUOf4VE6tWThAW8dAZARr9a5RN+iNX1yzMDA5ad1clQ==",
-      "dev": true,
       "requires": {
         "is-function-x": "3.3.0",
         "is-primitive": "2.0.0"
@@ -5168,14 +4998,12 @@
     "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
     },
     "is-promise": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
     "is-regex": {
       "version": "1.0.4",
@@ -5194,20 +5022,17 @@
     "is-string": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
-      "dev": true
+      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
     },
     "is-symbol": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -5224,8 +5049,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isexe": {
       "version": "2.0.0",
@@ -5254,8 +5078,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -5276,7 +5099,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
       "optional": true
     },
     "jsesc": {
@@ -5294,8 +5116,7 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.3.1",
@@ -5307,7 +5128,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
       "requires": {
         "jsonify": "0.0.0"
       }
@@ -5315,8 +5135,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -5327,20 +5146,17 @@
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
     },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -5351,8 +5167,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -5442,7 +5257,6 @@
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
       "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
-      "dev": true,
       "requires": {
         "core-js": "2.3.0",
         "es6-promise": "3.0.2",
@@ -5454,14 +5268,12 @@
         "core-js": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
-          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=",
-          "dev": true
+          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
         },
         "readable-stream": {
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
@@ -5474,8 +5286,7 @@
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
         }
       }
     },
@@ -5518,7 +5329,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/level/-/level-2.1.1.tgz",
       "integrity": "sha512-jhsItEs/L5bf5ctKsvIPcMzeh4nwXxnL3Tsxm4E9My07jcFfqEYwKP57Y9AZu7tmtECdyK6bvCqoClwuOBuY9w==",
-      "dev": true,
       "requires": {
         "level-packager": "2.1.0",
         "leveldown": "2.1.1"
@@ -5527,14 +5337,12 @@
     "level-codec": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
-      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ==",
-      "dev": true
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ=="
     },
     "level-errors": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz",
       "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==",
-      "dev": true,
       "requires": {
         "errno": "0.1.4"
       }
@@ -5543,7 +5351,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.0.tgz",
       "integrity": "sha512-TWOYw8HR5mhj6xwoVLo0yu26RPL6v28KgvhK1kY1CJf9LyL+rJXjx99zhORTYhN9ysOBIH+iaxAiqRteA+C1/g==",
-      "dev": true,
       "requires": {
         "inherits": "2.0.3",
         "readable-stream": "2.3.3",
@@ -5554,7 +5361,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-2.1.0.tgz",
       "integrity": "sha512-I97zvGOZ6fJ9OFfYv+QmgBpDWbC+UaP5ERJ3oraTyk1v+ABAL4tazris5ym5qL2iLe+qNjXNM/iP8LQcoZMEWw==",
-      "dev": true,
       "requires": {
         "encoding-down": "3.0.1",
         "levelup": "2.0.1"
@@ -5564,7 +5370,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz",
       "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=",
-      "dev": true,
       "requires": {
         "end-stream": "0.1.0"
       }
@@ -5573,7 +5378,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-2.1.1.tgz",
       "integrity": "sha512-JNMCTSchq1YtQLMGePmT07UE7hIIYR4GHpZI7+nUXbM9XgNtRAwcBGhnyJyITwpTILTkUcNPBKZ9lZmTUj2E3g==",
-      "dev": true,
       "requires": {
         "abstract-leveldown": "3.0.0",
         "bindings": "1.3.0",
@@ -5585,8 +5389,7 @@
         "nan": {
           "version": "2.8.0",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-          "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-          "dev": true
+          "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
         }
       }
     },
@@ -5594,7 +5397,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/levelup/-/levelup-2.0.1.tgz",
       "integrity": "sha1-PckbPmMtN8nlRiOchkEYsATJ+GA=",
-      "dev": true,
       "requires": {
         "deferred-leveldown": "2.0.3",
         "level-errors": "1.1.2",
@@ -5606,7 +5408,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
       "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
-      "dev": true,
       "requires": {
         "immediate": "3.0.6"
       }
@@ -5633,7 +5434,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "dev": true,
       "requires": {
         "big.js": "3.2.0",
         "emojis-list": "2.1.0",
@@ -5666,14 +5466,12 @@
     "lodash-es": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
-      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc=",
-      "dev": true
+      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
     },
     "lodash.isnull": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
-      "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4=",
-      "dev": true
+      "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4="
     },
     "lodash.merge": {
       "version": "4.6.0",
@@ -5735,7 +5533,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
       "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
       "requires": {
         "es5-ext": "0.10.35"
       }
@@ -5743,8 +5540,7 @@
     "ltgt": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.0.tgz",
-      "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI=",
-      "dev": true
+      "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI="
     },
     "map-obj": {
       "version": "1.0.1",
@@ -5770,11 +5566,53 @@
         "warning": "3.0.0"
       }
     },
+    "material-ui-icons": {
+      "version": "1.0.0-beta.17",
+      "resolved": "https://registry.npmjs.org/material-ui-icons/-/material-ui-icons-1.0.0-beta.17.tgz",
+      "integrity": "sha1-XxmvVKLZnu7zR6VUFKaFPhyFDcM=",
+      "requires": {
+        "recompose": "0.26.0"
+      }
+    },
+    "material-ui-textfield-icon": {
+      "version": "0.2.2-1",
+      "resolved": "https://registry.npmjs.org/material-ui-textfield-icon/-/material-ui-textfield-icon-0.2.2-1.tgz",
+      "integrity": "sha512-hvRDPs2YqIUjbkAIWmEHAvRtDXSz5miBWnZiAsRSZFMvjjbtCi6t1IHMrhKkzHRHjdEQkLPs37e/9HezZxBAxg==",
+      "requires": {
+        "material-ui": "0.19.4",
+        "react": "15.6.2",
+        "react-dom": "15.6.2"
+      },
+      "dependencies": {
+        "react": {
+          "version": "15.6.2",
+          "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
+          "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+          "requires": {
+            "create-react-class": "15.6.2",
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "prop-types": "15.6.0"
+          }
+        },
+        "react-dom": {
+          "version": "15.6.2",
+          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
+          "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "prop-types": "15.6.0"
+          }
+        }
+      }
+    },
     "math-clamp-x": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.2.0.tgz",
       "integrity": "sha512-tqpjpBcIf9UulApz3EjWXqTZpMlr2vLN9PryC9ghoyCuRmqZaf3JJhPddzgQpJnKLi2QhoFnvKBFtJekAIBSYg==",
-      "dev": true,
       "requires": {
         "to-number-x": "2.0.0"
       }
@@ -5783,7 +5621,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
       "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
-      "dev": true,
       "requires": {
         "is-nan-x": "1.0.1",
         "to-number-x": "2.0.0"
@@ -5792,8 +5629,7 @@
     "max-safe-integer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
-      "integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA=",
-      "dev": true
+      "integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA="
     },
     "md5.js": {
       "version": "1.3.4",
@@ -5836,7 +5672,6 @@
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.10.tgz",
       "integrity": "sha1-TsoNiu057J0Bf0xcLy9kMvQuXI8=",
-      "dev": true,
       "requires": {
         "d": "0.1.1",
         "es5-ext": "0.10.35",
@@ -5851,7 +5686,6 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
           "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
-          "dev": true,
           "requires": {
             "es5-ext": "0.10.35"
           }
@@ -5860,7 +5694,6 @@
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
           "integrity": "sha1-1vWLjE/EE8JJtLqhl2j45NfIlE4=",
-          "dev": true,
           "requires": {
             "d": "0.1.1",
             "es5-ext": "0.10.35",
@@ -5871,7 +5704,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
           "integrity": "sha1-dhtcZ8/U8dGK+yNPaR1nhoLLO/M=",
-          "dev": true,
           "requires": {
             "d": "0.1.1",
             "es5-ext": "0.10.35"
@@ -5881,7 +5713,6 @@
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz",
           "integrity": "sha1-cGzvnpmqI2undmwjnIueKG6n0ig=",
-          "dev": true,
           "requires": {
             "d": "0.1.1",
             "es5-ext": "0.10.35",
@@ -6033,14 +5864,12 @@
     "mime-db": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-      "dev": true
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "dev": true,
       "requires": {
         "mime-db": "1.30.0"
       }
@@ -6075,14 +5904,12 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -6118,8 +5945,7 @@
     "nan-x": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.0.tgz",
-      "integrity": "sha512-yw4Fhe2/UTzanQ4f0yHWkRnfTuHZFAi4GZDjXS4G+qv5BqXTqPJBbSxpa7MyyW9v4Y4ZySZQik1vcbNkhdnIOg==",
-      "dev": true
+      "integrity": "sha512-yw4Fhe2/UTzanQ4f0yHWkRnfTuHZFAi4GZDjXS4G+qv5BqXTqPJBbSxpa7MyyW9v4Y4ZySZQik1vcbNkhdnIOg=="
     },
     "ncname": {
       "version": "1.0.0",
@@ -6139,8 +5965,7 @@
     "next-tick": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
-      "integrity": "sha1-ddpKkn7liH45BliABltzNkE7MQ0=",
-      "dev": true
+      "integrity": "sha1-ddpKkn7liH45BliABltzNkE7MQ0="
     },
     "no-case": {
       "version": "2.3.2",
@@ -6155,7 +5980,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
       "integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==",
-      "dev": true,
       "requires": {
         "semver": "5.4.1"
       }
@@ -6209,8 +6033,7 @@
     "noop-logger": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=",
-      "dev": true
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
     },
     "normalize-jss": {
       "version": "4.0.0",
@@ -6243,7 +6066,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
       "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "trim-x": "3.0.0",
@@ -6253,8 +6075,7 @@
     "normalize-wheel": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=",
-      "dev": true
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npm-run-path": {
       "version": "2.0.2",
@@ -6269,7 +6090,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
       "requires": {
         "are-we-there-yet": "1.1.4",
         "console-control-strings": "1.1.0",
@@ -6289,14 +6109,12 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-      "dev": true
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -6307,7 +6125,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/object-get-own-property-descriptor-x/-/object-get-own-property-descriptor-x-3.2.0.tgz",
       "integrity": "sha512-Z/0fIrptD9YuzN+SNK/1kxAEaBcPQM4gSrtOSMSi9eplnL/AbyQcAyAlreAoAzmBon+DQ1Z+AdhxyQSvav5Fyg==",
-      "dev": true,
       "requires": {
         "attempt-x": "1.1.1",
         "has-own-property-x": "3.2.0",
@@ -6362,7 +6179,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1.0.2"
       }
@@ -6406,8 +6222,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "2.1.0",
@@ -6467,8 +6282,7 @@
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
     },
     "param-case": {
       "version": "2.1.1",
@@ -6508,7 +6322,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
       "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "nan-x": "1.0.0",
@@ -6595,20 +6408,17 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
     },
     "pepjs": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.4.3.tgz",
-      "integrity": "sha1-FggOlwqud5kTdWwtrviOqnSG30E=",
-      "dev": true
+      "integrity": "sha1-FggOlwqud5kTdWwtrviOqnSG30E="
     },
     "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-      "dev": true
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
     },
     "pify": {
       "version": "2.3.0",
@@ -6663,7 +6473,6 @@
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.1.tgz",
       "integrity": "sha512-7YrhsBXbQh/iPA8O5Nzixi9QigaQJjqbbCFr+D7Kc258oeXNW9a0t/tOME1Lh84TJiFRuN9982FGVnrBrUhLiA==",
-      "dev": true,
       "requires": {
         "argsarray": "0.0.1",
         "buffer-from": "0.1.1",
@@ -6683,7 +6492,7 @@
         "request": "2.80.0",
         "spark-md5": "3.0.0",
         "through2": "2.0.3",
-        "uuid": "3.1.0",
+        "uuid": "3.2.0",
         "vuvuzela": "1.0.3"
       },
       "dependencies": {
@@ -6691,7 +6500,6 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
           "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -6699,14 +6507,12 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
         "readable-stream": {
           "version": "1.0.33",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "integrity": "sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw=",
-          "dev": true,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
@@ -6717,14 +6523,12 @@
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
         },
         "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.0.tgz",
+          "integrity": "sha512-qC0vMFX6q6ee8JaoTF2Om1uL8KAV1ATUjVaHRxLiPJkIsp8JZl6ZjG0MIB+twZFLbi1vXj30rqj4zlqYiOS9xg=="
         }
       }
     },
@@ -6732,7 +6536,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.4.1.tgz",
       "integrity": "sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA==",
-      "dev": true,
       "requires": {
         "expand-template": "1.1.0",
         "github-from-package": "0.0.0",
@@ -6753,8 +6556,7 @@
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -6777,8 +6579,7 @@
     "private": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
-      "dev": true
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE="
     },
     "process": {
       "version": "0.11.10",
@@ -6789,8 +6590,7 @@
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "promise": {
       "version": "7.3.1",
@@ -6814,7 +6614,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz",
       "integrity": "sha512-22cKy3w3OpRswU6to9iKWDDlg+F9vF2REcwGlGW23jyLjHb1U/jJEWA44sWupOnkhGfDgotU6Lw+N2oyhNi+5A==",
-      "dev": true,
       "requires": {
         "to-object-x": "1.5.0",
         "to-property-key-x": "2.0.2"
@@ -6838,8 +6637,7 @@
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
-      "dev": true
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo="
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -6864,7 +6662,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
       "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-      "dev": true,
       "requires": {
         "end-of-stream": "1.4.1",
         "once": "1.4.0"
@@ -6873,8 +6670,7 @@
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.5.1",
@@ -6914,7 +6710,6 @@
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
       "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
-      "dev": true,
       "requires": {
         "performance-now": "2.1.0"
       },
@@ -6922,16 +6717,14 @@
         "performance-now": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "dev": true
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         }
       }
     },
     "ramda": {
       "version": "0.21.0",
       "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
-      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=",
-      "dev": true
+      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU="
     },
     "randomatic": {
       "version": "1.1.7",
@@ -7021,7 +6814,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz",
       "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=",
-      "dev": true,
       "requires": {
         "deep-extend": "0.4.2",
         "ini": "1.3.5",
@@ -7032,8 +6824,7 @@
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -7052,7 +6843,6 @@
       "version": "15.6.2",
       "resolved": "https://registry.npmjs.org/react-addons-update/-/react-addons-update-15.6.2.tgz",
       "integrity": "sha1-5TdTxbNIh5dFEMiC1/sHWFHV5QQ=",
-      "dev": true,
       "requires": {
         "fbjs": "0.8.16",
         "object-assign": "4.1.1"
@@ -7112,7 +6902,6 @@
       "version": "0.2.16",
       "resolved": "https://registry.npmjs.org/react-notification-system/-/react-notification-system-0.2.16.tgz",
       "integrity": "sha1-m52iCw00eGtgBXxStCUW6hKVN0o=",
-      "dev": true,
       "requires": {
         "create-react-class": "15.6.2",
         "object-assign": "4.1.1",
@@ -7123,7 +6912,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/react-notification-system-redux/-/react-notification-system-redux-1.2.0.tgz",
       "integrity": "sha1-FPsJFccuTBLZmD/+ByVOLNGexd8=",
-      "dev": true,
       "requires": {
         "prop-types": "15.6.0",
         "react-notification-system": "0.2.16"
@@ -7133,7 +6921,6 @@
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.6.tgz",
       "integrity": "sha512-8taaaGu+J7PMJQDJrk/xiWEYQmdo3mkXw6wPr3K3LxvXis3Fymiq7c13S+Tpls/AyNUAsoONkU81AP0RA6y6Vw==",
-      "dev": true,
       "requires": {
         "hoist-non-react-statics": "2.3.1",
         "invariant": "2.2.2",
@@ -7146,8 +6933,7 @@
         "hoist-non-react-statics": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
-          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA=",
-          "dev": true
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
         }
       }
     },
@@ -7163,7 +6949,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/react-svg-inline/-/react-svg-inline-2.0.1.tgz",
       "integrity": "sha512-9YVqJ80g1gPWAvD9CS/z4cKPD45ZSMjjzwxFAmQJiMEoAo1Ajhz92WirXag3ftltDN5lPNkVWx/KOnEWB/PaMQ==",
-      "dev": true,
       "requires": {
         "classnames": "2.2.5",
         "prop-types": "15.6.0"
@@ -7226,7 +7011,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -7281,7 +7065,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.2.0.tgz",
       "integrity": "sha512-qbgeI19drwnm9FeGAotDA1vsZO8q94XF7IxPDuJmSXxDYX2rqzhND6NROahCBJfBK5xM1cchvmgscO2rry1EEw==",
-      "dev": true,
       "requires": {
         "deep-equal": "1.0.1",
         "es6-error": "4.1.1",
@@ -7296,34 +7079,29 @@
         "hoist-non-react-statics": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
-          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA=",
-          "dev": true
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
         }
       }
     },
     "redux-undo": {
       "version": "1.0.0-beta9-9-7",
       "resolved": "https://registry.npmjs.org/redux-undo/-/redux-undo-1.0.0-beta9-9-7.tgz",
-      "integrity": "sha1-/juqGycUI9fdu/w6gscbApotuLo=",
-      "dev": true
+      "integrity": "sha1-/juqGycUI9fdu/w6gscbApotuLo="
     },
     "regenerate": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-      "dev": true
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg=="
     },
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0",
@@ -7344,7 +7122,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
       "requires": {
         "regenerate": "1.3.3",
         "regjsgen": "0.2.0",
@@ -7354,14 +7131,12 @@
     "regjsgen": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
     },
     "regjsparser": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
       "requires": {
         "jsesc": "0.5.0"
       },
@@ -7369,8 +7144,7 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
         }
       }
     },
@@ -7432,7 +7206,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
       "integrity": "sha512-+vMP4jqU+8HboLWms6YMNEiaZG5hh1oR6ENCnGYDF/UQ7aYiJUK/8tcl3+KZAHRCKKa3gqzrfiarlUBHQSgRlg==",
-      "dev": true,
       "requires": {
         "require-coercible-to-string-x": "1.0.0",
         "to-string-x": "1.4.2"
@@ -7442,7 +7215,6 @@
       "version": "2.80.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.80.0.tgz",
       "integrity": "sha1-jMFi1215OBze/dNQXXa4C2BYm9A=",
-      "dev": true,
       "requires": {
         "aws-sign2": "0.6.0",
         "aws4": "1.6.0",
@@ -7464,26 +7236,23 @@
         "stringstream": "0.0.5",
         "tough-cookie": "2.3.3",
         "tunnel-agent": "0.4.3",
-        "uuid": "3.1.0"
+        "uuid": "3.2.0"
       },
       "dependencies": {
         "qs": {
           "version": "6.3.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-          "dev": true
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
         },
         "tunnel-agent": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
         },
         "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.0.tgz",
+          "integrity": "sha512-qC0vMFX6q6ee8JaoTF2Om1uL8KAV1ATUjVaHRxLiPJkIsp8JZl6ZjG0MIB+twZFLbi1vXj30rqj4zlqYiOS9xg=="
         }
       }
     },
@@ -7491,7 +7260,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.0.tgz",
       "integrity": "sha512-Rpfd4sMdflPAKecdKhfAtQHlZzzle4UMUgxJ01hXtTcNWMV8w9GeZnKhEyrT73kgrflBOP1zg41amUPZGcNspA==",
-      "dev": true,
       "requires": {
         "require-object-coercible-x": "1.4.1",
         "to-string-x": "1.4.2"
@@ -7513,7 +7281,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.1.tgz",
       "integrity": "sha512-0YHa2afepsLfQvwQ1P2XvDZnGOUia5sC07ZijIRU2dnsRxnuilXWF6B2CFaKGDA9eZl39lJHrXCDsnfgroRd6Q==",
-      "dev": true,
       "requires": {
         "is-nil-x": "1.4.1"
       }
@@ -7527,8 +7294,7 @@
     "reselect": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=",
-      "dev": true
+      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
     },
     "resolve-cwd": {
       "version": "2.0.0",
@@ -7576,8 +7342,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-      "dev": true
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
     "schema-utils": {
       "version": "0.3.0",
@@ -7606,8 +7371,7 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-      "dev": true
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
     },
     "send": {
       "version": "0.16.1",
@@ -7688,8 +7452,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -7736,14 +7499,12 @@
     "shortid": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz",
-      "integrity": "sha1-AzsRfWoul1gE9vCWnb59PQs1UTE=",
-      "dev": true
+      "integrity": "sha1-AzsRfWoul1gE9vCWnb59PQs1UTE="
     },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simple-assign": {
       "version": "0.1.0",
@@ -7754,7 +7515,6 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz",
       "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=",
-      "dev": true,
       "requires": {
         "once": "1.4.0",
         "unzip-response": "1.0.2",
@@ -7771,7 +7531,6 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "dev": true,
       "requires": {
         "hoek": "2.16.3"
       }
@@ -7820,8 +7579,7 @@
     "source-map": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-      "dev": true
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
     },
     "source-map-support": {
       "version": "0.4.15",
@@ -7835,8 +7593,7 @@
     "spark-md5": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz",
-      "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8=",
-      "dev": true
+      "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8="
     },
     "spdx-correct": {
       "version": "1.0.2",
@@ -7898,7 +7655,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "dev": true,
       "requires": {
         "asn1": "0.2.3",
         "assert-plus": "1.0.0",
@@ -7913,8 +7669,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -7989,7 +7744,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -7997,8 +7751,7 @@
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-      "dev": true
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
@@ -8032,8 +7785,7 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "supports-color": {
       "version": "2.0.0",
@@ -8055,7 +7807,6 @@
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
       "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
-      "dev": true,
       "requires": {
         "chownr": "1.0.1",
         "mkdirp": "0.5.1",
@@ -8067,7 +7818,6 @@
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
       "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
-      "dev": true,
       "requires": {
         "bl": "1.2.1",
         "end-of-stream": "1.4.1",
@@ -8107,14 +7857,12 @@
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
     "three-js-csg": {
-      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045",
-      "dev": true
+      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
     },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-      "dev": true,
       "requires": {
         "readable-stream": "2.3.3",
         "xtend": "4.0.1"
@@ -8145,7 +7893,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
       "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
-      "dev": true,
       "requires": {
         "es5-ext": "0.10.35",
         "next-tick": "1.0.0"
@@ -8154,8 +7901,7 @@
         "next-tick": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-          "dev": true
+          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
         }
       }
     },
@@ -8168,8 +7914,7 @@
     "to-boolean-x": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.1.tgz",
-      "integrity": "sha512-PstxY3K6hVEHnY3FITs8XBoJbt0RI1e4MLIhAL9hWa3BtVLCrb86vU5z6lEKh7uZZjiPiLqIKMmfMro1nNgtXQ==",
-      "dev": true
+      "integrity": "sha512-PstxY3K6hVEHnY3FITs8XBoJbt0RI1e4MLIhAL9hWa3BtVLCrb86vU5z6lEKh7uZZjiPiLqIKMmfMro1nNgtXQ=="
     },
     "to-fast-properties": {
       "version": "1.0.3",
@@ -8180,7 +7925,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
       "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
-      "dev": true,
       "requires": {
         "is-finite-x": "3.0.2",
         "is-nan-x": "1.0.1",
@@ -8192,7 +7936,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
       "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "nan-x": "1.0.0",
@@ -8205,7 +7948,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/to-object-x/-/to-object-x-1.5.0.tgz",
       "integrity": "sha512-AKn5GQcdWky+s20vjWkt+Wa6y3dxQH3yQyMBhOfBOPldUwqwhgvlqcIg5H092ntNc+TX8/Cxzs1kMHH19pyCnA==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "require-object-coercible-x": "1.4.1"
@@ -8215,7 +7957,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/to-primitive-x/-/to-primitive-x-1.1.0.tgz",
       "integrity": "sha512-gyMY0gi3wjK3e4MUBKqv9Zl8QGcWguIkaUr2VJmoBEsOpDcpDZSEyljR773eVG4maS48uX7muLkoQoh/BA82OQ==",
-      "dev": true,
       "requires": {
         "has-symbol-support-x": "1.4.1",
         "is-date-object": "1.0.1",
@@ -8231,7 +7972,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-property-key-x/-/to-property-key-x-2.0.2.tgz",
       "integrity": "sha512-YISLpZFYIazNm0P8hLsKEEUEZ3m8U3+eDysJZqTu3+B9tQp+2TrMpaEGT8Agh4fZ5LSoums60/glNEzk5ozqrg==",
-      "dev": true,
       "requires": {
         "has-symbol-support-x": "1.4.1",
         "to-primitive-x": "1.1.0",
@@ -8242,7 +7982,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.0.tgz",
       "integrity": "sha512-HbVH673pybrUmhzESGHUm17BBJvqb7BU8HciOvuEYm9ipuDyjmddhvkVqpVW6sM/C5/zhJo17n7O7I/24loJIQ==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "has-symbol-support-x": "1.4.1",
@@ -8253,7 +7992,6 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.2.tgz",
       "integrity": "sha512-ytO9eLigxsQQLGuab0C1iSSTzKdJNVSlBg0Spg4J/rGAVrQJ5y774mo0SSzgGeTT4RJGGyJNfObXaTMzX0XDOQ==",
-      "dev": true,
       "requires": {
         "lodash.isnull": "3.0.0",
         "validate.io-undefined": "1.0.3"
@@ -8263,7 +8001,6 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.2.tgz",
       "integrity": "sha512-/WP5arlwtCpAAexCCHiQBW0eXwse84osWyP1Qtaz71nsYSuUpOkT6tBm8nQ4IIUfSh5hji0hDupUCD2xbbOL6A==",
-      "dev": true,
       "requires": {
         "is-symbol": "1.0.1"
       }
@@ -8278,7 +8015,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
       "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "dev": true,
       "requires": {
         "punycode": "1.4.1"
       }
@@ -8287,7 +8023,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
       "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "require-coercible-to-string-x": "1.0.0",
@@ -8310,7 +8045,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
       "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
-      "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "require-coercible-to-string-x": "1.0.0",
@@ -8321,7 +8055,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
       "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
-      "dev": true,
       "requires": {
         "trim-left-x": "3.0.0",
         "trim-right-x": "3.0.0"
@@ -8337,7 +8070,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -8346,7 +8078,6 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
       "optional": true
     },
     "type-is": {
@@ -8434,8 +8165,7 @@
     "unzip-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
-      "dev": true
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
     },
     "upper-case": {
       "version": "1.1.3",
@@ -8515,8 +8245,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "utila": {
       "version": "0.4.0",
@@ -8548,8 +8277,7 @@
     "valid-url": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=",
-      "dev": true
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
     },
     "validate-npm-package-license": {
       "version": "3.0.1",
@@ -8564,8 +8292,7 @@
     "validate.io-undefined": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
-      "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q=",
-      "dev": true
+      "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q="
     },
     "vary": {
       "version": "1.1.2",
@@ -8577,7 +8304,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
@@ -8587,8 +8313,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -8604,8 +8329,7 @@
     "vuvuzela": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz",
-      "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws=",
-      "dev": true
+      "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws="
     },
     "warning": {
       "version": "3.0.0",
@@ -8928,14 +8652,12 @@
     "white-space-x": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
-      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg==",
-      "dev": true
+      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg=="
     },
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
       "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-      "dev": true,
       "requires": {
         "string-width": "1.0.2"
       },
@@ -8944,7 +8666,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -9001,14 +8722,12 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-stream": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz",
       "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=",
-      "dev": true,
       "requires": {
         "readable-stream": "0.0.4"
       },
@@ -9016,8 +8735,7 @@
         "readable-stream": {
           "version": "0.0.4",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz",
-          "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40=",
-          "dev": true
+          "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40="
         }
       }
     },
@@ -9030,8 +8748,7 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
       "version": "3.2.1",
@@ -9119,7 +8836,6 @@
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
       "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
-      "dev": true,
       "requires": {
         "buffer-crc32": "0.2.13",
         "fd-slicer": "1.0.1"
diff --git a/package.json b/package.json
index 6d7cfc5..390c419 100644
--- a/package.json
+++ b/package.json
@@ -21,12 +21,16 @@
     "file-saver": "^1.3.3",
     "lodash": "^4.17.4",
     "material-ui": "^0.19.4",
+    "material-ui-icons": "^1.0.0-beta.17",
+    "material-ui-textfield-icon": "^0.2.2-1",
     "proptypes": "^1.1.0",
     "query-string": "^5.0.1",
     "react": "^16.0.0",
+    "react-addons-update": "^15.6.2",
     "react-dom": "^16.0.0",
     "react-jss": "^7.2.0",
     "react-resize-detector": "^1.1.0",
+    "shortid": "^2.2.8",
     "three": "^0.88.0"
   },
   "devDependencies": {
diff --git a/src/constants.js b/src/constants.js
index e08c4ca..f8b06f8 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,2 +1,3 @@
 export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
+export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index aff0278..20f2ec6 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -4,36 +4,58 @@ import _ from 'lodash';
 import injectSheet from 'react-jss';
 import MaterialUISelectField from 'material-ui/SelectField'
 import MaterialUICheckbox from 'material-ui/Checkbox';
-import MaterialUITextField from 'material-ui/TextField';
+import { blue500, grey500 } from 'material-ui/styles/colors';
+import TextFieldIcon from 'material-ui-textfield-icon';
+import Clear from 'material-ui-icons/Clear';
 
-const contextTypes = { state: PropTypes.object, onChange: PropTypes.func, disabled: PropTypes.bool };
+const contextTypes = {
+  settings: PropTypes.object.isRequired,
+  onChange: PropTypes.func.isRequired,
+  disabled: PropTypes.bool.isRequired,
+  addPrinter: PropTypes.object.isRequired,
+  advancedFields: PropTypes.array.isRequired,
+  activePrinter: PropTypes.string
+};
+const propTypes = {
+  name: PropTypes.string.isRequired
+};
 
 export const SelectField = (props, context) => (
   <MaterialUISelectField
-    { ...props }
+    {...props}
     disabled={context.disabled}
-    value={_.get(context.state, props.name)}
+    value={_.get(context, props.name)}
     onChange={(event, index, value) => context.onChange(props.name, value)}
   />
 );
 SelectField.contextTypes = contextTypes;
+SelectField.propTypes = propTypes;
 
 export const TextField = (props, context) => (
-  <MaterialUITextField
-    { ...props }
+  <TextFieldIcon
+    {...props}
+    icon={context.advancedFields.includes(props.name) && <Clear onTouchTap={() => context.onChange(props.name, null)} />}
+    floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
     disabled={context.disabled}
-    value={_.get(context.state, props.name)}
-    onChange={(event, value) => context.onChange(props.name, value)}
+    value={_.get(context, props.name)}
+    onChange={(event, value) => context.onChange(props.name, props.type === 'number' ? parseFloat(value) : value)}
   />
 );
 TextField.contextTypes = contextTypes;
+TextField.propTypes = propTypes;
 
 export const Checkbox = (props, context) => (
-  <MaterialUICheckbox
-    { ...props }
-    disabled={context.disabled}
-    checked={_.get(context.state, props.name)}
-    onCheck={(event, value) => context.onChange(props.name, value)}
-  />
+  <span style={{ display: 'flex' }}>
+    <MaterialUICheckbox
+      {...props}
+      style={{ display: 'block' }}
+      iconStyle={{ fill: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
+      disabled={context.disabled}
+      checked={_.get(context, props.name)}
+      onCheck={(event, value) => context.onChange(props.name, value)}
+    />
+    {context.advancedFields.includes(props.name) && <Clear onTouchTap={() => context.onChange(props.name, null)} />}
+  </span>
 );
 Checkbox.contextTypes = contextTypes;
+Checkbox.propTypes = propTypes;
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index b97d634..e2303a8 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -5,7 +5,17 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 import MenuItem from 'material-ui/MenuItem';
 import injectSheet from 'react-jss';
 import { SelectField, TextField, Checkbox } from './FormComponents.js';
-import { grey800, cyan500 } from 'material-ui/styles/colors';
+import { grey800, cyan500, red500 } from 'material-ui/styles/colors';
+import Divider from 'material-ui/Divider';
+import Dialog from 'material-ui/Dialog';
+import FlatButton from 'material-ui/FlatButton';
+import { LOCAL_STORAGE_KEY } from '../constants.js';
+import shortid from 'shortid';
+import defaultSettings from '../settings/default.yml';
+import printerSettings from '../settings/printer.yml';
+import materialSettings from '../settings/material.yml';
+import qualitySettings from '../settings/quality.yml';
+import update from 'react-addons-update';
 
 const styles = {
   textFieldRow: {
@@ -19,74 +29,232 @@ const styles = {
       fontWeight: 'bold',
       margin: '30px 0 0 0'
     }
+  },
+  error: {
+    color: red500
   }
 };
 
+const getLocalStorage = () => {
+  let localStorage = window.localStorage.getItem(LOCAL_STORAGE_KEY);
+
+  if (!localStorage) {
+    localStorage = { printers: {}, active: null };
+    updateLocalStorage(localStorage);
+  } else {
+    localStorage = JSON.parse(localStorage);
+  }
+  return localStorage;
+};
+
+const updateLocalStorage = (localStorage) => {
+  window.localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(localStorage));
+};
+
 class Settings extends React.Component {
-  static childContextTypes = { state: PropTypes.object, onChange: PropTypes.func, disabled: PropTypes.bool };
-  static defaultProps: {
-    disabled: false
-  };
   static propTypes = {
     classes: PropTypes.objectOf(PropTypes.string),
     onChange: PropTypes.func,
-    printers: PropTypes.object.isRequired,
-    defaultPrinter: PropTypes.string,
-    quality: PropTypes.object.isRequired,
-    defaultQuality: PropTypes.string.isRequired,
-    material: PropTypes.object.isRequired,
-    defaultMaterial: PropTypes.string.isRequired,
-    initialSettings: PropTypes.object.isRequired,
     disabled: PropTypes.bool.isRequired
   };
-  constructor(props) {
-    super();
-    this.state = {
-      settings: props.initialSettings,
-      printers: props.defaultPrinter,
-      quality: props.defaultQuality,
-      material: props.defaultMaterial
-    };
+  static defaultProps: {
+    disabled: false
+  };
+  static childContextTypes = {
+    settings: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    disabled: PropTypes.bool.isRequired,
+    addPrinter: PropTypes.object.isRequired,
+    activePrinter: PropTypes.string,
+    advancedFields: PropTypes.array.isRequired
+  };
+
+  state = {
+    localStorage: getLocalStorage(),
+    addPrinter: {
+      open: false,
+      name: '',
+      printer: '',
+      error: null
+    }
+  };
+
+  componentDidMount() {
+    const { onChange } = this.props;
+    const { localStorage } = this.state;
+    if (localStorage.active) {
+      if (onChange) onChange(this.constructSettings(localStorage));
+    } else {
+      this.openAddPrinterDialog();
+    }
   }
 
   changeSettings = (fieldName, value) => {
     const { onChange } = this.props;
+    const { localStorage } = this.state;
+
+    let state = _.cloneDeep(this.state);
+
+    const removeAddPrinterError = () => {
+      state = update(state, { addPrinter: { error: { $set: null } } });
+    };
 
-    let state;
     switch (fieldName) {
-      case 'printers':
-      case 'quality':
-      case 'material':
-        state = {
-          [fieldName]: value,
-          settings: _.merge({}, this.state.settings, this.props[fieldName][value])
-        };
+      case 'addPrinter.printer':
+        state = update(state, { addPrinter: { printer: { $set: value } } });
+        state = update(state, { addPrinter: { name: { $set: printerSettings[value].title } } });
+        removeAddPrinterError();
+        break;
+
+      case 'addPrinter.name':
+        state = update(state, { addPrinter: { name: { $set: value } } });
+        removeAddPrinterError();
+        break;
+
+      case 'activePrinter':
+        if (value !== 'add_printer') state = update(state, { localStorage: { active: { $set: value } } });
+        break;
+
+      case 'settings.quality':
+      case 'settings.material':
+        if (!localStorage.active) return this.openAddPrinterDialog();
+
+        state = _.set(state, `localStorage.printers[${localStorage.active}].${fieldName}`, value);
+        break;
+
+      case 'settings.layerHeight':
+      case 'settings.dimensions.x':
+      case 'settings.dimensions.y':
+      case 'settings.dimensions.z':
+      case 'settings.nozzleDiameter':
+      case 'settings.bedTemperature':
+      case 'settings.heatedBed':
+      case 'settings.filamentThickness':
+      case 'settings.temperature':
+      case 'settings.thickness.top':
+      case 'settings.thickness.bottom':
+      case 'settings.thickness.shell':
+      case 'settings.retraction.enabled':
+      case 'settings.retraction.amount':
+      case 'settings.retraction.speed':
+      case 'settings.retraction.minDistance':
+      case 'settings.travel.speed':
+      case 'settings.combing':
+      case 'settings.innerShell.speed':
+      case 'settings.innerShell.flowRate':
+      case 'settings.outerShell.speed':
+      case 'settings.outerShell.flowRate':
+      case 'settings.innerInfill.gridSize':
+      case 'settings.innerInfill.speed':
+      case 'settings.innerInfill.flowRate':
+      case 'settings.outerInfill.speed':
+      case 'settings.outerInfill.flowRate':
+      case 'settings.brim.size':
+      case 'settings.brim.speed':
+      case 'settings.brim.flowRate':
+      case 'settings.firstLayer.speed':
+      case 'settings.firstLayer.flowRate':
+        if (!localStorage.active) return this.openAddPrinterDialog();
+
+        if (value === null) {
+          const advanced = { ...state.localStorage.printers[localStorage.active].settings.advanced };
+          delete advanced[fieldName];
+          state = update(state, { localStorage: { printers: { [localStorage.active]: { settings: { advanced: { $set: advanced } } } } } });
+        } else {
+          state = _.set(state, `localStorage.printers[${localStorage.active}].settings.advanced[${JSON.stringify(fieldName)}]`, value);
+        }
         break;
 
       default:
-        state = _.set(_.cloneDeep(this.state), fieldName, value);
         break;
     }
-    if (onChange) onChange(state);
-    if (state) this.setState(state);
-  };
-
-  getChildContext() {
-    return { state: this.state, onChange: this.changeSettings, disabled: this.props.disabled };
+    this.setState(state);
+    if (localStorage.active) {
+      if (onChange) onChange(this.constructSettings(state.localStorage));
+      updateLocalStorage(state.localStorage);
+    }
   }
 
+  getChildContext() {
+    const { localStorage, addPrinter } = this.state;
+
+    return {
+      addPrinter,
+      activePrinter: localStorage.active,
+      advancedFields: localStorage.active ? Object.keys(localStorage.printers[localStorage.active].settings.advanced) : [],
+      settings: this.constructSettings(localStorage),
+      onChange: this.changeSettings,
+      disabled: this.props.disabled
+    };
+  }
+
+  constructSettings(localStorage) {
+    if (!localStorage.active) return defaultSettings;
+
+    const { printer, material, quality, advanced } = localStorage.printers[localStorage.active].settings;
+    let settings = {
+      ...defaultSettings,
+      printer,
+      material,
+      quality
+    };
+
+    settings = _.merge({}, settings, printerSettings[printer]);
+    settings = _.merge({}, settings, qualitySettings[quality]);
+    settings = _.merge({}, settings, materialSettings[material]);
+
+    for (const key in advanced) {
+      const value = advanced[key];
+      settings = _.set(_.cloneDeep(settings), key.replace('settings.', ''), value);
+    }
+
+    return settings;
+  }
+
+  addPrinter = () => {
+    const { name, printer } = this.state.addPrinter;
+
+    if (!name || !printer) {
+      this.setState({ addPrinter: { ...this.state.addPrinter, error: 'Please enter a name and printer' } });
+      return;
+    }
+
+    const id = shortid.generate();
+    const localStorage = {
+      active: id,
+      printers: {
+        ...this.state.localStorage.printers,
+        [id]: { name, settings: { printer, material: 'pla', quality: 'medium', advanced: {} } }
+      }
+    };
+    this.setState({ localStorage });
+    updateLocalStorage(localStorage);
+
+    this.closeAddPrinterDialog();
+
+    const { onChange } = this.props;
+    if (onChange) onChange(this.constructSettings(localStorage));
+  }
+
+  closeAddPrinterDialog = () => this.setAddPrinterDialog(false);
+  openAddPrinterDialog = () => this.setAddPrinterDialog(true);
+  setAddPrinterDialog = (open) => this.setState({ addPrinter: { name: '', printer: '', error: null, open } });
+
   render() {
-    const { classes, printers, quality, material, disabled } = this.props;
+    const { addPrinter, localStorage } = this.state;
+    const { classes, disabled } = this.props;
 
     return (
       <div className={classes.container}>
-        <SelectField name="printers" floatingLabelText="Printer" fullWidth>
-          {Object.entries(printers).map(([value, { title }]) => (
-            <MenuItem key={value} value={value} primaryText={title} />
+        <SelectField name="activePrinter" floatingLabelText="Printer" fullWidth>
+          {Object.entries(localStorage.printers).map(([id, { name }]) => (
+            <MenuItem key={id} value={id} primaryText={name} />
           ))}
+          <Divider />
+          <MenuItem onTouchTap={this.openAddPrinterDialog} value="add_printer" primaryText="Add Printer" />
         </SelectField>
-        <SelectField name="material" floatingLabelText="Material" fullWidth>
-          {Object.entries(material).map(([value, { title }]) => (
+        <SelectField name="settings.material" floatingLabelText="Material" fullWidth>
+          {Object.entries(materialSettings).map(([value, { title }]) => (
             <MenuItem key={value} value={value} primaryText={title} />
           ))}
         </SelectField>
@@ -94,8 +262,8 @@ class Settings extends React.Component {
         <Tabs inkBarStyle={{ backgroundColor: cyan500 }}>
           <Tab buttonStyle={{ color: grey800, backgroundColor: 'white' }} label="Basic">
             <div>
-              <SelectField name="quality" floatingLabelText="Quality" fullWidth>
-                {Object.entries(quality).map(([value, { title }]) => (
+              <SelectField name="settings.quality" floatingLabelText="Quality" fullWidth>
+                {Object.entries(qualitySettings).map(([value, { title }]) => (
                   <MenuItem key={value} value={value} primaryText={title} />
                 ))}
               </SelectField>
@@ -123,8 +291,6 @@ class Settings extends React.Component {
               <TextField name="settings.thickness.top" fullWidth floatingLabelText="top" type="number" />
               <TextField name="settings.thickness.bottom" fullWidth floatingLabelText="bottom" type="number" />
               <TextField name="settings.thickness.shell" fullWidth floatingLabelText="shell" type="number" />
-              <p>Combing</p>
-              <Checkbox name="settings.combing" label="Enabled" />
               <p>Retraction</p>
               <Checkbox name="settings.retraction.enabled" label="Enabled" />
               <TextField name="settings.retraction.amount" fullWidth floatingLabelText="Amount" type="number" />
@@ -156,6 +322,30 @@ class Settings extends React.Component {
             </div>
           </Tab>
         </Tabs>
+        <Dialog
+          title="Add Printer"
+          open={addPrinter.open}
+          onRequestClose={this.closeAddPrinterDialog}
+          contentStyle={{ maxWidth: '400px' }}
+          actions={[
+            <FlatButton
+              label="Cancel"
+              onTouchTap={this.closeAddPrinterDialog}
+            />,
+            <FlatButton
+              label="Add"
+              primary
+              onTouchTap={this.addPrinter}
+            />
+          ]}
+        >
+          <SelectField name="addPrinter.printer" floatingLabelText="Printer" fullWidth>
+            {Object.entries(printerSettings).map(([value, { title }]) => (
+              <MenuItem key={value} value={value} primaryText={title} /> ))}
+          </SelectField>
+          <TextField name="addPrinter.name" floatingLabelText="Name" fullWidth />
+          {addPrinter.error && <p className={classes.error}>{addPrinter.error}</p>}
+        </Dialog>
       </div>
     );
   }
diff --git a/src/interface/index.js b/src/interface/index.js
index b4e94ec..0d8fe43 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -16,10 +16,6 @@ import Menu from 'material-ui/Menu';
 import MenuItem from 'material-ui/MenuItem';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Settings from './Settings.js';
-import defaultSettings from '../settings/default.yml';
-import printerSettings from '../settings/printer.yml';
-import materialSettings from '../settings/material.yml';
-import qualitySettings from '../settings/quality.yml';
 import ReactResizeDetector from 'react-resize-detector';
 import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
@@ -91,63 +87,40 @@ class Interface extends React.Component {
       PropTypes.string
     ]).isRequired,
     classes: PropTypes.objectOf(PropTypes.string),
-    defaultSettings: PropTypes.object.isRequired,
-    printers: PropTypes.object.isRequired,
-    defaultPrinter: PropTypes.string,
-    quality: PropTypes.object.isRequired,
-    defaultQuality: PropTypes.string.isRequired,
-    material: PropTypes.object.isRequired,
-    defaultMaterial: PropTypes.string.isRequired,
     pixelRatio: PropTypes.number.isRequired,
     onCancel: PropTypes.func,
     name: PropTypes.string.isRequired
   };
 
   static defaultProps = {
-    defaultSettings: defaultSettings,
-    printers: printerSettings,
-    quality: qualitySettings,
-    defaultQuality: 'medium',
-    material: materialSettings,
-    defaultMaterial: 'pla',
     pixelRatio: 1,
     name: 'Doodle3D'
   };
 
   constructor(props) {
     super(props);
-    const { defaultPrinter, defaultQuality, defaultMaterial, printers, quality, material, defaultSettings } = props;
 
+    const scene = createScene(this.props);
     this.state = {
+      scene,
+      settings: null,
       showFullScreen: false,
       isSlicing: false,
       isLoading: true,
       error: null,
-      printers: defaultPrinter,
-      quality: defaultQuality,
-      material: defaultMaterial,
       popover: {
         element: null,
         open: false
-      },
-      settings: _.merge(
-        {},
-        defaultSettings,
-        printers[defaultPrinter],
-        quality[defaultQuality],
-        material[defaultMaterial]
-      )
+      }
     };
   }
 
   componentDidMount() {
     const { canvas } = this.refs;
-    const scene = createScene(canvas, this.props, this.state);
-
-    this.setState({ scene });
+    const { scene } = this.state;
+    scene.updateCanvas(canvas);
 
     const { file } = this.props;
-
     if (!file) {
       throw new Error('no file provided');
     } if (typeof file === 'string') {
@@ -220,22 +193,20 @@ class Interface extends React.Component {
   };
 
   slice = async (target) => {
-    const { isSlicing, isLoading, settings, printers, quality, mesh, scene: { material, mesh: { matrix } } } = this.state;
+    const { isSlicing, isLoading, settings, mesh, scene: { material, mesh: { matrix } } } = this.state;
     const { name } = this.props;
 
     if (isSlicing || isLoading) return;
 
     this.closePopover();
-
     this.setState({ isSlicing: true, progress: { action: '', percentage: 0, step: 0 }, error: null });
 
     const exportMesh = new Mesh(mesh.geometry, mesh.material);
     exportMesh.applyMatrix(matrix);
 
     try {
-      await slice(target, name, exportMesh, settings, printers, quality, material, progress => {
-        this.setState({ progress: { ...this.state.progress, ...progress } });
-      });
+      const updateProgres = progress => this.setState({ progress: { ...this.state.progress, ...progress } });
+      await slice(target, name, exportMesh, settings, updateProgres);
     } catch (error) {
       this.setState({ error: error.message });
       throw error;
@@ -263,23 +234,6 @@ class Interface extends React.Component {
     });
   };
 
-  onChangeSettings = (settings) => {
-    this.setState(settings);
-  };
-
-  componentWillUpdate(nextProps, nextState) {
-    if (!this.state.scene) return;
-    const { scene: { box, render, setSize } } = this.state;
-    let changed = false;
-    if (box && nextState.settings.dimensions !== this.state.settings.dimensions) {
-      const { dimensions } = nextState.settings;
-      box.scale.set(dimensions.y, dimensions.z, dimensions.x);
-      box.updateMatrix();
-      changed = true;
-    }
-    if (changed) render();
-  }
-
   componentDidUpdate() {
     const { scene: { updateCanvas } } = this.state;
     const { canvas } = this.refs;
@@ -298,9 +252,23 @@ class Interface extends React.Component {
     this.setState({ showFullScreen: width > MAX_FULLSCREEN_WIDTH });
   };
 
+  onChangeSettings = (settings) => {
+    const { scene: { box, render } } = this.state;
+
+    let changed = false;
+    if (!this.state.settings || this.state.settings.dimensions !== settings.dimensions) {
+      box.scale.set(settings.dimensions.y, settings.dimensions.z, settings.dimensions.x);
+      box.updateMatrix();
+      changed = true;
+    }
+    if (changed) render();
+
+    this.setState({ settings, error: null });
+  };
+
   render() {
-    const { classes, defaultPrinter, defaultQuality, defaultMaterial, onCancel } = this.props;
-    const { isSlicing, isLoading, progress, settings, printers, quality, material, showFullScreen, error } = this.state;
+    const { classes, onCancel } = this.props;
+    const { isSlicing, isLoading, progress, showFullScreen, error } = this.state;
 
     const disableUI = isSlicing || isLoading;
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -309,13 +277,6 @@ class Interface extends React.Component {
       <div className={classes.settingsBar} style={style}>
         <Settings
           disabled={disableUI}
-          printers={printerSettings}
-          defaultPrinter={defaultPrinter}
-          quality={qualitySettings}
-          defaultQuality={defaultQuality}
-          material={materialSettings}
-          defaultMaterial={defaultMaterial}
-          initialSettings={settings}
           onChange={this.onChangeSettings}
         />
         <div className={classes.sliceActions}>
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 0d81a2f..7d8a15e 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import { Box3 } from 'three/src/math/Box3.js';
 import { Matrix4 } from 'three/src/math/Matrix4.js';
+import { Vector3 } from 'three/src/math/Vector3.js';
 import { Scene } from 'three/src/scenes/Scene.js';
 import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera.js';
 import { AmbientLight } from 'three/src/lights/AmbientLight.js';
@@ -34,14 +35,12 @@ export function centerGeometry(mesh) {
   mesh.geometry.applyMatrix(new Matrix4().makeTranslation(-center.x, -center.y, -center.z));
 }
 
-export function createScene(canvas, props, state) {
-  const { pixelRatio } = props;
-  const { settings } = state;
-
+export function createScene({ pixelRatio }) {
   const scene = new Scene();
 
   const camera = new PerspectiveCamera(50, 1, 1, 10000);
   camera.position.set(0, 400, 300);
+  camera.lookAt(new Vector3(0, 0, 0));
 
   const directionalLightA = new DirectionalLight(0xa2a2a2);
   directionalLightA.position.set(1, 1, 1);
@@ -61,8 +60,10 @@ export function createScene(canvas, props, state) {
   const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), 0x72bcd4);
   scene.add(box);
 
-  const { dimensions } = settings;
-  box.scale.set(dimensions.y, dimensions.z, dimensions.x);
+  let renderer = new WebGLRenderer({ alpha: true, antialias: true });
+  let editorControls = new THREE.EditorControls(camera, renderer.domElement);
+
+  box.scale.set(1., 1., 1.);
   box.updateMatrix();
 
   const render = () => renderer.render(scene, camera);
@@ -75,8 +76,6 @@ export function createScene(canvas, props, state) {
     render();
   };
 
-  let editorControls;
-  let renderer;
   const updateCanvas = (canvas) => {
     if (!renderer || renderer.domElement !== canvas) {
       if (renderer) renderer.dispose();
@@ -86,13 +85,11 @@ export function createScene(canvas, props, state) {
     if (!editorControls || editorControls.domElement !== canvas) {
       if (editorControls) editorControls.dispose();
       editorControls = new THREE.EditorControls(camera, canvas);
-      editorControls.focus(mesh);
       editorControls.addEventListener('change', render);
     }
 
     render();
   };
-  updateCanvas(canvas);
 
   const focus = () => editorControls.focus(mesh);
 
@@ -119,8 +116,8 @@ export function fetchProgress(url, { method = 'get', headers = {}, body = {} } =
 const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
 const CONNECT_URL = 'http://connect.doodle3d.com/';
 
-export async function slice(target, name, mesh, settings, printers, quality, material, updateProgress) {
-  if (!printers) throw new Error('Please select a printer');
+export async function slice(target, name, mesh, settings, updateProgress) {
+  if (!settings) throw new Error('please select a printer first');
 
   let steps;
   let currentStep = 0;
@@ -167,22 +164,13 @@ export async function slice(target, name, mesh, settings, printers, quality, mat
         body.append(key, fields[key]);
       }
 
-      const file = ';' + JSON.stringify({
-        name: `${name}.gcode`,
+      const file = `;${JSON.stringify({
         ...settings,
-        printer: {
-          type: printers,
-          title: printerSettings[printers].title
-        },
-        material: {
-          type: material,
-          title: materialSettings[material].title
-        },
-        quality: {
-          type: quality,
-          title: qualitySettings[quality].title
-        }
-      }).trim() + '\n' + gcode;
+        name: `${name}.gcode`,
+        printer: { type: settings.printers, title: printerSettings[settings.printer].title },
+        material: { type: settings.material, title: materialSettings[settings.material].title },
+        quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
+      }).trim()}\n${gcode}`;
       body.append('file', file);
 
       await fetchProgress(reservation.url, { method: 'POST', body }, (progess) => {
@@ -195,6 +183,7 @@ export async function slice(target, name, mesh, settings, printers, quality, mat
 
       const popup = window.open(`${CONNECT_URL}?uuid=${id}`, '_blank');
       if (!popup) throw new Error('popup was blocked by browser');
+      break;
     }
 
     default:

From f20f5b95b86c2d92adf7a77d5359265b1b61992f Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 16 Jan 2018 18:52:03 +0100
Subject: [PATCH 017/163] Change infill gridsize to infill percentage

#31
---
 src/interface/Settings.js           |  4 ++--
 src/settings/default.yml            |  2 +-
 src/settings/quality.yml            |  6 +++---
 src/sliceActions/generateInfills.js | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index e2303a8..e4c781f 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -144,7 +144,7 @@ class Settings extends React.Component {
       case 'settings.innerShell.flowRate':
       case 'settings.outerShell.speed':
       case 'settings.outerShell.flowRate':
-      case 'settings.innerInfill.gridSize':
+      case 'settings.innerInfill.precentage':
       case 'settings.innerInfill.speed':
       case 'settings.innerInfill.flowRate':
       case 'settings.outerInfill.speed':
@@ -306,7 +306,7 @@ class Settings extends React.Component {
               <TextField name="settings.outerShell.speed" fullWidth floatingLabelText="Speed" type="number" />
               <TextField name="settings.outerShell.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
               <p>Inner infill</p>
-              <TextField name="settings.innerInfill.gridSize" fullWidth floatingLabelText="Grid size" type="number" />
+              <TextField name="settings.innerInfill.precentage" fullWidth floatingLabelText="Percentage" type="number" />
               <TextField name="settings.innerInfill.speed" fullWidth floatingLabelText="Speed" type="number" />
               <TextField name="settings.innerInfill.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
               <p>Outer infill</p>
diff --git a/src/settings/default.yml b/src/settings/default.yml
index 58f1d73..f69d507 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -39,7 +39,7 @@ outerShell:
 innerInfill:
   flowRate: 1.0
   speed: 80.0
-  gridSize: 15.0
+  precentage: 20.0
 outerInfill:
   flowRate: 1.0
   speed: 50.0
diff --git a/src/settings/quality.yml b/src/settings/quality.yml
index 967a7b0..1c840bf 100644
--- a/src/settings/quality.yml
+++ b/src/settings/quality.yml
@@ -15,7 +15,7 @@ low:
     speed: 70.0
   innerInfill:
     speed: 80.0
-    gridSize: 25.0
+    precentage: 10.0
 medium:
   title: "Medium"
   layerHeight: .15
@@ -33,7 +33,7 @@ medium:
     speed: 40.0
   innerInfill:
     speed: 80.0
-    gridSize: 25.0
+    precentage: 10.0
 high:
   title: "High"
   thickness:
@@ -51,4 +51,4 @@ high:
     speed: 30.0
   innerInfill:
     speed: 70.0
-    gridSize: 10.0
+    precentage: 20.0
diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index 3ddfa56..1a777e1 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -5,7 +5,7 @@ import Shape from 'clipper-js';
 export default function generateInfills(slices, settings) {
   let {
     layerHeight,
-    innerInfill: { gridSize: infillGridSize },
+    innerInfill: { precentage: infillPercentage },
     thickness: {
       top: topThickness,
       bottom: bottomThickness
@@ -13,11 +13,11 @@ export default function generateInfills(slices, settings) {
     nozzleDiameter
   } = settings;
 
-  infillGridSize /= PRECISION;
+  infillPercentage /= 100;
   nozzleDiameter /= PRECISION;
 
-  const bottomSkinCount = Math.ceil(bottomThickness/layerHeight);
-  const topSkinCount = Math.ceil(topThickness/layerHeight);
+  const bidirectionalInfill = infillPercentage < 0.8;
+  const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillPercentage;
   const nozzleRadius = nozzleDiameter / 2;
   const outerFillTemplateSize = Math.sqrt(2 * Math.pow(nozzleDiameter, 2));
 
@@ -32,6 +32,7 @@ export default function generateInfills(slices, settings) {
     }
 
     for (let i = 0; i < slice.parts.length; i ++) {
+      const even = (layer % 2 === 0);
       const part = slice.parts[i];
 
       if (!part.closed) continue;
@@ -52,14 +53,13 @@ export default function generateInfills(slices, settings) {
 
       if (innerFillArea && innerFillArea.paths.length > 0) {
         const bounds = innerFillArea.shapeBounds();
-        const innerFillTemplate = getFillTemplate(bounds, infillGridSize, true, true);
+        const innerFillTemplate = getFillTemplate(bounds, infillGridSize, bidirectionalInfill || even, bidirectionalInfill || !even);
 
         part.innerFill.join(innerFillTemplate.intersect(innerFillArea));
       }
 
       if (outerFillArea.paths.length > 0) {
         const bounds = outerFillArea.shapeBounds();
-        const even = (layer % 2 === 0);
         const outerFillTemplate = getFillTemplate(bounds, outerFillTemplateSize, even, !even);
 
         part.outerFill.join(outerFillTemplate.intersect(outerFillArea));

From e1d833d4f384413a9e51a749a1466625648bb0f8 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 16 Jan 2018 18:52:08 +0100
Subject: [PATCH 018/163] syntax

---
 src/sliceActions/generateInfills.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index 1a777e1..20335fd 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -18,6 +18,9 @@ export default function generateInfills(slices, settings) {
 
   const bidirectionalInfill = infillPercentage < 0.8;
   const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillPercentage;
+
+  const bottomSkinCount = Math.ceil(bottomThickness / layerHeight);
+  const topSkinCount = Math.ceil(topThickness / layerHeight);
   const nozzleRadius = nozzleDiameter / 2;
   const outerFillTemplateSize = Math.sqrt(2 * Math.pow(nozzleDiameter, 2));
 

From 9764e0a374350134086f95f1b09a19c8c757069e Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 08:40:48 +0100
Subject: [PATCH 019/163] Add dimensions details to 3d panel

---
 src/interface/index.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 0d8fe43..253212a 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -3,6 +3,7 @@ import React from 'react';
 import { Quaternion } from 'three/src/math/Quaternion.js';
 import { Vector3 } from 'three/src/math/Vector3.js';
 import { Mesh } from 'three/src/objects/Mesh.js';
+import { Box3 } from 'three/src/math/Box3.js';
 import PropTypes from 'proptypes';
 import { centerGeometry, placeOnGround, createScene, fetchProgress, slice, TabTemplate } from './utils.js';
 import injectSheet from 'react-jss';
@@ -77,6 +78,9 @@ const styles = {
   },
   title: {
     position: 'absolute'
+  },
+  detail: {
+    marginBottom: '10px'
   }
 };
 
@@ -108,6 +112,7 @@ class Interface extends React.Component {
       isSlicing: false,
       isLoading: true,
       error: null,
+      objectDimensions: '0x0x0mm',
       popover: {
         element: null,
         open: false
@@ -141,6 +146,7 @@ class Interface extends React.Component {
     scene.mesh.geometry = mesh.geometry;
     centerGeometry(scene.mesh);
     placeOnGround(scene.mesh);
+    this.calculateDimensions();
     scene.render();
 
     this.setState({ mesh, isLoading: false });
@@ -162,6 +168,7 @@ class Interface extends React.Component {
       mesh.rotation.set(0, 0, 0);
       mesh.updateMatrix();
       placeOnGround(mesh);
+      this.calculateDimensions();
       render();
     }
   };
@@ -175,6 +182,7 @@ class Interface extends React.Component {
       mesh.scale.multiplyScalar(factor);
       mesh.updateMatrix();
       placeOnGround(mesh);
+      this.calculateDimensions();
       render();
     }
   };
@@ -188,6 +196,7 @@ class Interface extends React.Component {
     if (mesh) {
       mesh.rotateOnWorldAxis(axis, angle);
       placeOnGround(mesh);
+      this.calculateDimensions();
       render();
     }
   };
@@ -266,9 +275,15 @@ class Interface extends React.Component {
     this.setState({ settings, error: null });
   };
 
+  calculateDimensions = () => {
+    const { scene: { mesh } } = this.state;
+    const { x, y, z } = new Box3().setFromObject(mesh).getSize();
+    this.setState({ objectDimensions: `${Math.round(x)}x${Math.round(y)}x${Math.round(z)}mm` });
+  };
+
   render() {
     const { classes, onCancel } = this.props;
-    const { isSlicing, isLoading, progress, showFullScreen, error } = this.state;
+    const { isSlicing, isLoading, progress, showFullScreen, error, objectDimensions } = this.state;
 
     const disableUI = isSlicing || isLoading;
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -319,6 +334,9 @@ class Interface extends React.Component {
         <ReactResizeDetector handleWidth handleHeight onResize={this.onResize3dView} />
         <canvas className={classes.canvas} ref="canvas" />
         <div className={classes.controlBar}>
+          <div className={classes.detail}>
+            <p>Dimensions: {objectDimensions}</p>
+          </div>
           <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
           <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
           <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />

From d190625f14245e6e4e9722f0191a643b424e8aba Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 09:01:40 +0100
Subject: [PATCH 020/163] Fix form element

---
 src/interface/FormComponents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index 20f2ec6..a4bccb3 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -45,7 +45,7 @@ TextField.contextTypes = contextTypes;
 TextField.propTypes = propTypes;
 
 export const Checkbox = (props, context) => (
-  <span style={{ display: 'flex' }}>
+  <span style={{ display: 'flex', position: 'relative' }}>
     <MaterialUICheckbox
       {...props}
       style={{ display: 'block' }}

From e06281667a1bb77764c8d2afb5cb7acfa309fe64 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 09:02:50 +0100
Subject: [PATCH 021/163] change html title

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 8e59163..58bcbeb 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -63,7 +63,7 @@ module.exports = {
   },
   plugins: [
     new HTMLWebpackPlugin({
-      title: 'Doodle3D Slicer - Simple example',
+      title: 'Doodle3D Slicer',
       template: require('html-webpack-template'),
       inject: false,
       appMountId: 'app'

From 5fbd7f50ec8df36bf144948e1c5122d6fab787bd Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 09:11:15 +0100
Subject: [PATCH 022/163] Update title

---
 src/interface/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 253212a..58affe2 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -77,7 +77,8 @@ const styles = {
     color: red500
   },
   title: {
-    position: 'absolute'
+    position: 'absolute',
+    left: '10px'
   },
   detail: {
     marginBottom: '10px'
@@ -351,7 +352,7 @@ class Interface extends React.Component {
       return (
         <div className={classes.container}>
           <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
-          <h1 className={classes.title}>Print</h1>
+          <h1 className={classes.title}>Doodle3D Slicer</h1>
           {d3Panel}
           {settingsPanel}
         </div>

From a48768e2684a64555f9f298e1acef13afbc3eccc Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 10:23:23 +0100
Subject: [PATCH 023/163] replace clear icon with refresh icon

---
 src/interface/FormComponents.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index a4bccb3..548547d 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -6,7 +6,7 @@ import MaterialUISelectField from 'material-ui/SelectField'
 import MaterialUICheckbox from 'material-ui/Checkbox';
 import { blue500, grey500 } from 'material-ui/styles/colors';
 import TextFieldIcon from 'material-ui-textfield-icon';
-import Clear from 'material-ui-icons/Clear';
+import RefreshIcon from 'material-ui-icons/Refresh';
 
 const contextTypes = {
   settings: PropTypes.object.isRequired,
@@ -34,7 +34,7 @@ SelectField.propTypes = propTypes;
 export const TextField = (props, context) => (
   <TextFieldIcon
     {...props}
-    icon={context.advancedFields.includes(props.name) && <Clear onTouchTap={() => context.onChange(props.name, null)} />}
+    icon={context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
     floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
     disabled={context.disabled}
     value={_.get(context, props.name)}
@@ -54,7 +54,7 @@ export const Checkbox = (props, context) => (
       checked={_.get(context, props.name)}
       onCheck={(event, value) => context.onChange(props.name, value)}
     />
-    {context.advancedFields.includes(props.name) && <Clear onTouchTap={() => context.onChange(props.name, null)} />}
+    {context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
   </span>
 );
 Checkbox.contextTypes = contextTypes;

From 879667fa0514323840c4605db8e9d4f94bd6859a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 11:04:22 +0100
Subject: [PATCH 024/163] add manage printer dialog

---
 src/interface/FormComponents.js |   1 +
 src/interface/Settings.js       | 122 ++++++++++++++++++++++++++++----
 2 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index 548547d..bedb69d 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -13,6 +13,7 @@ const contextTypes = {
   onChange: PropTypes.func.isRequired,
   disabled: PropTypes.bool.isRequired,
   addPrinter: PropTypes.object.isRequired,
+  managePrinter: PropTypes.object.isRequired,
   advancedFields: PropTypes.array.isRequired,
   activePrinter: PropTypes.string
 };
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index e4c781f..c99cb3f 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -16,10 +16,12 @@ import printerSettings from '../settings/printer.yml';
 import materialSettings from '../settings/material.yml';
 import qualitySettings from '../settings/quality.yml';
 import update from 'react-addons-update';
+import SettingsIcon from 'material-ui-icons/Settings';
 
 const styles = {
   textFieldRow: {
-    display: 'flex'
+    display: 'flex',
+    alignItems: 'center'
   },
   container: {
     width: '100%',
@@ -65,6 +67,7 @@ class Settings extends React.Component {
     onChange: PropTypes.func.isRequired,
     disabled: PropTypes.bool.isRequired,
     addPrinter: PropTypes.object.isRequired,
+    managePrinter: PropTypes.object.isRequired,
     activePrinter: PropTypes.string,
     advancedFields: PropTypes.array.isRequired
   };
@@ -76,6 +79,9 @@ class Settings extends React.Component {
       name: '',
       printer: '',
       error: null
+    },
+    managePrinter: {
+      open: false
     }
   };
 
@@ -100,6 +106,11 @@ class Settings extends React.Component {
     };
 
     switch (fieldName) {
+      case 'managePrinter.printer':
+      case 'managePrinter.name':
+        state = _.set(state, fieldName, value);
+        break;
+
       case 'addPrinter.printer':
         state = update(state, { addPrinter: { printer: { $set: value } } });
         state = update(state, { addPrinter: { name: { $set: printerSettings[value].title } } });
@@ -176,10 +187,11 @@ class Settings extends React.Component {
   }
 
   getChildContext() {
-    const { localStorage, addPrinter } = this.state;
+    const { localStorage, addPrinter, managePrinter } = this.state;
 
     return {
       addPrinter,
+      managePrinter,
       activePrinter: localStorage.active,
       advancedFields: localStorage.active ? Object.keys(localStorage.printers[localStorage.active].settings.advanced) : [],
       settings: this.constructSettings(localStorage),
@@ -234,25 +246,82 @@ class Settings extends React.Component {
 
     const { onChange } = this.props;
     if (onChange) onChange(this.constructSettings(localStorage));
-  }
+  };
+
+  editPrinter = () => {
+    const { localStorage: { active, printers }, managePrinter: { printer, name } } = this.state;
+    const localStorage = update(this.state.localStorage, {
+      printers: {
+        [active]: {
+          name: { $set: name },
+          settings: {
+            printer: { $set: printer }
+          }
+        }
+      }
+    });
+    this.closeManagePrinterDialog();
+    this.setState({ localStorage });
+    updateLocalStorage(localStorage);
+
+    const { onChange } = this.props;
+    if (onChange) onChange(this.constructSettings(localStorage));
+  };
+
+  removeActivePrinter = () => {
+    let { localStorage: { active, printers } } = this.state;
+    if (!active) return;
+
+    printers = { ...printers };
+    delete printers[active];
+    active = Object.keys(printers)[0] || null;
+    const localStorage = { active, printers };
+
+    this.closeManagePrinterDialog();
+    this.setState({ localStorage });
+    updateLocalStorage(localStorage);
+
+    const { onChange } = this.props;
+    if (onChange) onChange(this.constructSettings(localStorage));
+  };
 
   closeAddPrinterDialog = () => this.setAddPrinterDialog(false);
   openAddPrinterDialog = () => this.setAddPrinterDialog(true);
   setAddPrinterDialog = (open) => this.setState({ addPrinter: { name: '', printer: '', error: null, open } });
 
+  closeManagePrinterDialog = () => this.setManagePrinterDialog(false);
+  openManagePrinterDialog = () => this.setManagePrinterDialog(true);
+  setManagePrinterDialog = (open) => {
+    const { localStorage: { active, printers } } = this.state;
+    if (!active) return this.setState({ managePrinter: { open: false } });
+    this.setState({
+      managePrinter: {
+        open,
+        name: printers[active].name,
+        printer: printers[active].settings.printer
+      }
+    });
+  }
+
   render() {
-    const { addPrinter, localStorage } = this.state;
+    const { addPrinter, managePrinter, localStorage } = this.state;
     const { classes, disabled } = this.props;
 
     return (
       <div className={classes.container}>
-        <SelectField name="activePrinter" floatingLabelText="Printer" fullWidth>
-          {Object.entries(localStorage.printers).map(([id, { name }]) => (
-            <MenuItem key={id} value={id} primaryText={name} />
-          ))}
-          <Divider />
-          <MenuItem onTouchTap={this.openAddPrinterDialog} value="add_printer" primaryText="Add Printer" />
-        </SelectField>
+        <div className={classes.textFieldRow}>
+          <SelectField name="activePrinter" floatingLabelText="Printer" fullWidth>
+            {Object.entries(localStorage.printers).map(([id, { name }]) => (
+              <MenuItem key={id} value={id} primaryText={name} />
+            ))}
+            <Divider />
+            <MenuItem onTouchTap={this.openAddPrinterDialog} value="add_printer" primaryText="Add Printer" />
+          </SelectField>
+          {localStorage.active && <SettingsIcon
+            onTouchTap={this.openManagePrinterDialog}
+            style={{ margin: '0 10px', cursor: 'pointer' }}
+          />}
+        </div>
         <SelectField name="settings.material" floatingLabelText="Material" fullWidth>
           {Object.entries(materialSettings).map(([value, { title }]) => (
             <MenuItem key={value} value={value} primaryText={title} />
@@ -341,11 +410,40 @@ class Settings extends React.Component {
         >
           <SelectField name="addPrinter.printer" floatingLabelText="Printer" fullWidth>
             {Object.entries(printerSettings).map(([value, { title }]) => (
-              <MenuItem key={value} value={value} primaryText={title} /> ))}
+              <MenuItem key={value} value={value} primaryText={title} />
+            ))}
           </SelectField>
           <TextField name="addPrinter.name" floatingLabelText="Name" fullWidth />
           {addPrinter.error && <p className={classes.error}>{addPrinter.error}</p>}
         </Dialog>
+        <Dialog
+          title="Manage Printer"
+          open={managePrinter.open}
+          onRequestClose={this.closeManagePrinterDialog}
+          contentStyle={{ maxWidth: '400px' }}
+          actions={[
+            <FlatButton
+              label="Cancel"
+              onTouchTap={this.closeManagePrinterDialog}
+            />,
+            <FlatButton
+              label="Remove Printer"
+              onTouchTap={this.removeActivePrinter}
+            />,
+            <FlatButton
+              label="Save"
+              primary
+              onTouchTap={this.editPrinter}
+            />
+          ]}
+        >
+          <SelectField name="managePrinter.printer" floatingLabelText="Printer" fullWidth>
+            {Object.entries(printerSettings).map(([value, { title }]) => (
+              <MenuItem key={value} value={value} primaryText={title} />
+            ))}
+          </SelectField>
+          <TextField name="managePrinter.name" floatingLabelText="Name" fullWidth />
+        </Dialog>
       </div>
     );
   }

From 9b78f4e2c889547128e8a50f9f4b42e40c7d7052 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 11:22:50 +0100
Subject: [PATCH 025/163] move ultimaker 2go

---
 src/settings/printer.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index e67a4bb..1f8f212 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -26,14 +26,6 @@ doodle3d_printer:
     x: 120
     y: 120
     z: 120
-ultimaker2go:
-  title: Ultimaker 2 Go
-  heatedBed: false
-  filamentThickness: 2.85
-  dimensions:
-    x: 120
-    y: 120
-    z: 112
 _3Dison_plus:
   title: 3Dison plus
   heatedBed: false
@@ -307,6 +299,14 @@ ultimaker2_plus:
     x: 223
     y: 223
     z: 305
+ultimaker2go:
+  title: Ultimaker 2 Go
+  heatedBed: false
+  filamentThickness: 2.85
+  dimensions:
+    x: 120
+    y: 120
+    z: 112
 ultimaker_original_plus:
   title: Ultimaker Original Plus
   heatedBed: true

From 137f95fdba053b0431d2ddc82a4569123bf70a85 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 11:56:42 +0100
Subject: [PATCH 026/163] Add constrains to fields

#32
---
 package-lock.json               |  6 ++--
 src/interface/FormComponents.js | 21 +++++++++++-
 src/interface/Settings.js       | 60 ++++++++++++++++-----------------
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4aa69e8..984bc97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,6 +79,9 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
           "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+        },
+        "three-js-csg": {
+          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -7856,9 +7859,6 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
-    "three-js-csg": {
-      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
-    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index bedb69d..b99d7ae 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -39,12 +39,31 @@ export const TextField = (props, context) => (
     floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
     disabled={context.disabled}
     value={_.get(context, props.name)}
-    onChange={(event, value) => context.onChange(props.name, props.type === 'number' ? parseFloat(value) : value)}
+    onChange={(event, value) => context.onChange(props.name, value)}
   />
 );
 TextField.contextTypes = contextTypes;
 TextField.propTypes = propTypes;
 
+export const NumberField = (props, context) => (
+  <TextFieldIcon
+    {...props}
+    type="number"
+    icon={context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
+    floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
+    disabled={context.disabled}
+    value={_.get(context, props.name)}
+    onChange={(event, value) => {
+      value = parseFloat(value);
+      if (props.min) value = Math.max(value, props.min);
+      if (props.max) value = Math.min(value, props.max);
+      context.onChange(props.name, value);
+    }}
+  />
+);
+NumberField.contextTypes = contextTypes;
+NumberField.propTypes = propTypes;
+
 export const Checkbox = (props, context) => (
   <span style={{ display: 'flex', position: 'relative' }}>
     <MaterialUICheckbox
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index c99cb3f..1aab264 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import MenuItem from 'material-ui/MenuItem';
 import injectSheet from 'react-jss';
-import { SelectField, TextField, Checkbox } from './FormComponents.js';
+import { SelectField, TextField, NumberField, Checkbox } from './FormComponents.js';
 import { grey800, cyan500, red500 } from 'material-ui/styles/colors';
 import Divider from 'material-ui/Divider';
 import Dialog from 'material-ui/Dialog';
@@ -341,53 +341,53 @@ class Settings extends React.Component {
           <Tab buttonStyle={{ color: grey800, backgroundColor: 'white' }} label="Advanced">
             <div>
               <p>Layer</p>
-              <TextField name="settings.layerHeight" fullWidth floatingLabelText="Height" type="number" />
+              <NumberField name="settings.layerHeight" min={0.05} max={3} fullWidth floatingLabelText="Height" />
               <p>Printer dimensions</p>
               <div className={classes.textFieldRow}>
-                <TextField name="settings.dimensions.x" fullWidth floatingLabelText="X" type="number" />
-                <TextField name="settings.dimensions.y" fullWidth floatingLabelText="Y" type="number" />
-                <TextField name="settings.dimensions.z" fullWidth floatingLabelText="Z" type="number" />
+                <NumberField name="settings.dimensions.x" min={1} fullWidth floatingLabelText="X" />
+                <NumberField name="settings.dimensions.y" min={1} fullWidth floatingLabelText="Y" />
+                <NumberField name="settings.dimensions.z" min={1} fullWidth floatingLabelText="Z" />
               </div>
               <p>Nozzle</p>
-              <TextField name="settings.nozzleDiameter" fullWidth floatingLabelText="Diameter" type="number" />
+              <NumberField name="settings.nozzleDiameter" min={0.1} max={5} fullWidth floatingLabelText="Diameter" />
               <p>Bed</p>
-              <TextField name="settings.bedTemperature" fullWidth floatingLabelText="Temperature" type="number" />
+              <NumberField name="settings.bedTemperature" min={30} max={150} fullWidth floatingLabelText="Temperature" />
               <Checkbox name="settings.heatedBed" label="Heated" />
               <p>Material</p>
-              <TextField name="settings.filamentThickness" fullWidth floatingLabelText="Thickness" type="number" />
-              <TextField name="settings.temperature" fullWidth floatingLabelText="Temperature" type="number" />
+              <NumberField name="settings.filamentThickness" min={0.1} max={10} fullWidth floatingLabelText="Thickness" />
+              <NumberField name="settings.temperature" min={100} max={400} fullWidth floatingLabelText="Temperature" />
               <p>Thickness</p>
-              <TextField name="settings.thickness.top" fullWidth floatingLabelText="top" type="number" />
-              <TextField name="settings.thickness.bottom" fullWidth floatingLabelText="bottom" type="number" />
-              <TextField name="settings.thickness.shell" fullWidth floatingLabelText="shell" type="number" />
+              <NumberField name="settings.thickness.top" min={0} fullWidth floatingLabelText="top" />
+              <NumberField name="settings.thickness.bottom" min={0} fullWidth floatingLabelText="bottom" />
+              <NumberField name="settings.thickness.shell" min={0} fullWidth floatingLabelText="shell" />
               <p>Retraction</p>
               <Checkbox name="settings.retraction.enabled" label="Enabled" />
-              <TextField name="settings.retraction.amount" fullWidth floatingLabelText="Amount" type="number" />
-              <TextField name="settings.retraction.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.retraction.minDistance" fullWidth floatingLabelText="Min distance" type="number" />
+              <NumberField name="settings.retraction.amount" min={0} max={10} fullWidth floatingLabelText="Amount" />
+              <NumberField name="settings.retraction.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.retraction.minDistance" min={0} fullWidth floatingLabelText="Min distance" />
               <p>Travel</p>
-              <TextField name="settings.travel.speed" fullWidth floatingLabelText="Speed" type="number" />
+              <NumberField name="settings.travel.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <Checkbox name="settings.combing" label="Combing" />
               <p>Inner shell</p>
-              <TextField name="settings.innerShell.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.innerShell.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.innerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.innerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Outer shell</p>
-              <TextField name="settings.outerShell.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.outerShell.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.outerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.outerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Inner infill</p>
-              <TextField name="settings.innerInfill.precentage" fullWidth floatingLabelText="Percentage" type="number" />
-              <TextField name="settings.innerInfill.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.innerInfill.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.innerInfill.precentage" min={0} max={100} fullWidth floatingLabelText="Percentage" />
+              <NumberField name="settings.innerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.innerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Outer infill</p>
-              <TextField name="settings.outerInfill.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.outerInfill.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.outerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.outerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Brim</p>
-              <TextField name="settings.brim.size" fullWidth floatingLabelText="Size" type="number" />
-              <TextField name="settings.brim.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.brim.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.brim.size" min={0} max={20} fullWidth floatingLabelText="Size" />
+              <NumberField name="settings.brim.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.brim.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>First layer</p>
-              <TextField name="settings.firstLayer.speed" fullWidth floatingLabelText="Speed" type="number" />
-              <TextField name="settings.firstLayer.flowRate" fullWidth floatingLabelText="Flow rate" type="number" />
+              <NumberField name="settings.firstLayer.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.firstLayer.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
             </div>
           </Tab>
         </Tabs>

From 89e67882a0c392c8a4b71f86cd539a1bc07cb2f7 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 12:00:19 +0100
Subject: [PATCH 027/163] cast number as string

---
 src/interface/FormComponents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index b99d7ae..ec16553 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -52,7 +52,7 @@ export const NumberField = (props, context) => (
     icon={context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
     floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
     disabled={context.disabled}
-    value={_.get(context, props.name)}
+    value={_.get(context, props.name.toString())}
     onChange={(event, value) => {
       value = parseFloat(value);
       if (props.min) value = Math.max(value, props.min);

From 291e11fecfc7908120bbaaaff0917cd689a62d8f Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 12:21:36 +0100
Subject: [PATCH 028/163] update style

---
 src/interface/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 58affe2..6cec528 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -50,9 +50,9 @@ const styles = {
   settingsBar: {
     display: 'flex',
     flexDirection: 'column',
-    maxWidth: '380px',
+    maxWidth: '320px',
     boxSizing: 'border-box',
-    padding: '10px',
+    padding: '10px 20px',
     backgroundColor: 'white',
     borderLeft: `1px solid ${grey300}`
   },

From 2fdc5ca16be8afe6ff0f41657bf3eedf6ec33050 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 12:23:03 +0100
Subject: [PATCH 029/163] disable selecting for title and details

---
 src/interface/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/interface/index.js b/src/interface/index.js
index 6cec528..6474834 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -77,10 +77,12 @@ const styles = {
     color: red500
   },
   title: {
+    userSelect: 'none',
     position: 'absolute',
     left: '10px'
   },
   detail: {
+    userSelect: 'none',
     marginBottom: '10px'
   }
 };

From 2f4adbbb4724657fd377a05dc0e46295089e1cdb Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 13:26:30 +0100
Subject: [PATCH 030/163] use mui theme for colors

---
 index.js                        | 13 ++++++-
 src/interface/FormComponents.js | 67 ++++++++++++++++++---------------
 src/interface/Settings.js       |  6 +--
 src/interface/index.js          |  6 ++-
 src/interface/utils.js          |  7 ++--
 5 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/index.js b/index.js
index e6ae0cb..de66ab6 100644
--- a/index.js
+++ b/index.js
@@ -8,6 +8,17 @@ import jss from 'jss';
 import preset from 'jss-preset-default';
 import normalize from 'normalize-jss';
 import queryString from 'query-string';
+import getMuiTheme from 'material-ui/styles/getMuiTheme';
+import { blue400, blue500, blue700 } from 'material-ui/styles/colors';
+
+const muiTheme = getMuiTheme({
+  palette: {
+    primary1Color: blue500,
+    primary2Color: blue700,
+    primary3Color: blue400,
+    accent1Color: blue500,
+  }
+});
 
 injectTapEventPlugin();
 
@@ -25,7 +36,7 @@ jss.createStyleSheet({
 const { file } = queryString.parse(location.search);
 
 render((
-  <MuiThemeProvider>
+  <MuiThemeProvider muiTheme={muiTheme}>
     <Interface file={file} name="doodle"/>
   </MuiThemeProvider>
 ), document.getElementById('app'));
diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index ec16553..8128a67 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -4,11 +4,11 @@ import _ from 'lodash';
 import injectSheet from 'react-jss';
 import MaterialUISelectField from 'material-ui/SelectField'
 import MaterialUICheckbox from 'material-ui/Checkbox';
-import { blue500, grey500 } from 'material-ui/styles/colors';
 import TextFieldIcon from 'material-ui-textfield-icon';
 import RefreshIcon from 'material-ui-icons/Refresh';
+import muiThemeable from 'material-ui/styles/muiThemeable';
 
-const contextTypes = {
+export const contextTypes = {
   settings: PropTypes.object.isRequired,
   onChange: PropTypes.func.isRequired,
   disabled: PropTypes.bool.isRequired,
@@ -18,64 +18,69 @@ const contextTypes = {
   activePrinter: PropTypes.string
 };
 const propTypes = {
-  name: PropTypes.string.isRequired
+  name: PropTypes.string.isRequired,
+  muiTheme: PropTypes.object.isRequired
 };
 
-export const SelectField = (props, context) => (
+export const _SelectField = ({ name, muiTheme, ...props }, context) => (
   <MaterialUISelectField
     {...props}
     disabled={context.disabled}
-    value={_.get(context, props.name)}
-    onChange={(event, index, value) => context.onChange(props.name, value)}
+    value={_.get(context, name)}
+    onChange={(event, index, value) => context.onChange(name, value)}
   />
 );
-SelectField.contextTypes = contextTypes;
-SelectField.propTypes = propTypes;
+_SelectField.contextTypes = contextTypes;
+_SelectField.propTypes = propTypes;
+export const SelectField = muiThemeable()(_SelectField);
 
-export const TextField = (props, context) => (
+const _TextField = ({ name, muiTheme, ...props }, context) => (
   <TextFieldIcon
     {...props}
-    icon={context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
+    icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
+    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
     disabled={context.disabled}
-    value={_.get(context, props.name)}
-    onChange={(event, value) => context.onChange(props.name, value)}
+    value={_.get(context, name)}
+    onChange={(event, value) => context.onChange(name, value)}
   />
 );
-TextField.contextTypes = contextTypes;
-TextField.propTypes = propTypes;
+_TextField.contextTypes = contextTypes;
+_TextField.propTypes = propTypes;
+export const TextField = muiThemeable()(_TextField);
 
-export const NumberField = (props, context) => (
+const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => (
   <TextFieldIcon
     {...props}
     type="number"
-    icon={context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
+    icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
+    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
     disabled={context.disabled}
-    value={_.get(context, props.name.toString())}
+    value={_.get(context, name.toString())}
     onChange={(event, value) => {
       value = parseFloat(value);
-      if (props.min) value = Math.max(value, props.min);
-      if (props.max) value = Math.min(value, props.max);
-      context.onChange(props.name, value);
+      if (min) value = Math.max(value, min);
+      if (max) value = Math.min(value, max);
+      context.onChange(name, value);
     }}
   />
 );
-NumberField.contextTypes = contextTypes;
-NumberField.propTypes = propTypes;
+_NumberField.contextTypes = contextTypes;
+_NumberField.propTypes = propTypes;
+export const NumberField = muiThemeable()(_NumberField);
 
-export const Checkbox = (props, context) => (
+export const _Checkbox = ({ name, muiTheme, ...props }, context) => (
   <span style={{ display: 'flex', position: 'relative' }}>
     <MaterialUICheckbox
       {...props}
       style={{ display: 'block' }}
-      iconStyle={{ fill: context.advancedFields.includes(props.name) ? blue500 : grey500 }}
+      iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
       disabled={context.disabled}
-      checked={_.get(context, props.name)}
-      onCheck={(event, value) => context.onChange(props.name, value)}
+      checked={_.get(context, name)}
+      onCheck={(event, value) => context.onChange(name, value)}
     />
-    {context.advancedFields.includes(props.name) && <RefreshIcon onTouchTap={() => context.onChange(props.name, null)} />}
+    {context.advancedFields.includes(name) && <RefreshIcon onTouchTap={() => context.onChange(name, null)} />}
   </span>
 );
-Checkbox.contextTypes = contextTypes;
-Checkbox.propTypes = propTypes;
+_Checkbox.contextTypes = contextTypes;
+_Checkbox.propTypes = propTypes;
+export const Checkbox = muiThemeable()(_Checkbox);
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 1aab264..3987194 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -5,7 +5,7 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 import MenuItem from 'material-ui/MenuItem';
 import injectSheet from 'react-jss';
 import { SelectField, TextField, NumberField, Checkbox } from './FormComponents.js';
-import { grey800, cyan500, red500 } from 'material-ui/styles/colors';
+import { grey800, red500 } from 'material-ui/styles/colors';
 import Divider from 'material-ui/Divider';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
@@ -319,7 +319,7 @@ class Settings extends React.Component {
           </SelectField>
           {localStorage.active && <SettingsIcon
             onTouchTap={this.openManagePrinterDialog}
-            style={{ margin: '0 10px', cursor: 'pointer' }}
+            style={{ fill: grey800, marginLeft: '10px', cursor: 'pointer' }}
           />}
         </div>
         <SelectField name="settings.material" floatingLabelText="Material" fullWidth>
@@ -328,7 +328,7 @@ class Settings extends React.Component {
           ))}
         </SelectField>
         <h3>Printer Setup</h3>
-        <Tabs inkBarStyle={{ backgroundColor: cyan500 }}>
+        <Tabs>
           <Tab buttonStyle={{ color: grey800, backgroundColor: 'white' }} label="Basic">
             <div>
               <SelectField name="settings.quality" floatingLabelText="Quality" fullWidth>
diff --git a/src/interface/index.js b/src/interface/index.js
index 6474834..f29ef78 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -22,6 +22,7 @@ import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
 import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
 import { Matrix4 } from 'three/src/math/Matrix4.js';
+import muiThemeable from 'material-ui/styles/muiThemeable';
 
 const MAX_FULLSCREEN_WIDTH = 720;
 
@@ -96,7 +97,8 @@ class Interface extends React.Component {
     classes: PropTypes.objectOf(PropTypes.string),
     pixelRatio: PropTypes.number.isRequired,
     onCancel: PropTypes.func,
-    name: PropTypes.string.isRequired
+    name: PropTypes.string.isRequired,
+    muiTheme: PropTypes.object.isRequired
   };
 
   static defaultProps = {
@@ -383,4 +385,4 @@ class Interface extends React.Component {
   }
 }
 
-export default injectSheet(styles)(Interface);
+export default muiThemeable()(injectSheet(styles)(Interface));
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 7d8a15e..48acc3e 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -17,6 +17,7 @@ import printerSettings from '../settings/printer.yml';
 import materialSettings from '../settings/material.yml';
 import qualitySettings from '../settings/quality.yml';
 import { sliceGeometry } from '../slicer.js';
+import { grey800, red500 } from 'material-ui/styles/colors';
 import React from 'react';
 import PropTypes from 'prop-types';
 import fileSaver from 'file-saver';
@@ -35,7 +36,7 @@ export function centerGeometry(mesh) {
   mesh.geometry.applyMatrix(new Matrix4().makeTranslation(-center.x, -center.y, -center.z));
 }
 
-export function createScene({ pixelRatio }) {
+export function createScene({ pixelRatio, muiTheme }) {
   const scene = new Scene();
 
   const camera = new PerspectiveCamera(50, 1, 1, 10000);
@@ -53,11 +54,11 @@ export function createScene({ pixelRatio }) {
   const light = new AmbientLight(0x656565);
   scene.add(light);
 
-  const material = new MeshPhongMaterial({ color: 0x2194ce, side: DoubleSide, specular: 0xc5c5c5, shininess: 5 });
+  const material = new MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: DoubleSide, specular: 0xc5c5c5, shininess: 5 });
   const mesh = new Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 
-  const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), 0x72bcd4);
+  const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary3Color);
   scene.add(box);
 
   let renderer = new WebGLRenderer({ alpha: true, antialias: true });

From a8b3d688452bfb864f76c3c712d9d2fa2df135b0 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 14:21:59 +0100
Subject: [PATCH 031/163] order advanced settings based on most use

---
 src/interface/Settings.js | 58 +++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 3987194..9471488 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -342,32 +342,23 @@ class Settings extends React.Component {
             <div>
               <p>Layer</p>
               <NumberField name="settings.layerHeight" min={0.05} max={3} fullWidth floatingLabelText="Height" />
-              <p>Printer dimensions</p>
-              <div className={classes.textFieldRow}>
-                <NumberField name="settings.dimensions.x" min={1} fullWidth floatingLabelText="X" />
-                <NumberField name="settings.dimensions.y" min={1} fullWidth floatingLabelText="Y" />
-                <NumberField name="settings.dimensions.z" min={1} fullWidth floatingLabelText="Z" />
-              </div>
-              <p>Nozzle</p>
-              <NumberField name="settings.nozzleDiameter" min={0.1} max={5} fullWidth floatingLabelText="Diameter" />
-              <p>Bed</p>
-              <NumberField name="settings.bedTemperature" min={30} max={150} fullWidth floatingLabelText="Temperature" />
-              <Checkbox name="settings.heatedBed" label="Heated" />
-              <p>Material</p>
-              <NumberField name="settings.filamentThickness" min={0.1} max={10} fullWidth floatingLabelText="Thickness" />
-              <NumberField name="settings.temperature" min={100} max={400} fullWidth floatingLabelText="Temperature" />
               <p>Thickness</p>
               <NumberField name="settings.thickness.top" min={0} fullWidth floatingLabelText="top" />
               <NumberField name="settings.thickness.bottom" min={0} fullWidth floatingLabelText="bottom" />
               <NumberField name="settings.thickness.shell" min={0} fullWidth floatingLabelText="shell" />
-              <p>Retraction</p>
-              <Checkbox name="settings.retraction.enabled" label="Enabled" />
-              <NumberField name="settings.retraction.amount" min={0} max={10} fullWidth floatingLabelText="Amount" />
-              <NumberField name="settings.retraction.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
-              <NumberField name="settings.retraction.minDistance" min={0} fullWidth floatingLabelText="Min distance" />
-              <p>Travel</p>
-              <NumberField name="settings.travel.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
-              <Checkbox name="settings.combing" label="Combing" />
+              <p>Material</p>
+              <NumberField name="settings.filamentThickness" min={0.1} max={10} fullWidth floatingLabelText="Thickness" />
+              <NumberField name="settings.temperature" min={100} max={400} fullWidth floatingLabelText="Temperature" />
+              <p>Bed</p>
+              <NumberField name="settings.bedTemperature" min={30} max={150} fullWidth floatingLabelText="Temperature" />
+              <Checkbox name="settings.heatedBed" label="Heated" />
+              <p>Brim</p>
+              <NumberField name="settings.brim.size" min={0} max={20} fullWidth floatingLabelText="Size" />
+              <NumberField name="settings.brim.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.brim.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
+              <p>First layer</p>
+              <NumberField name="settings.firstLayer.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.firstLayer.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Inner shell</p>
               <NumberField name="settings.innerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.innerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
@@ -381,13 +372,22 @@ class Settings extends React.Component {
               <p>Outer infill</p>
               <NumberField name="settings.outerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.outerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
-              <p>Brim</p>
-              <NumberField name="settings.brim.size" min={0} max={20} fullWidth floatingLabelText="Size" />
-              <NumberField name="settings.brim.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
-              <NumberField name="settings.brim.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
-              <p>First layer</p>
-              <NumberField name="settings.firstLayer.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
-              <NumberField name="settings.firstLayer.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
+              <p>Travel</p>
+              <NumberField name="settings.travel.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <Checkbox name="settings.combing" label="Combing" />
+              <p>Retraction</p>
+              <Checkbox name="settings.retraction.enabled" label="Enabled" />
+              <NumberField name="settings.retraction.amount" min={0} max={10} fullWidth floatingLabelText="Amount" />
+              <NumberField name="settings.retraction.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.retraction.minDistance" min={0} fullWidth floatingLabelText="Min distance" />
+              <p>Printer dimensions</p>
+              <div className={classes.textFieldRow}>
+                <NumberField name="settings.dimensions.x" min={1} fullWidth floatingLabelText="X" />
+                <NumberField name="settings.dimensions.y" min={1} fullWidth floatingLabelText="Y" />
+                <NumberField name="settings.dimensions.z" min={1} fullWidth floatingLabelText="Z" />
+              </div>
+              <p>Nozzle</p>
+              <NumberField name="settings.nozzleDiameter" min={0.1} max={5} fullWidth floatingLabelText="Diameter" />
             </div>
           </Tab>
         </Tabs>

From 9f1958563d139894761de813c9f7be567248bf61 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 14:58:36 +0100
Subject: [PATCH 032/163] remove primary color 3

---
 index.js                        | 3 +--
 src/interface/FormComponents.js | 6 +++---
 src/interface/utils.js          | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index de66ab6..3421e5e 100644
--- a/index.js
+++ b/index.js
@@ -9,13 +9,12 @@ import preset from 'jss-preset-default';
 import normalize from 'normalize-jss';
 import queryString from 'query-string';
 import getMuiTheme from 'material-ui/styles/getMuiTheme';
-import { blue400, blue500, blue700 } from 'material-ui/styles/colors';
+import { grey400, blue500, blue700 } from 'material-ui/styles/colors';
 
 const muiTheme = getMuiTheme({
   palette: {
     primary1Color: blue500,
     primary2Color: blue700,
-    primary3Color: blue400,
     accent1Color: blue500,
   }
 });
diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index 8128a67..b8ae5d5 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -38,7 +38,7 @@ const _TextField = ({ name, muiTheme, ...props }, context) => (
   <TextFieldIcon
     {...props}
     icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
+    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
     disabled={context.disabled}
     value={_.get(context, name)}
     onChange={(event, value) => context.onChange(name, value)}
@@ -53,7 +53,7 @@ const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => (
     {...props}
     type="number"
     icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
+    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
     disabled={context.disabled}
     value={_.get(context, name.toString())}
     onChange={(event, value) => {
@@ -73,7 +73,7 @@ export const _Checkbox = ({ name, muiTheme, ...props }, context) => (
     <MaterialUICheckbox
       {...props}
       style={{ display: 'block' }}
-      iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }}
+      iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
       disabled={context.disabled}
       checked={_.get(context, name)}
       onCheck={(event, value) => context.onChange(name, value)}
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 48acc3e..64aeb58 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -58,7 +58,7 @@ export function createScene({ pixelRatio, muiTheme }) {
   const mesh = new Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 
-  const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary3Color);
+  const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary2Color);
   scene.add(box);
 
   let renderer = new WebGLRenderer({ alpha: true, antialias: true });

From 222a27d5b5ce1bee86c6559441214b9c80301c0a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 15:27:42 +0100
Subject: [PATCH 033/163] fix catching errors in the worker

---
 src/slicer.js        | 6 +++---
 src/slicer.worker.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slicer.js b/src/slicer.js
index ead168b..5341d9f 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -63,10 +63,10 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
     // create the slicer worker
     const slicerWorker = new SlicerWorker();
 
-    slicerWorker.onerror = error => {
+    slicerWorker.addEventListener('error', event => {
       slicerWorker.terminate();
-      reject(error);
-    };
+      reject(event);
+    });
 
     // listen to messages send from worker
     slicerWorker.addEventListener('message', (event) => {
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index 0168b7b..2d866ef 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -12,7 +12,7 @@ const onProgress = progress => {
 
 const loader = new JSONLoader();
 
-self.addEventListener('message', async (event) => {
+self.addEventListener('message', (event) => {
   const { message, data } = event.data;
   switch (message) {
     case 'SLICE': {

From 1f4ca15442a3593e888384903d4910a72dae3492 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 15:53:03 +0100
Subject: [PATCH 034/163] Show dialog for closed popups

#30
---
 src/interface/index.js | 43 +++++++++++++++++++++++++++++++++++++++---
 src/interface/utils.js | 13 ++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index f29ef78..8c521ab 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -23,6 +23,7 @@ import createSceneData from 'doodle3d-core/d3/createSceneData.js';
 import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
 import { Matrix4 } from 'three/src/math/Matrix4.js';
 import muiThemeable from 'material-ui/styles/muiThemeable';
+import Dialog from 'material-ui/Dialog';
 
 const MAX_FULLSCREEN_WIDTH = 720;
 
@@ -121,6 +122,10 @@ class Interface extends React.Component {
       popover: {
         element: null,
         open: false
+      },
+      openUrlDialog: {
+        open: true,
+        url: ''
       }
     };
   }
@@ -222,8 +227,12 @@ class Interface extends React.Component {
       const updateProgres = progress => this.setState({ progress: { ...this.state.progress, ...progress } });
       await slice(target, name, exportMesh, settings, updateProgres);
     } catch (error) {
-      this.setState({ error: error.message });
-      throw error;
+      if (error.code === 3) {
+        this.setState({ openUrlDialog: { open: true, url: error.url } });
+      } else {
+        this.setState({ error: error.message });
+        throw error;
+      }
     } finally {
       this.setState({ isSlicing: false });
     }
@@ -288,7 +297,7 @@ class Interface extends React.Component {
 
   render() {
     const { classes, onCancel } = this.props;
-    const { isSlicing, isLoading, progress, showFullScreen, error, objectDimensions } = this.state;
+    const { isSlicing, isLoading, progress, showFullScreen, error, objectDimensions, openUrlDialog } = this.state;
 
     const disableUI = isSlicing || isLoading;
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -352,6 +361,32 @@ class Interface extends React.Component {
       </div>
     );
 
+    const closeDialog = () => this.setState({ openUrlDialog: { open: false, url: '' } });
+
+    const dialog = (
+      <Dialog
+        open={openUrlDialog.open}
+        title="Open with Doodle3D Connect"
+        contentStyle={{ maxWidth: '400px' }}
+        actions={[
+          <FlatButton
+            label="Cancel"
+            onTouchTap={closeDialog}
+          />,
+          <FlatButton
+            label="Open"
+            primary
+            onTouchTap={() => {
+              window.open(openUrlDialog.url, '_blank');
+              closeDialog();
+            }}
+          />
+        ]}
+      >
+        <p>Click 'Open' to continue to Doodle3D Connect</p>
+      </Dialog>
+    )
+
     if (showFullScreen) {
       return (
         <div className={classes.container}>
@@ -359,6 +394,7 @@ class Interface extends React.Component {
           <h1 className={classes.title}>Doodle3D Slicer</h1>
           {d3Panel}
           {settingsPanel}
+          {dialog}
         </div>
       );
     } else {
@@ -379,6 +415,7 @@ class Interface extends React.Component {
               {d3Panel}
             </Tab>
           </Tabs>
+          {dialog}
         </div>
       );
     }
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 64aeb58..7f98ec4 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -118,7 +118,7 @@ const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
 const CONNECT_URL = 'http://connect.doodle3d.com/';
 
 export async function slice(target, name, mesh, settings, updateProgress) {
-  if (!settings) throw new Error('please select a printer first');
+  if (!settings) throw { message: 'please select a printer first', code: 0 };
 
   let steps;
   let currentStep = 0;
@@ -130,7 +130,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       steps = 2;
       break;
     default:
-      throw new Error('unknown target');
+      throw { message: 'unknown target', code: 1 };
       break;
   }
 
@@ -144,6 +144,8 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       action: progress.action,
       percentage: currentStep / steps + progress.done / progress.total / steps
     });
+  }).catch(error => {
+    throw { message: `error during slicing: ${error.message}`, code: 2 };
   });
   currentStep ++;
 
@@ -182,13 +184,14 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       });
       currentStep ++;
 
-      const popup = window.open(`${CONNECT_URL}?uuid=${id}`, '_blank');
-      if (!popup) throw new Error('popup was blocked by browser');
+      const url = `${CONNECT_URL}?uuid=${id}`;
+      const popup = window.open(url, '_blank');
+      if (!popup) throw { message: 'popup was blocked by browser', code: 3, url };
       break;
     }
 
     default:
-      throw new Error('unknown target');
+      throw { message: 'unknown target', code: 1 };
       break;
   }
 }

From 11222aaa823eb863c8c3c90e0f0d05bf9595c196 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 15:55:21 +0100
Subject: [PATCH 035/163] close url dialog by default

---
 src/interface/index.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 8c521ab..65fa5b1 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -119,14 +119,8 @@ class Interface extends React.Component {
       isLoading: true,
       error: null,
       objectDimensions: '0x0x0mm',
-      popover: {
-        element: null,
-        open: false
-      },
-      openUrlDialog: {
-        open: true,
-        url: ''
-      }
+      popover: { element: null, open: false },
+      openUrlDialog: { open: false, url: '' }
     };
   }
 

From 53e961b9bb87db0ba11e443310412c8cc5bc49b5 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 16:10:22 +0100
Subject: [PATCH 036/163] fix min and max props

---
 src/interface/FormComponents.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index b8ae5d5..ef1e081 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -58,8 +58,8 @@ const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => (
     value={_.get(context, name.toString())}
     onChange={(event, value) => {
       value = parseFloat(value);
-      if (min) value = Math.max(value, min);
-      if (max) value = Math.min(value, max);
+      if (typeof min === 'number') value = Math.max(value, min);
+      if (typeof max === 'number') value = Math.min(value, max);
       context.onChange(name, value);
     }}
   />

From ac85bbc6d54cb5f80041b4df56aa11d42f515947 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 16:15:13 +0100
Subject: [PATCH 037/163] use primary buttons

---
 src/interface/Settings.js | 5 +++--
 src/interface/index.js    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 9471488..b578672 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -9,6 +9,7 @@ import { grey800, red500 } from 'material-ui/styles/colors';
 import Divider from 'material-ui/Divider';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
+import RaisedButton from 'material-ui/RaisedButton';
 import { LOCAL_STORAGE_KEY } from '../constants.js';
 import shortid from 'shortid';
 import defaultSettings from '../settings/default.yml';
@@ -401,7 +402,7 @@ class Settings extends React.Component {
               label="Cancel"
               onTouchTap={this.closeAddPrinterDialog}
             />,
-            <FlatButton
+            <RaisedButton
               label="Add"
               primary
               onTouchTap={this.addPrinter}
@@ -430,7 +431,7 @@ class Settings extends React.Component {
               label="Remove Printer"
               onTouchTap={this.removeActivePrinter}
             />,
-            <FlatButton
+            <RaisedButton
               label="Save"
               primary
               onTouchTap={this.editPrinter}
diff --git a/src/interface/index.js b/src/interface/index.js
index 65fa5b1..854f820 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -367,7 +367,7 @@ class Interface extends React.Component {
             label="Cancel"
             onTouchTap={closeDialog}
           />,
-          <FlatButton
+          <RaisedButton
             label="Open"
             primary
             onTouchTap={() => {

From 742783e4dba1a2b767fa9552440a2a8dbe04813e Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 16:52:14 +0100
Subject: [PATCH 038/163] add margin to percentage container

---
 src/interface/index.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 854f820..f9245ce 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -61,6 +61,9 @@ const styles = {
   sliceActions: {
     flexShrink: 0,
   },
+  sliceInfo: {
+    margin: '10px 0'
+  },
   sliceButtons: {
     justifyContent: 'flex-end',
     display: 'flex'
@@ -303,9 +306,11 @@ class Interface extends React.Component {
           onChange={this.onChangeSettings}
         />
         <div className={classes.sliceActions}>
-          {error && <p className={classes.error}>{error}</p>}
-          {isSlicing && <p>{progress.action}</p>}
-          {isSlicing && <LinearProgress mode="determinate" value={progress.percentage * 100.0} />}
+          <div className={classes.sliceInfo}>
+            {error && <p className={classes.error}>{error}</p>}
+            {isSlicing && <p>{progress.action}</p>}
+            {isSlicing && <LinearProgress mode="determinate" value={progress.percentage * 100.0} />}
+          </div>
           <div className={classes.sliceButtons}>
             {onCancel && <RaisedButton
               label="Cancel"

From a568a79ede74a682b8aa48a18dd4325d10100ad6 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 17:18:28 +0100
Subject: [PATCH 039/163] don't require a model for the slicer interface

---
 index.js               |  2 +-
 src/interface/index.js | 64 +++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/index.js b/index.js
index 3421e5e..5e02721 100644
--- a/index.js
+++ b/index.js
@@ -36,6 +36,6 @@ const { file } = queryString.parse(location.search);
 
 render((
   <MuiThemeProvider muiTheme={muiTheme}>
-    <Interface file={file} name="doodle"/>
+    <Interface fileUrl={file} name="doodle"/>
   </MuiThemeProvider>
 ), document.getElementById('app'));
diff --git a/src/interface/index.js b/src/interface/index.js
index f9245ce..23ed9a5 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -94,10 +94,8 @@ const styles = {
 
 class Interface extends React.Component {
   static propTypes = {
-    file: PropTypes.oneOfType([
-      PropTypes.shape({ isMesh: PropTypes.oneOf([true]) }),
-      PropTypes.string
-    ]).isRequired,
+    fileUrl: PropTypes.string,
+    mesh: PropTypes.shape({ isMesh: PropTypes.oneOf([true]) }),
     classes: PropTypes.objectOf(PropTypes.string),
     pixelRatio: PropTypes.number.isRequired,
     onCancel: PropTypes.func,
@@ -119,10 +117,9 @@ class Interface extends React.Component {
       settings: null,
       showFullScreen: false,
       isSlicing: false,
-      isLoading: true,
       error: null,
       objectDimensions: '0x0x0mm',
-      popover: { element: null, open: false },
+      popover: { open: false, element: null },
       openUrlDialog: { open: false, url: '' }
     };
   }
@@ -132,20 +129,16 @@ class Interface extends React.Component {
     const { scene } = this.state;
     scene.updateCanvas(canvas);
 
-    const { file } = this.props;
-    if (!file) {
-      throw new Error('no file provided');
-    } if (typeof file === 'string') {
-      fetch(file)
+    const { mesh, fileUrl } = this.props;
+    if (mesh) {
+      this.updateMesh(mesh, scene);
+    } else if (fileUrl) {
+      fetch(fileUrl)
         .then(resonse => resonse.json())
         .then(json => JSONToSketchData(json))
         .then(file => createSceneData(file))
         .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
         .then(mesh => this.updateMesh(mesh, scene));
-    } else if (file.isMesh) {
-      this.updateMesh(file, scene);
-    } else {
-      throw new Error('unknown file property');
     }
   }
 
@@ -155,8 +148,6 @@ class Interface extends React.Component {
     placeOnGround(scene.mesh);
     this.calculateDimensions();
     scene.render();
-
-    this.setState({ mesh, isLoading: false });
   }
 
   componentWillUnmount() {
@@ -167,8 +158,8 @@ class Interface extends React.Component {
   }
 
   resetMesh = () => {
-    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
-    if (isSlicing || isLoading) return;
+    const { scene: { mesh, render }, isSlicing } = this.state;
+    if (isSlicing) return;
     if (mesh) {
       mesh.position.set(0, 0, 0);
       mesh.scale.set(1, 1, 1);
@@ -183,8 +174,8 @@ class Interface extends React.Component {
   scaleUp = () => this.scaleMesh(0.9);
   scaleDown = () => this.scaleMesh(1.0 / 0.9);
   scaleMesh = (factor) => {
-    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
-    if (isSlicing || isLoading) return;
+    const { scene: { mesh, render }, isSlicing } = this.state;
+    if (isSlicing) return;
     if (mesh) {
       mesh.scale.multiplyScalar(factor);
       mesh.updateMatrix();
@@ -198,8 +189,8 @@ class Interface extends React.Component {
   rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
   rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
   rotate = (axis, angle) => {
-    const { scene: { mesh, render }, isSlicing, isLoading } = this.state;
-    if (isSlicing || isLoading) return;
+    const { scene: { mesh, render }, isSlicing } = this.state;
+    if (isSlicing) return;
     if (mesh) {
       mesh.rotateOnWorldAxis(axis, angle);
       placeOnGround(mesh);
@@ -209,10 +200,14 @@ class Interface extends React.Component {
   };
 
   slice = async (target) => {
-    const { isSlicing, isLoading, settings, mesh, scene: { material, mesh: { matrix } } } = this.state;
+    const { isSlicing, settings, mesh, scene: { material, mesh: { matrix } } } = this.state;
     const { name } = this.props;
 
-    if (isSlicing || isLoading) return;
+    if (isSlicing) return;
+    if (!mesh) {
+      this.setState({ error: 'there is no file to slice' });
+      return;
+    }
 
     this.closePopover();
     this.setState({ isSlicing: true, progress: { action: '', percentage: 0, step: 0 }, error: null });
@@ -294,15 +289,14 @@ class Interface extends React.Component {
 
   render() {
     const { classes, onCancel } = this.props;
-    const { isSlicing, isLoading, progress, showFullScreen, error, objectDimensions, openUrlDialog } = this.state;
+    const { isSlicing, progress, showFullScreen, error, objectDimensions, openUrlDialog } = this.state;
 
-    const disableUI = isSlicing || isLoading;
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
 
     const settingsPanel = (
       <div className={classes.settingsBar} style={style}>
         <Settings
-          disabled={disableUI}
+          disabled={isSlicing}
           onChange={this.onChangeSettings}
         />
         <div className={classes.sliceActions}>
@@ -323,7 +317,7 @@ class Interface extends React.Component {
               primary
               className={`${classes.button}`}
               onTouchTap={this.openPopover}
-              disabled={disableUI}
+              disabled={isSlicing}
             />
             <Popover
               open={this.state.popover.open}
@@ -350,12 +344,12 @@ class Interface extends React.Component {
           <div className={classes.detail}>
             <p>Dimensions: {objectDimensions}</p>
           </div>
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
-          <RaisedButton disabled={disableUI} className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
+          <RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
         </div>
       </div>
     );

From b562d3c2e2530f23e943478d3474a58a6cb4aa01 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 17:42:58 +0100
Subject: [PATCH 040/163] allow for drag and dropping files

---
 src/interface/index.js | 61 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 23ed9a5..73618cd 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -100,12 +100,14 @@ class Interface extends React.Component {
     pixelRatio: PropTypes.number.isRequired,
     onCancel: PropTypes.func,
     name: PropTypes.string.isRequired,
-    muiTheme: PropTypes.object.isRequired
+    muiTheme: PropTypes.object.isRequired,
+    allowDragDrop: PropTypes.bool.isRequired
   };
 
   static defaultProps = {
     pixelRatio: 1,
-    name: 'Doodle3D'
+    name: 'Doodle3D',
+    allowDragDrop: true
   };
 
   constructor(props) {
@@ -133,16 +135,20 @@ class Interface extends React.Component {
     if (mesh) {
       this.updateMesh(mesh, scene);
     } else if (fileUrl) {
-      fetch(fileUrl)
-        .then(resonse => resonse.json())
-        .then(json => JSONToSketchData(json))
-        .then(file => createSceneData(file))
-        .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
-        .then(mesh => this.updateMesh(mesh, scene));
+      this.loadFile(fileUrl);
     }
   }
 
-  updateMesh(mesh, scene) {
+  loadFile = (fileUrl) => {
+    fetch(fileUrl)
+      .then(resonse => resonse.json())
+      .then(json => JSONToSketchData(json))
+      .then(file => createSceneData(file))
+      .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
+      .then(mesh => this.updateMesh(mesh));
+  };
+
+  updateMesh(mesh, scene = this.state.scene) {
     scene.mesh.geometry = mesh.geometry;
     centerGeometry(scene.mesh);
     placeOnGround(scene.mesh);
@@ -287,6 +293,23 @@ class Interface extends React.Component {
     this.setState({ objectDimensions: `${Math.round(x)}x${Math.round(y)}x${Math.round(z)}mm` });
   };
 
+  onDrop = (event) => {
+    event.preventDefault();
+    if (!this.props.allowDragDrop) return;
+
+    for (const file of event.dataTransfer.files) {
+      const extentions = file.name.split('.').pop();
+
+      switch (extentions.toUpperCase()) {
+        case 'D3SKETCH':
+          this.loadFile(URL.createObjectURL(file));
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
   render() {
     const { classes, onCancel } = this.props;
     const { isSlicing, progress, showFullScreen, error, objectDimensions, openUrlDialog } = this.state;
@@ -382,7 +405,15 @@ class Interface extends React.Component {
 
     if (showFullScreen) {
       return (
-        <div className={classes.container}>
+        <div
+          className={classes.container}
+          ref={(container) => {
+            if (container) {
+              container.addEventListener('dragover', event => event.preventDefault());
+              container.addEventListener('drop', this.onDrop);
+            }
+          }}
+        >
           <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
           <h1 className={classes.title}>Doodle3D Slicer</h1>
           {d3Panel}
@@ -392,7 +423,15 @@ class Interface extends React.Component {
       );
     } else {
       return (
-        <div className={classes.container}>
+        <div
+          className={classes.container}
+          ref={(container) => {
+            if (container) {
+              container.addEventListener('dragover', event => event.preventDefault());
+              container.addEventListener('drop', this.onDrop);
+            }
+          }}
+        >
           <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
           <Tabs
             style={{ width: '100%', display: 'flex', flexDirection: 'column' }}

From 082329b810d253200fa121f4175d00aa8a116b50 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 23:53:40 +0100
Subject: [PATCH 041/163] fix loading mesh

---
 src/interface/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/interface/index.js b/src/interface/index.js
index 73618cd..0bd4969 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -120,6 +120,7 @@ class Interface extends React.Component {
       showFullScreen: false,
       isSlicing: false,
       error: null,
+      mesh: null,
       objectDimensions: '0x0x0mm',
       popover: { open: false, element: null },
       openUrlDialog: { open: false, url: '' }
@@ -154,6 +155,8 @@ class Interface extends React.Component {
     placeOnGround(scene.mesh);
     this.calculateDimensions();
     scene.render();
+
+    this.setState({ mesh });
   }
 
   componentWillUnmount() {

From 0f7da8545348b9e861e5bd81858635156fe418ea Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 17 Jan 2018 23:53:49 +0100
Subject: [PATCH 042/163] Revert "Fix brim"

This reverts commit eee2682f7064a64093c3025fdb3629291561e2e9.
---
 src/sliceActions/addBrim.js         |  5 +++--
 src/sliceActions/optimizePaths.js   | 10 +++-------
 src/sliceActions/removePrecision.js |  4 +---
 src/sliceActions/slicesToGCode.js   |  4 +---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/sliceActions/addBrim.js b/src/sliceActions/addBrim.js
index 6307e9b..f3e7627 100644
--- a/src/sliceActions/addBrim.js
+++ b/src/sliceActions/addBrim.js
@@ -27,9 +27,10 @@ export default function addBrim(slices, settings) {
     }))
   ), new Shape([], true)).simplify('pftNonZero');
 
-  firstLayer.brim = [];
+  firstLayer.brim = new Shape([], true);
+
   for (let offset = 0; offset < brimSize; offset += nozzleDiameter) {
     const brimPart = brim.offset(offset, offsetOptions);
-    firstLayer.brim.unshift(brimPart);
+    firstLayer.brim = firstLayer.brim.join(brimPart);
   }
 }
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 7def91d..661e7e0 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -7,13 +7,9 @@ export default function optimizePaths(slices, settings) {
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
 
-    if (typeof slice.brim !== 'undefined') {
-      for (let i = 0; i < slice.brim.length; i ++) {
-        if (slice.brim[i].paths.length > 0) {
-          slice.brim[i] = optimizeShape(slice.brim[i], start);
-          start.copy(slice.brim[i].lastPoint(true));
-        }
-      }
+    if (typeof slice.brim !== 'undefined' && slice.brim.paths.length > 0) {
+      slice.brim = optimizeShape(slice.brim, start);
+      start.copy(slice.brim.lastPoint(true));
     }
 
     const parts = [];
diff --git a/src/sliceActions/removePrecision.js b/src/sliceActions/removePrecision.js
index a237a06..2ecd8df 100644
--- a/src/sliceActions/removePrecision.js
+++ b/src/sliceActions/removePrecision.js
@@ -25,9 +25,7 @@ export default function removePrecision(slices) {
       slice.support.scaleDown(inversePrecision);
     }
     if (typeof slice.brim !== 'undefined') {
-      for (let i = 0; i < slice.brim.length; i ++) {
-        slice.brim[i].scaleDown(inversePrecision);
-      }
+      slice.brim.scaleDown(inversePrecision);
     }
   }
 }
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 049bab5..cbc38a2 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -48,9 +48,7 @@ export default function slicesToGCode(slices, settings) {
     }, {});
 
     if (typeof slice.brim !== 'undefined') {
-      for (let i = 0; i < slice.brim.length; i ++) {
-        pathToGCode(null, false, gcode, slice.brim[i], false, false, z, profiles.brim);
-      }
+      pathToGCode(null, false, gcode, slice.brim, true, true, z, profiles.brim);
     }
 
     for (let i = 0; i < slice.parts.length; i ++) {

From bbd8bc529d968ef647f1538c7753dd084a5c339c Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 11:14:21 +0100
Subject: [PATCH 043/163] clean up

---
 src/interface/FormComponents.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index ef1e081..8cc4185 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -34,11 +34,16 @@ _SelectField.contextTypes = contextTypes;
 _SelectField.propTypes = propTypes;
 export const SelectField = muiThemeable()(_SelectField);
 
-const _TextField = ({ name, muiTheme, ...props }, context) => (
+const _TextField = ({ name, muiTheme: { palette }, ...props }, context) => (
   <TextFieldIcon
     {...props}
-    icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
+    icon={context.advancedFields.includes(name) && <RefreshIcon
+      style={{ fill: palette.textColor }}
+      onTouchTap={() => context.onChange(name, null)}
+    />}
+    floatingLabelStyle={{
+      color: context.advancedFields.includes(name) ? palette.primary1Color : palette.primary3Color
+    }}
     disabled={context.disabled}
     value={_.get(context, name)}
     onChange={(event, value) => context.onChange(name, value)}
@@ -48,12 +53,17 @@ _TextField.contextTypes = contextTypes;
 _TextField.propTypes = propTypes;
 export const TextField = muiThemeable()(_TextField);
 
-const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => (
+const _NumberField = ({ name, min, max, muiTheme: { palette }, ...props }, context) => (
   <TextFieldIcon
     {...props}
     type="number"
-    icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />}
-    floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
+    icon={context.advancedFields.includes(name) && <RefreshIcon
+      style={{ fill: palette.textColor }}
+      onTouchTap={() => context.onChange(name, null)} />
+    }
+    floatingLabelStyle={{
+      color: context.advancedFields.includes(name) ? palette.primary1Color : palette.primary3Color
+    }}
     disabled={context.disabled}
     value={_.get(context, name.toString())}
     onChange={(event, value) => {
@@ -68,17 +78,21 @@ _NumberField.contextTypes = contextTypes;
 _NumberField.propTypes = propTypes;
 export const NumberField = muiThemeable()(_NumberField);
 
-export const _Checkbox = ({ name, muiTheme, ...props }, context) => (
+export const _Checkbox = ({ name, muiTheme: { palette }, ...props }, context) => (
   <span style={{ display: 'flex', position: 'relative' }}>
     <MaterialUICheckbox
       {...props}
       style={{ display: 'block' }}
-      iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
+      iconStyle={{
+        fill: context.advancedFields.includes(name) ? palette.primary1Color : palette.primary3Color
+      }}
       disabled={context.disabled}
       checked={_.get(context, name)}
       onCheck={(event, value) => context.onChange(name, value)}
     />
-    {context.advancedFields.includes(name) && <RefreshIcon onTouchTap={() => context.onChange(name, null)} />}
+    {context.advancedFields.includes(name) && <RefreshIcon
+      onTouchTap={() => context.onChange(name, null)}
+    />}
   </span>
 );
 _Checkbox.contextTypes = contextTypes;

From 46408e0668e4cea008c9f580d59218ef62c3f4aa Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 11:40:57 +0100
Subject: [PATCH 044/163] add analyse script

---
 package-lock.json | 2032 ++++++---------------------------------------
 package.json      |    4 +-
 webpack.config.js |    9 +-
 3 files changed, 253 insertions(+), 1792 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 984bc97..795aae2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,11 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@doodle3d/cal": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@doodle3d/cal/-/cal-0.0.8.tgz",
-      "integrity": "sha512-1qXg62qaZkc/zYPan37CXvUtaJk4aFVLz2y8cqnkN9Y0r1Er5soIZ5esMz4YYyjUrQGawBoYcGvatRALYnzlvg=="
-    },
     "@doodle3d/clipper-js": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.7.tgz",
@@ -22,122 +17,10 @@
       "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz",
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
-    "@doodle3d/doodle3d-core": {
-      "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
-      "requires": {
-        "@doodle3d/cal": "0.0.8",
-        "@doodle3d/clipper-js": "1.0.7",
-        "@doodle3d/fill-path": "1.0.7",
-        "@doodle3d/potrace-js": "0.0.6",
-        "@doodle3d/threejs-export-obj": "0.0.8",
-        "@doodle3d/threejs-export-stl": "0.0.5",
-        "@doodle3d/touch-events": "0.0.7",
-        "babel-polyfill": "6.26.0",
-        "bezier-js": "2.2.5",
-        "blueimp-canvas-to-blob": "3.14.0",
-        "bowser": "1.8.1",
-        "fit-curve": "0.1.6",
-        "google-fonts-webpack-plugin": "0.4.4",
-        "imports-loader": "0.7.1",
-        "jss": "9.5.1",
-        "keycode": "2.1.9",
-        "lodash": "4.17.4",
-        "memoizee": "0.3.10",
-        "normalize-wheel": "1.0.1",
-        "pouchdb": "6.4.1",
-        "proptypes": "1.1.0",
-        "raf": "3.4.0",
-        "ramda": "0.21.0",
-        "react": "16.1.0",
-        "react-addons-update": "15.6.2",
-        "react-jss": "7.2.0",
-        "react-notification-system-redux": "1.2.0",
-        "react-redux": "5.0.6",
-        "react-resize-detector": "1.1.0",
-        "react-svg-inline": "2.0.1",
-        "redux-form": "7.2.0",
-        "redux-undo": "1.0.0-beta9-9-7",
-        "reselect": "3.0.1",
-        "semver": "5.4.1",
-        "shortid": "2.2.8",
-        "three": "0.88.0",
-        "three-js-csg": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045",
-        "valid-url": "1.0.9"
-      },
-      "dependencies": {
-        "jss": {
-          "version": "9.5.1",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
-          "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
-          "requires": {
-            "is-in-browser": "1.1.3",
-            "symbol-observable": "1.1.0",
-            "warning": "3.0.0"
-          }
-        },
-        "symbol-observable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
-          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
-        },
-        "three-js-csg": {
-          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
-        }
-      }
-    },
-    "@doodle3d/fill-path": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz",
-      "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==",
-      "requires": {
-        "@doodle3d/clipper-js": "1.0.7"
-      }
-    },
-    "@doodle3d/potrace-js": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@doodle3d/potrace-js/-/potrace-js-0.0.6.tgz",
-      "integrity": "sha512-w1+sG3ClsSaQwo3ks5wl6QLe4aWEHBe8QePq0IeAcj+lypqo770sUcWVfEZWUFBumAhSlCJg3GRc8MsycHy8LA=="
-    },
-    "@doodle3d/threejs-export-obj": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-obj/-/threejs-export-obj-0.0.8.tgz",
-      "integrity": "sha512-HVnJCvrjj3FqHJ5+CLVT1oZ0OjS2eOvrpMKjo71Jg7bdrusluIRlF7w9JdaoZs3ScWASAucu2cvTKJ+OAm3Rhw==",
-      "requires": {
-        "jszip": "3.1.5",
-        "three": "0.88.0"
-      }
-    },
-    "@doodle3d/threejs-export-stl": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-stl/-/threejs-export-stl-0.0.5.tgz",
-      "integrity": "sha512-GeApmYL657Dug8/+WOHGGijJbQ52dN2AWkhz9FsCe9sehZRhCg0fOg4LKXNS0XGKWMQbyumlbrmCWZrK73sfJA==",
-      "requires": {
-        "babel-preset-env": "1.6.1",
-        "three": "0.88.0"
-      }
-    },
-    "@doodle3d/touch-events": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@doodle3d/touch-events/-/touch-events-0.0.7.tgz",
-      "integrity": "sha512-EpL8IEGKKy2gqFFlxA4n84IeAyPTrEzle0jwmRv+mmVBzwGr6xDl5Ga5vJIrg2WcYs4Xc7qWbiKSHEXvEpDLlg==",
-      "requires": {
-        "eventdispatcher.js": "0.0.2",
-        "pepjs": "0.4.3"
-      }
-    },
-    "abstract-leveldown": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
-      "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
-      "requires": {
-        "xtend": "4.0.1"
-      }
-    },
     "accepts": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
       "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
-      "dev": true,
       "requires": {
         "mime-types": "2.1.17",
         "negotiator": "0.6.1"
@@ -146,8 +29,7 @@
     "acorn": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
-      "dev": true
+      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w=="
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -221,20 +103,6 @@
         "micromatch": "2.3.11"
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-      "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
-      }
-    },
     "argparse": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
@@ -244,11 +112,6 @@
         "sprintf-js": "1.0.3"
       }
     },
-    "argsarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
-      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
-    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -318,11 +181,6 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
     "asn1.js": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
@@ -343,11 +201,6 @@
         "util": "0.10.3"
       }
     },
-    "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
-    },
     "async": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
@@ -363,25 +216,10 @@
       "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
       "dev": true
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "attempt-x": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.1.tgz",
-      "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA=="
-    },
-    "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
     "babel-cli": {
       "version": "6.24.1",
@@ -474,6 +312,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
       "requires": {
         "babel-helper-explode-assignable-expression": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -525,6 +364,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -536,6 +376,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -547,6 +388,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -556,6 +398,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -566,7 +409,8 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+          "dev": true
         }
       }
     },
@@ -574,6 +418,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-traverse": "6.25.0",
@@ -617,6 +462,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -626,6 +472,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -635,6 +482,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
@@ -645,6 +493,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -654,6 +503,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -664,7 +514,8 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+          "dev": true
         }
       }
     },
@@ -672,6 +523,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -684,6 +536,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
       "requires": {
         "babel-helper-optimise-call-expression": "6.24.1",
         "babel-messages": "6.23.0",
@@ -726,6 +579,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -733,7 +587,8 @@
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
@@ -773,7 +628,8 @@
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
@@ -808,7 +664,8 @@
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
@@ -825,6 +682,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
       "requires": {
         "babel-helper-remap-async-to-generator": "6.24.1",
         "babel-plugin-syntax-async-functions": "6.13.0",
@@ -880,6 +738,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -888,6 +747,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -896,6 +756,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.26.0",
@@ -908,6 +769,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -918,6 +780,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -927,6 +790,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -939,6 +803,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -955,6 +820,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -965,12 +831,14 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+          "dev": true
         }
       }
     },
@@ -978,6 +846,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
       "requires": {
         "babel-helper-define-map": "6.26.0",
         "babel-helper-function-name": "6.24.1",
@@ -994,6 +863,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.25.0"
@@ -1003,6 +873,7 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1011,6 +882,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1020,6 +892,7 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1028,6 +901,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1038,6 +912,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1046,6 +921,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1056,6 +932,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+      "dev": true,
       "requires": {
         "babel-plugin-transform-strict-mode": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1067,6 +944,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -1077,6 +955,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -1086,6 +965,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -1098,6 +978,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -1114,6 +995,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -1124,12 +1006,14 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+          "dev": true
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+          "dev": true
         }
       }
     },
@@ -1137,6 +1021,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1147,6 +1032,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-amd": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1157,6 +1043,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
       "requires": {
         "babel-helper-replace-supers": "6.24.1",
         "babel-runtime": "6.26.0"
@@ -1166,6 +1053,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
       "requires": {
         "babel-helper-call-delegate": "6.24.1",
         "babel-helper-get-function-arity": "6.24.1",
@@ -1179,6 +1067,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1188,6 +1077,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1196,6 +1086,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1206,6 +1097,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1214,6 +1106,7 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1222,6 +1115,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1232,6 +1126,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
       "requires": {
         "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
         "babel-plugin-syntax-exponentiation-operator": "6.13.0",
@@ -1340,6 +1235,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
       "requires": {
         "regenerator-transform": "0.10.1"
       }
@@ -1357,6 +1253,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1366,6 +1263,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "core-js": "2.5.3",
@@ -1376,6 +1274,7 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
           "requires": {
             "core-js": "2.5.3",
             "regenerator-runtime": "0.11.1"
@@ -1384,14 +1283,16 @@
             "regenerator-runtime": {
               "version": "0.11.1",
               "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+              "dev": true
             }
           }
         },
         "core-js": {
           "version": "2.5.3",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
+          "dev": true
         }
       }
     },
@@ -1399,6 +1300,7 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
       "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
+      "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
         "babel-plugin-syntax-trailing-function-commas": "6.22.0",
@@ -1627,24 +1529,11 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "bezier-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
-      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
-    },
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
     },
     "binary-extensions": {
       "version": "1.8.0",
@@ -1652,30 +1541,12 @@
       "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
       "dev": true
     },
-    "bindings": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
-      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
-    },
-    "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
       "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
-    "blueimp-canvas-to-blob": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz",
-      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ=="
-    },
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
@@ -1686,7 +1557,6 @@
       "version": "1.18.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
       "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-      "dev": true,
       "requires": {
         "bytes": "3.0.0",
         "content-type": "1.0.4",
@@ -1704,7 +1574,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -1731,14 +1600,6 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
     "bowser": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.8.1.tgz",
@@ -1850,6 +1711,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.8.0.tgz",
       "integrity": "sha512-iiWHM1Et6Q4TQpB7Ar6pxuM3TNMXasVJY4Y/oh3q38EwR3Z+IdZ9MyVf7PI4MJFB4xpwMcZgs9bEUnPG2E3TCA==",
+      "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000760",
         "electron-to-chromium": "1.3.27"
@@ -1866,19 +1728,6 @@
         "isarray": "1.0.0"
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-    },
-    "buffer-from": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
-      "integrity": "sha1-V7GLHaChnsBvM4N6UnWiQjUb114=",
-      "requires": {
-        "is-array-buffer-x": "1.7.0"
-      }
-    },
     "buffer-indexof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
@@ -1906,13 +1755,7 @@
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
-    },
-    "cached-constructors-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.0.tgz",
-      "integrity": "sha512-JVP0oilYlPgBTD8bkQ+of7hSIJRtydCCJiMtzdRMXVQ98gdj0NyrJTZzbu5wtlO26Ev/1HXRTtbBNsVlLJ3+3A=="
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "camel-case": {
       "version": "3.0.0",
@@ -1951,12 +1794,8 @@
     "caniuse-lite": {
       "version": "1.0.30000760",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz",
-      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8="
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8=",
+      "dev": true
     },
     "center-align": {
       "version": "0.1.3",
@@ -2007,11 +1846,6 @@
         "readdirp": "2.1.0"
       }
     },
-    "chownr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
-    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2022,11 +1856,6 @@
         "safe-buffer": "5.1.1"
       }
     },
-    "classnames": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
-      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
-    },
     "clean-css": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
@@ -2047,34 +1876,22 @@
         "wordwrap": "0.0.2"
       }
     },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
     },
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "dev": true
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
     },
     "commondir": {
       "version": "1.0.1",
@@ -2138,11 +1955,6 @@
         "date-now": "0.1.4"
       }
     },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -2152,14 +1964,12 @@
     "content-disposition": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
     },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "convert-source-map": {
       "version": "1.5.0",
@@ -2170,14 +1980,12 @@
     "cookie": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "core-js": {
       "version": "2.4.1",
@@ -2187,7 +1995,8 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "create-ecdh": {
       "version": "4.0.0",
@@ -2246,14 +2055,6 @@
         "which": "1.3.0"
       }
     },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "requires": {
-        "boom": "2.10.1"
-      }
-    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -2320,25 +2121,11 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
       "requires": {
         "es5-ext": "0.10.35"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -2367,20 +2154,8 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
-    },
-    "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
-    },
-    "deferred-leveldown": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-2.0.3.tgz",
-      "integrity": "sha512-8c2Hv+vIwKNc7qqy4zE3t5DIsln+FQnudcyjLYstHwLFg7XnXZT/H8gQb8lj6xi8xqGM0Bz633ZWcCkonycBTA==",
-      "requires": {
-        "abstract-leveldown": "3.0.0"
-      }
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
     },
     "define-properties": {
       "version": "1.1.2",
@@ -2414,21 +2189,10 @@
         }
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
     "depd": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-      "dev": true
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
     },
     "des.js": {
       "version": "1.0.0",
@@ -2443,8 +2207,7 @@
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
     "detect-indent": {
       "version": "4.0.0",
@@ -2568,30 +2331,26 @@
         "domelementtype": "1.3.0"
       }
     },
-    "double-ended-queue": {
-      "version": "2.1.0-0",
-      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
-      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
-    },
-    "ecc-jsbn": {
+    "duplexer": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
     },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "ejs": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
+      "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
     },
     "electron-to-chromium": {
       "version": "1.3.27",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0="
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "dev": true
     },
     "elliptic": {
       "version": "6.4.0",
@@ -2611,13 +2370,13 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
     },
     "encodeurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
-      "dev": true
+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
     },
     "encoding": {
       "version": "0.1.12",
@@ -2627,39 +2386,6 @@
         "iconv-lite": "0.4.19"
       }
     },
-    "encoding-down": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-3.0.1.tgz",
-      "integrity": "sha512-uvx+39YNqiPLqhXAvOSGBVy/oYBh4p2ShwG9YFCipwgfOhnVIOxuOPE3R9dEGM44bn0VHIrC3ojXq6lNf2ulwg==",
-      "requires": {
-        "abstract-leveldown": "3.0.0",
-        "level-codec": "8.0.0",
-        "level-errors": "1.1.2"
-      },
-      "dependencies": {
-        "level-codec": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz",
-          "integrity": "sha512-gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="
-        }
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "end-stream": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz",
-      "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=",
-      "requires": {
-        "write-stream": "0.4.3"
-      }
-    },
     "enhanced-resolve": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
@@ -2682,6 +2408,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "dev": true,
       "requires": {
         "prr": "0.0.0"
       }
@@ -2723,20 +2450,17 @@
       "version": "0.10.35",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
       "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+      "dev": true,
       "requires": {
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
-    },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35",
@@ -2757,11 +2481,6 @@
         "event-emitter": "0.3.5"
       }
     },
-    "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
-    },
     "es6-set": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -2779,6 +2498,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
@@ -2799,8 +2519,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -2849,23 +2568,18 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
       }
     },
-    "eventdispatcher.js": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/eventdispatcher.js/-/eventdispatcher.js-0.0.2.tgz",
-      "integrity": "sha1-wntZzkEEa2iUEu3M/UzYr8ZM2DU="
-    },
     "eventemitter3": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
@@ -2930,16 +2644,10 @@
         "fill-range": "2.2.3"
       }
     },
-    "expand-template": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz",
-      "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ=="
-    },
     "express": {
       "version": "4.16.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
       "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
-      "dev": true,
       "requires": {
         "accepts": "1.3.4",
         "array-flatten": "1.1.1",
@@ -2976,25 +2684,18 @@
         "array-flatten": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-          "dev": true
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
         },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         }
       }
     },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
     "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -3004,22 +2705,12 @@
         "is-extglob": "1.0.0"
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
-    "fast-future": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz",
-      "integrity": "sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo="
-    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -3056,14 +2747,6 @@
         }
       }
     },
-    "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "requires": {
-        "pend": "1.2.0"
-      }
-    },
     "file-saver": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
@@ -3075,6 +2758,11 @@
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
       "dev": true
     },
+    "filesize": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
+      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g=="
+    },
     "fill-range": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
@@ -3092,7 +2780,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
       "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "1.0.1",
@@ -3107,7 +2794,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -3135,11 +2821,6 @@
         "pinkie-promise": "2.0.1"
       }
     },
-    "fit-curve": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/fit-curve/-/fit-curve-0.1.6.tgz",
-      "integrity": "sha1-w72+b1oqO+j4Aerr2kBpGRJWqVs="
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3161,32 +2842,15 @@
       "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
     },
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-readdir-recursive": {
       "version": "1.0.0",
@@ -4105,33 +3769,6 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
-      },
-      "dependencies": {
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        }
-      }
-    },
     "get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
@@ -4150,26 +3787,6 @@
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
-    "github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
-    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -4221,70 +3838,26 @@
         "pinkie-promise": "2.0.1"
       }
     },
-    "google-fonts-webpack-plugin": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-0.4.4.tgz",
-      "integrity": "sha512-+e2D9/DVBG9EDydRovzoqMZ658SsTBGbC0c65GyZqkwNvdj8vRSYQKXqbz7/yt7QaXsCPT1MpH45r3ivWOitcw==",
-      "requires": {
-        "lodash": "4.17.4",
-        "node-fetch": "1.7.3",
-        "webpack-sources": "0.2.3",
-        "yauzl": "2.9.1"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
-          "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE="
-        },
-        "webpack-sources": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
-          "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
-          "requires": {
-            "source-list-map": "1.1.2",
-            "source-map": "0.5.6"
-          }
-        }
-      }
-    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
+    "gzip-size": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
+      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "requires": {
+        "duplexer": "0.1.1"
+      }
+    },
     "handle-thing": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
       "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
       "dev": true
     },
-    "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
-    },
-    "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-      "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        }
-      }
-    },
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -4308,34 +3881,6 @@
       "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
       "dev": true
     },
-    "has-own-property-x": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
-      "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "to-object-x": "1.5.0",
-        "to-property-key-x": "2.0.2"
-      }
-    },
-    "has-symbol-support-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
-      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
-    },
-    "has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "requires": {
-        "has-symbol-support-x": "1.4.1"
-      }
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
     "hash-base": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
@@ -4355,17 +3900,6 @@
         "minimalistic-assert": "1.0.0"
       }
     },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -4383,11 +3917,6 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-    },
     "hoist-non-react-statics": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
@@ -4534,7 +4063,6 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
       "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-      "dev": true,
       "requires": {
         "depd": "1.1.1",
         "inherits": "2.0.3",
@@ -4545,8 +4073,7 @@
         "setprototypeof": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
-          "dev": true
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
         }
       }
     },
@@ -4595,16 +4122,6 @@
         }
       }
     },
-    "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-      "requires": {
-        "assert-plus": "0.2.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
-      }
-    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -4627,11 +4144,6 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
-    "immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
-    },
     "import-local": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz",
@@ -4666,6 +4178,7 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
       "integrity": "sha1-8gS180cCoywdt9SNidXoZ6BEElM=",
+      "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
         "source-map": "0.5.6"
@@ -4686,11 +4199,6 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
-    "infinity-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.0.tgz",
-      "integrity": "sha512-wjy2TupBtZ+aAniKt+xs/PO0xOkuaL6wBysUKbgD7aL1PMW/qY5xXDG59zXZ7dU+gk3zwXOu4yIEWPCEFBTgHQ=="
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4706,11 +4214,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-    },
     "inline-style-prefixer": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz",
@@ -4758,20 +4261,7 @@
     "ipaddr.js": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=",
-      "dev": true
-    },
-    "is-array-buffer-x": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/is-array-buffer-x/-/is-array-buffer-x-1.7.0.tgz",
-      "integrity": "sha512-ufSZRMY2WZX5xyNvk0NOZAG7cgi35B/sGQDGqv8w0X7MoQ2GC9vedanJhuYTPaC4PUCqLQsda1w7NF+dPZmAJw==",
-      "requires": {
-        "attempt-x": "1.1.1",
-        "has-to-string-tag-x": "1.4.1",
-        "is-object-like-x": "1.6.0",
-        "object-get-own-property-descriptor-x": "3.2.0",
-        "to-string-tag-x": "1.4.2"
-      }
+      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -4812,7 +4302,8 @@
     "is-date-object": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -4841,14 +4332,6 @@
       "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
       "dev": true
     },
-    "is-falsey-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.1.tgz",
-      "integrity": "sha512-XWNZC4A+3FX1ECoMjspuEFgSdio82IWjqY/suE0gZ10QA7nzHd/KraRq7Tc5VEHtFRgTRyTdY6W+ykPrDnyoAQ==",
-      "requires": {
-        "to-boolean-x": "1.0.1"
-      }
-    },
     "is-finite": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
@@ -4858,19 +4341,11 @@
         "number-is-nan": "1.0.1"
       }
     },
-    "is-finite-x": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.2.tgz",
-      "integrity": "sha512-HyFrxJZsgmP5RtR1PVlVvHSP4VslZOqr4uoq4x3rDrSOFaYp4R9tfmiWtAzQxPzixXhac3cYEno3NuVn0OHk2Q==",
-      "requires": {
-        "infinity-x": "1.0.0",
-        "is-nan-x": "1.0.1"
-      }
-    },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -4880,21 +4355,6 @@
       "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
       "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU="
     },
-    "is-function-x": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.3.0.tgz",
-      "integrity": "sha512-SreSSU1dlgYaXR5c0mm4qJHKYHIiGiEY+7Cd8/aRLLoMP/VvofD2XcWgBnP833ajpU5XzXbUSpfysnfKZLJFlg==",
-      "requires": {
-        "attempt-x": "1.1.1",
-        "has-to-string-tag-x": "1.4.1",
-        "is-falsey-x": "1.0.1",
-        "is-primitive": "2.0.0",
-        "normalize-space-x": "3.0.0",
-        "replace-comments-x": "2.0.0",
-        "to-boolean-x": "1.0.1",
-        "to-string-tag-x": "1.4.2"
-      }
-    },
     "is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
@@ -4909,32 +4369,6 @@
       "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
       "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
     },
-    "is-index-x": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.1.0.tgz",
-      "integrity": "sha512-qULKLMepQLGC8rSVdi8uF2vI4LiDrU9XSDg1D+Aa657GIB7GV1jHpga7uXgQvkt/cpQ5mVBHUFTpSehYSqT6+A==",
-      "requires": {
-        "math-clamp-x": "1.2.0",
-        "max-safe-integer": "1.0.1",
-        "to-integer-x": "3.0.0",
-        "to-number-x": "2.0.0",
-        "to-string-symbols-supported-x": "1.0.0"
-      }
-    },
-    "is-nan-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.1.tgz",
-      "integrity": "sha512-VfNJgfuT8USqKCYQss8g7sFvCzDnL+OOVMQoXhVoulZAyp0ZTj3oyZaaPrn2dxepAkKSQI2BiKHbBabX1DqVtw=="
-    },
-    "is-nil-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.1.tgz",
-      "integrity": "sha512-cfTKWI5iSR04SSCzzugTH5tS2rYG7kwI8yl/AqWkyuxZ7k55cbA47Y7Lezdg1N9aaELd+UxLg628bdQeNQ6BUw==",
-      "requires": {
-        "lodash.isnull": "3.0.0",
-        "validate.io-undefined": "1.0.3"
-      }
-    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -4944,15 +4378,6 @@
         "kind-of": "3.2.2"
       }
     },
-    "is-object-like-x": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.6.0.tgz",
-      "integrity": "sha512-mc3dBMv1jEOdk0f1i2RkJFsZDux0MuHqGwHOoRo770ShUOf4VE6tWThAW8dAZARr9a5RN+iNX1yzMDA5ad1clQ==",
-      "requires": {
-        "is-function-x": "3.3.0",
-        "is-primitive": "2.0.0"
-      }
-    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -5001,12 +4426,8 @@
     "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -5022,20 +4443,11 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
-    "is-string": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
-    },
     "is-symbol": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -5052,7 +4464,8 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -5078,11 +4491,6 @@
         "whatwg-fetch": "2.0.3"
       }
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -5098,12 +4506,6 @@
         "esprima": "4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -5116,30 +4518,12 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "dev": true
     },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "requires": {
-        "jsonify": "0.0.0"
-      }
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
     "json3": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -5149,30 +4533,8 @@
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
     },
     "jss": {
       "version": "8.1.0",
@@ -5256,43 +4618,6 @@
         "css-vendor": "0.3.8"
       }
     },
-    "jszip": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
-      "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
-      "requires": {
-        "core-js": "2.3.0",
-        "es6-promise": "3.0.2",
-        "lie": "3.1.1",
-        "pako": "1.0.6",
-        "readable-stream": "2.0.6"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
-          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
     "keycode": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz",
@@ -5328,93 +4653,6 @@
         "invert-kv": "1.0.0"
       }
     },
-    "level": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/level/-/level-2.1.1.tgz",
-      "integrity": "sha512-jhsItEs/L5bf5ctKsvIPcMzeh4nwXxnL3Tsxm4E9My07jcFfqEYwKP57Y9AZu7tmtECdyK6bvCqoClwuOBuY9w==",
-      "requires": {
-        "level-packager": "2.1.0",
-        "leveldown": "2.1.1"
-      }
-    },
-    "level-codec": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
-      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ=="
-    },
-    "level-errors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz",
-      "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==",
-      "requires": {
-        "errno": "0.1.4"
-      }
-    },
-    "level-iterator-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.0.tgz",
-      "integrity": "sha512-TWOYw8HR5mhj6xwoVLo0yu26RPL6v28KgvhK1kY1CJf9LyL+rJXjx99zhORTYhN9ysOBIH+iaxAiqRteA+C1/g==",
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
-      }
-    },
-    "level-packager": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-2.1.0.tgz",
-      "integrity": "sha512-I97zvGOZ6fJ9OFfYv+QmgBpDWbC+UaP5ERJ3oraTyk1v+ABAL4tazris5ym5qL2iLe+qNjXNM/iP8LQcoZMEWw==",
-      "requires": {
-        "encoding-down": "3.0.1",
-        "levelup": "2.0.1"
-      }
-    },
-    "level-write-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz",
-      "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=",
-      "requires": {
-        "end-stream": "0.1.0"
-      }
-    },
-    "leveldown": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-2.1.1.tgz",
-      "integrity": "sha512-JNMCTSchq1YtQLMGePmT07UE7hIIYR4GHpZI7+nUXbM9XgNtRAwcBGhnyJyITwpTILTkUcNPBKZ9lZmTUj2E3g==",
-      "requires": {
-        "abstract-leveldown": "3.0.0",
-        "bindings": "1.3.0",
-        "fast-future": "1.0.2",
-        "nan": "2.8.0",
-        "prebuild-install": "2.4.1"
-      },
-      "dependencies": {
-        "nan": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-          "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
-        }
-      }
-    },
-    "levelup": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/levelup/-/levelup-2.0.1.tgz",
-      "integrity": "sha1-PckbPmMtN8nlRiOchkEYsATJ+GA=",
-      "requires": {
-        "deferred-leveldown": "2.0.3",
-        "level-errors": "1.1.2",
-        "level-iterator-stream": "2.0.0",
-        "xtend": "4.0.1"
-      }
-    },
-    "lie": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
-      "requires": {
-        "immediate": "3.0.6"
-      }
-    },
     "load-json-file": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -5437,6 +4675,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
       "requires": {
         "big.js": "3.2.0",
         "emojis-list": "2.1.0",
@@ -5466,16 +4705,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
     },
-    "lodash-es": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
-      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
-    },
-    "lodash.isnull": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
-      "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4="
-    },
     "lodash.merge": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz",
@@ -5532,19 +4761,6 @@
         "yallist": "2.1.2"
       }
     },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "requires": {
-        "es5-ext": "0.10.35"
-      }
-    },
-    "ltgt": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.0.tgz",
-      "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI="
-    },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -5612,28 +4828,6 @@
         }
       }
     },
-    "math-clamp-x": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.2.0.tgz",
-      "integrity": "sha512-tqpjpBcIf9UulApz3EjWXqTZpMlr2vLN9PryC9ghoyCuRmqZaf3JJhPddzgQpJnKLi2QhoFnvKBFtJekAIBSYg==",
-      "requires": {
-        "to-number-x": "2.0.0"
-      }
-    },
-    "math-sign-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
-      "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
-      "requires": {
-        "is-nan-x": "1.0.1",
-        "to-number-x": "2.0.0"
-      }
-    },
-    "max-safe-integer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
-      "integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA="
-    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -5659,8 +4853,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
       "version": "1.1.0",
@@ -5671,60 +4864,6 @@
         "mimic-fn": "1.1.0"
       }
     },
-    "memoizee": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.10.tgz",
-      "integrity": "sha1-TsoNiu057J0Bf0xcLy9kMvQuXI8=",
-      "requires": {
-        "d": "0.1.1",
-        "es5-ext": "0.10.35",
-        "es6-weak-map": "0.1.4",
-        "event-emitter": "0.3.5",
-        "lru-queue": "0.1.0",
-        "next-tick": "0.2.2",
-        "timers-ext": "0.1.2"
-      },
-      "dependencies": {
-        "d": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
-          "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
-          "requires": {
-            "es5-ext": "0.10.35"
-          }
-        },
-        "es6-iterator": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
-          "integrity": "sha1-1vWLjE/EE8JJtLqhl2j45NfIlE4=",
-          "requires": {
-            "d": "0.1.1",
-            "es5-ext": "0.10.35",
-            "es6-symbol": "2.0.1"
-          }
-        },
-        "es6-symbol": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
-          "integrity": "sha1-dhtcZ8/U8dGK+yNPaR1nhoLLO/M=",
-          "requires": {
-            "d": "0.1.1",
-            "es5-ext": "0.10.35"
-          }
-        },
-        "es6-weak-map": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz",
-          "integrity": "sha1-cGzvnpmqI2undmwjnIueKG6n0ig=",
-          "requires": {
-            "d": "0.1.1",
-            "es5-ext": "0.10.35",
-            "es6-iterator": "0.1.3",
-            "es6-symbol": "2.0.1"
-          }
-        }
-      }
-    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -5818,14 +4957,12 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
       "version": "2.3.11",
@@ -5945,11 +5082,6 @@
       "dev": true,
       "optional": true
     },
-    "nan-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.0.tgz",
-      "integrity": "sha512-yw4Fhe2/UTzanQ4f0yHWkRnfTuHZFAi4GZDjXS4G+qv5BqXTqPJBbSxpa7MyyW9v4Y4ZySZQik1vcbNkhdnIOg=="
-    },
     "ncname": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
@@ -5962,13 +5094,7 @@
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
-      "integrity": "sha1-ddpKkn7liH45BliABltzNkE7MQ0="
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
     "no-case": {
       "version": "2.3.2",
@@ -5979,14 +5105,6 @@
         "lower-case": "1.1.4"
       }
     },
-    "node-abi": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
-      "integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==",
-      "requires": {
-        "semver": "5.4.1"
-      }
-    },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -6033,11 +5151,6 @@
         "vm-browserify": "0.0.4"
       }
     },
-    "noop-logger": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
-      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
-    },
     "normalize-jss": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/normalize-jss/-/normalize-jss-4.0.0.tgz",
@@ -6065,21 +5178,6 @@
         "remove-trailing-separator": "1.0.2"
       }
     },
-    "normalize-space-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
-      "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "trim-x": "3.0.0",
-        "white-space-x": "3.0.0"
-      }
-    },
-    "normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -6089,17 +5187,6 @@
         "path-key": "2.0.1"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "requires": {
-        "are-we-there-yet": "1.1.4",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
-      }
-    },
     "nth-check": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
@@ -6112,35 +5199,14 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
-    "object-get-own-property-descriptor-x": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/object-get-own-property-descriptor-x/-/object-get-own-property-descriptor-x-3.2.0.tgz",
-      "integrity": "sha512-Z/0fIrptD9YuzN+SNK/1kxAEaBcPQM4gSrtOSMSi9eplnL/AbyQcAyAlreAoAzmBon+DQ1Z+AdhxyQSvav5Fyg==",
-      "requires": {
-        "attempt-x": "1.1.1",
-        "has-own-property-x": "3.2.0",
-        "has-symbol-support-x": "1.4.1",
-        "is-falsey-x": "1.0.1",
-        "is-index-x": "1.1.0",
-        "is-primitive": "2.0.0",
-        "is-string": "1.0.4",
-        "property-is-enumerable-x": "1.1.0",
-        "to-object-x": "1.5.0",
-        "to-property-key-x": "2.0.2"
-      }
-    },
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
@@ -6167,7 +5233,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -6182,10 +5247,16 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1.0.2"
       }
     },
+    "opener": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz",
+      "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg="
+    },
     "opn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
@@ -6225,7 +5296,8 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
     },
     "os-locale": {
       "version": "2.1.0",
@@ -6285,7 +5357,8 @@
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "dev": true
     },
     "param-case": {
       "version": "2.1.1",
@@ -6321,17 +5394,6 @@
         "is-glob": "2.0.1"
       }
     },
-    "parse-int-x": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
-      "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "nan-x": "1.0.0",
-        "to-string-x": "1.4.2",
-        "trim-left-x": "3.0.0"
-      }
-    },
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -6344,8 +5406,7 @@
     "parseurl": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-      "dev": true
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
     },
     "path-browserify": {
       "version": "0.0.0",
@@ -6383,8 +5444,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
     "path-type": {
       "version": "2.0.0",
@@ -6408,21 +5468,6 @@
         "sha.js": "2.4.9"
       }
     },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-    },
-    "pepjs": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.4.3.tgz",
-      "integrity": "sha1-FggOlwqud5kTdWwtrviOqnSG30E="
-    },
-    "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -6472,97 +5517,6 @@
         }
       }
     },
-    "pouchdb": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.1.tgz",
-      "integrity": "sha512-7YrhsBXbQh/iPA8O5Nzixi9QigaQJjqbbCFr+D7Kc258oeXNW9a0t/tOME1Lh84TJiFRuN9982FGVnrBrUhLiA==",
-      "requires": {
-        "argsarray": "0.0.1",
-        "buffer-from": "0.1.1",
-        "clone-buffer": "1.0.0",
-        "debug": "3.0.1",
-        "double-ended-queue": "2.1.0-0",
-        "immediate": "3.0.6",
-        "inherits": "2.0.3",
-        "level": "2.1.1",
-        "level-codec": "7.0.1",
-        "level-write-stream": "1.0.0",
-        "leveldown": "2.1.1",
-        "levelup": "2.0.1",
-        "lie": "3.1.1",
-        "ltgt": "2.2.0",
-        "readable-stream": "1.0.33",
-        "request": "2.80.0",
-        "spark-md5": "3.0.0",
-        "through2": "2.0.3",
-        "uuid": "3.2.0",
-        "vuvuzela": "1.0.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
-          "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.33",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "integrity": "sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        },
-        "uuid": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.0.tgz",
-          "integrity": "sha512-qC0vMFX6q6ee8JaoTF2Om1uL8KAV1ATUjVaHRxLiPJkIsp8JZl6ZjG0MIB+twZFLbi1vXj30rqj4zlqYiOS9xg=="
-        }
-      }
-    },
-    "prebuild-install": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.4.1.tgz",
-      "integrity": "sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA==",
-      "requires": {
-        "expand-template": "1.1.0",
-        "github-from-package": "0.0.0",
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "node-abi": "2.1.2",
-        "noop-logger": "0.1.1",
-        "npmlog": "4.1.2",
-        "os-homedir": "1.0.2",
-        "pump": "1.0.3",
-        "rc": "1.2.3",
-        "simple-get": "1.4.3",
-        "tar-fs": "1.16.0",
-        "tunnel-agent": "0.6.0",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
-      }
-    },
     "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -6582,7 +5536,8 @@
     "private": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE="
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "dev": true
     },
     "process": {
       "version": "0.11.10",
@@ -6593,7 +5548,8 @@
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
     },
     "promise": {
       "version": "7.3.1",
@@ -6613,15 +5569,6 @@
         "object-assign": "4.1.1"
       }
     },
-    "property-is-enumerable-x": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz",
-      "integrity": "sha512-22cKy3w3OpRswU6to9iKWDDlg+F9vF2REcwGlGW23jyLjHb1U/jJEWA44sWupOnkhGfDgotU6Lw+N2oyhNi+5A==",
-      "requires": {
-        "to-object-x": "1.5.0",
-        "to-property-key-x": "2.0.2"
-      }
-    },
     "proptypes": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proptypes/-/proptypes-1.1.0.tgz",
@@ -6631,7 +5578,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
       "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
-      "dev": true,
       "requires": {
         "forwarded": "0.1.2",
         "ipaddr.js": "1.5.2"
@@ -6640,7 +5586,8 @@
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo="
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "dev": true
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -6661,25 +5608,16 @@
         "randombytes": "2.0.5"
       }
     },
-    "pump": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
-      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-      "requires": {
-        "end-of-stream": "1.4.1",
-        "once": "1.4.0"
-      }
-    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
     },
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-      "dev": true
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
     },
     "query-string": {
       "version": "5.0.1",
@@ -6709,26 +5647,6 @@
       "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
       "dev": true
     },
-    "raf": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
-      "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
-      "requires": {
-        "performance-now": "2.1.0"
-      },
-      "dependencies": {
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-        }
-      }
-    },
-    "ramda": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
-      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU="
-    },
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -6792,14 +5710,12 @@
     "range-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
     },
     "raw-body": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
       "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "dev": true,
       "requires": {
         "bytes": "3.0.0",
         "http-errors": "1.6.2",
@@ -6813,24 +5729,6 @@
       "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
       "dev": true
     },
-    "rc": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz",
-      "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=",
-      "requires": {
-        "deep-extend": "0.4.2",
-        "ini": "1.3.5",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
-      }
-    },
     "react": {
       "version": "16.1.0",
       "resolved": "https://registry.npmjs.org/react/-/react-16.1.0.tgz",
@@ -6901,45 +5799,6 @@
         "theming": "1.1.0"
       }
     },
-    "react-notification-system": {
-      "version": "0.2.16",
-      "resolved": "https://registry.npmjs.org/react-notification-system/-/react-notification-system-0.2.16.tgz",
-      "integrity": "sha1-m52iCw00eGtgBXxStCUW6hKVN0o=",
-      "requires": {
-        "create-react-class": "15.6.2",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.0"
-      }
-    },
-    "react-notification-system-redux": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-notification-system-redux/-/react-notification-system-redux-1.2.0.tgz",
-      "integrity": "sha1-FPsJFccuTBLZmD/+ByVOLNGexd8=",
-      "requires": {
-        "prop-types": "15.6.0",
-        "react-notification-system": "0.2.16"
-      }
-    },
-    "react-redux": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.6.tgz",
-      "integrity": "sha512-8taaaGu+J7PMJQDJrk/xiWEYQmdo3mkXw6wPr3K3LxvXis3Fymiq7c13S+Tpls/AyNUAsoONkU81AP0RA6y6Vw==",
-      "requires": {
-        "hoist-non-react-statics": "2.3.1",
-        "invariant": "2.2.2",
-        "lodash": "4.17.4",
-        "lodash-es": "4.17.4",
-        "loose-envify": "1.3.1",
-        "prop-types": "15.6.0"
-      },
-      "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
-          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
-        }
-      }
-    },
     "react-resize-detector": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-1.1.0.tgz",
@@ -6948,15 +5807,6 @@
         "prop-types": "15.6.0"
       }
     },
-    "react-svg-inline": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/react-svg-inline/-/react-svg-inline-2.0.1.tgz",
-      "integrity": "sha512-9YVqJ80g1gPWAvD9CS/z4cKPD45ZSMjjzwxFAmQJiMEoAo1Ajhz92WirXag3ftltDN5lPNkVWx/KOnEWB/PaMQ==",
-      "requires": {
-        "classnames": "2.2.5",
-        "prop-types": "15.6.0"
-      }
-    },
     "react-tap-event-plugin": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-3.0.2.tgz",
@@ -7014,6 +5864,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -7064,47 +5915,23 @@
         "strip-indent": "1.0.1"
       }
     },
-    "redux-form": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.2.0.tgz",
-      "integrity": "sha512-qbgeI19drwnm9FeGAotDA1vsZO8q94XF7IxPDuJmSXxDYX2rqzhND6NROahCBJfBK5xM1cchvmgscO2rry1EEw==",
-      "requires": {
-        "deep-equal": "1.0.1",
-        "es6-error": "4.1.1",
-        "hoist-non-react-statics": "2.3.1",
-        "invariant": "2.2.2",
-        "is-promise": "2.1.0",
-        "lodash": "4.17.4",
-        "lodash-es": "4.17.4",
-        "prop-types": "15.6.0"
-      },
-      "dependencies": {
-        "hoist-non-react-statics": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
-          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
-        }
-      }
-    },
-    "redux-undo": {
-      "version": "1.0.0-beta9-9-7",
-      "resolved": "https://registry.npmjs.org/redux-undo/-/redux-undo-1.0.0-beta9-9-7.tgz",
-      "integrity": "sha1-/juqGycUI9fdu/w6gscbApotuLo="
-    },
     "regenerate": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg=="
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+      "dev": true
     },
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+      "dev": true
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0",
@@ -7125,6 +5952,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
       "requires": {
         "regenerate": "1.3.3",
         "regjsgen": "0.2.0",
@@ -7134,12 +5962,14 @@
     "regjsgen": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
     },
     "regjsparser": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
       "requires": {
         "jsesc": "0.5.0"
       },
@@ -7147,7 +5977,8 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
         }
       }
     },
@@ -7205,69 +6036,6 @@
         "is-finite": "1.0.2"
       }
     },
-    "replace-comments-x": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
-      "integrity": "sha512-+vMP4jqU+8HboLWms6YMNEiaZG5hh1oR6ENCnGYDF/UQ7aYiJUK/8tcl3+KZAHRCKKa3gqzrfiarlUBHQSgRlg==",
-      "requires": {
-        "require-coercible-to-string-x": "1.0.0",
-        "to-string-x": "1.4.2"
-      }
-    },
-    "request": {
-      "version": "2.80.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.80.0.tgz",
-      "integrity": "sha1-jMFi1215OBze/dNQXXa4C2BYm9A=",
-      "requires": {
-        "aws-sign2": "0.6.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.3.2",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.4.3",
-        "uuid": "3.2.0"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-        },
-        "uuid": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.0.tgz",
-          "integrity": "sha512-qC0vMFX6q6ee8JaoTF2Om1uL8KAV1ATUjVaHRxLiPJkIsp8JZl6ZjG0MIB+twZFLbi1vXj30rqj4zlqYiOS9xg=="
-        }
-      }
-    },
-    "require-coercible-to-string-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.0.tgz",
-      "integrity": "sha512-Rpfd4sMdflPAKecdKhfAtQHlZzzle4UMUgxJ01hXtTcNWMV8w9GeZnKhEyrT73kgrflBOP1zg41amUPZGcNspA==",
-      "requires": {
-        "require-object-coercible-x": "1.4.1",
-        "to-string-x": "1.4.2"
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7280,25 +6048,12 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
-    "require-object-coercible-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.1.tgz",
-      "integrity": "sha512-0YHa2afepsLfQvwQ1P2XvDZnGOUia5sC07ZijIRU2dnsRxnuilXWF6B2CFaKGDA9eZl39lJHrXCDsnfgroRd6Q==",
-      "requires": {
-        "is-nil-x": "1.4.1"
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "reselect": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
-    },
     "resolve-cwd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
@@ -7374,13 +6129,13 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true
     },
     "send": {
       "version": "0.16.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
       "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "depd": "1.1.1",
@@ -7401,7 +6156,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -7409,8 +6163,7 @@
         "mime": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
         }
       }
     },
@@ -7444,7 +6197,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
       "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
-      "dev": true,
       "requires": {
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
@@ -7455,7 +6207,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -7471,8 +6224,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
     "sha.js": {
       "version": "2.4.9",
@@ -7507,37 +6259,20 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
     },
     "simple-assign": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz",
       "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o="
     },
-    "simple-get": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz",
-      "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=",
-      "requires": {
-        "once": "1.4.0",
-        "unzip-response": "1.0.2",
-        "xtend": "4.0.1"
-      }
-    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
     "sockjs": {
       "version": "0.3.18",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz",
@@ -7582,7 +6317,8 @@
     "source-map": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+      "dev": true
     },
     "source-map-support": {
       "version": "0.4.15",
@@ -7593,11 +6329,6 @@
         "source-map": "0.5.6"
       }
     },
-    "spark-md5": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz",
-      "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8="
-    },
     "spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
@@ -7654,33 +6385,10 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
-    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-      "dev": true
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
     },
     "stream-browserify": {
       "version": "2.0.1",
@@ -7747,15 +6455,11 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
     },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -7785,11 +6489,6 @@
         "get-stdin": "4.0.1"
       }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -7806,28 +6505,6 @@
       "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
       "dev": true
     },
-    "tar-fs": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
-      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
-      "requires": {
-        "chownr": "1.0.1",
-        "mkdirp": "0.5.1",
-        "pump": "1.0.3",
-        "tar-stream": "1.5.5"
-      }
-    },
-    "tar-stream": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
-      "requires": {
-        "bl": "1.2.1",
-        "end-of-stream": "1.4.1",
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
-      }
-    },
     "theming": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/theming/-/theming-1.1.0.tgz",
@@ -7859,15 +6536,6 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
-    "through2": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-      "requires": {
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
-      }
-    },
     "thunky": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
@@ -7889,146 +6557,23 @@
         "setimmediate": "1.0.5"
       }
     },
-    "timers-ext": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
-      "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
-      "requires": {
-        "es5-ext": "0.10.35",
-        "next-tick": "1.0.0"
-      },
-      "dependencies": {
-        "next-tick": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-        }
-      }
-    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
       "dev": true
     },
-    "to-boolean-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.1.tgz",
-      "integrity": "sha512-PstxY3K6hVEHnY3FITs8XBoJbt0RI1e4MLIhAL9hWa3BtVLCrb86vU5z6lEKh7uZZjiPiLqIKMmfMro1nNgtXQ=="
-    },
     "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
     },
-    "to-integer-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
-      "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
-      "requires": {
-        "is-finite-x": "3.0.2",
-        "is-nan-x": "1.0.1",
-        "math-sign-x": "3.0.0",
-        "to-number-x": "2.0.0"
-      }
-    },
-    "to-number-x": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
-      "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "nan-x": "1.0.0",
-        "parse-int-x": "2.0.0",
-        "to-primitive-x": "1.1.0",
-        "trim-x": "3.0.0"
-      }
-    },
-    "to-object-x": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/to-object-x/-/to-object-x-1.5.0.tgz",
-      "integrity": "sha512-AKn5GQcdWky+s20vjWkt+Wa6y3dxQH3yQyMBhOfBOPldUwqwhgvlqcIg5H092ntNc+TX8/Cxzs1kMHH19pyCnA==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-object-coercible-x": "1.4.1"
-      }
-    },
-    "to-primitive-x": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/to-primitive-x/-/to-primitive-x-1.1.0.tgz",
-      "integrity": "sha512-gyMY0gi3wjK3e4MUBKqv9Zl8QGcWguIkaUr2VJmoBEsOpDcpDZSEyljR773eVG4maS48uX7muLkoQoh/BA82OQ==",
-      "requires": {
-        "has-symbol-support-x": "1.4.1",
-        "is-date-object": "1.0.1",
-        "is-function-x": "3.3.0",
-        "is-nil-x": "1.4.1",
-        "is-primitive": "2.0.0",
-        "is-symbol": "1.0.1",
-        "require-object-coercible-x": "1.4.1",
-        "validate.io-undefined": "1.0.3"
-      }
-    },
-    "to-property-key-x": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-property-key-x/-/to-property-key-x-2.0.2.tgz",
-      "integrity": "sha512-YISLpZFYIazNm0P8hLsKEEUEZ3m8U3+eDysJZqTu3+B9tQp+2TrMpaEGT8Agh4fZ5LSoums60/glNEzk5ozqrg==",
-      "requires": {
-        "has-symbol-support-x": "1.4.1",
-        "to-primitive-x": "1.1.0",
-        "to-string-x": "1.4.2"
-      }
-    },
-    "to-string-symbols-supported-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.0.tgz",
-      "integrity": "sha512-HbVH673pybrUmhzESGHUm17BBJvqb7BU8HciOvuEYm9ipuDyjmddhvkVqpVW6sM/C5/zhJo17n7O7I/24loJIQ==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "has-symbol-support-x": "1.4.1",
-        "is-symbol": "1.0.1"
-      }
-    },
-    "to-string-tag-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.2.tgz",
-      "integrity": "sha512-ytO9eLigxsQQLGuab0C1iSSTzKdJNVSlBg0Spg4J/rGAVrQJ5y774mo0SSzgGeTT4RJGGyJNfObXaTMzX0XDOQ==",
-      "requires": {
-        "lodash.isnull": "3.0.0",
-        "validate.io-undefined": "1.0.3"
-      }
-    },
-    "to-string-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.2.tgz",
-      "integrity": "sha512-/WP5arlwtCpAAexCCHiQBW0eXwse84osWyP1Qtaz71nsYSuUpOkT6tBm8nQ4IIUfSh5hji0hDupUCD2xbbOL6A==",
-      "requires": {
-        "is-symbol": "1.0.1"
-      }
-    },
     "toposort": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
       "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
       "dev": true
     },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "trim-left-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
-      "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
-      }
-    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -8041,50 +6586,16 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
-    "trim-right-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
-      "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
-      "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
-      }
-    },
-    "trim-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
-      "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
-      "requires": {
-        "trim-left-x": "3.0.0",
-        "trim-right-x": "3.0.0"
-      }
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
     "type-is": {
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
       "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "dev": true,
       "requires": {
         "media-typer": "0.3.0",
         "mime-types": "2.1.17"
@@ -8156,16 +6667,15 @@
         }
       }
     },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unzip-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
     "upper-case": {
       "version": "1.1.3",
@@ -8245,7 +6755,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "utila": {
       "version": "0.4.0",
@@ -8256,8 +6767,7 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
       "version": "2.0.3",
@@ -8274,11 +6784,6 @@
         "user-home": "1.1.1"
       }
     },
-    "valid-url": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
-    },
     "validate-npm-package-license": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
@@ -8289,33 +6794,10 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
-    "validate.io-undefined": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
-      "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q="
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
     "vm-browserify": {
       "version": "0.0.4",
@@ -8326,11 +6808,6 @@
         "indexof": "0.0.1"
       }
     },
-    "vuvuzela": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz",
-      "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws="
-    },
     "warning": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
@@ -8400,6 +6877,24 @@
         }
       }
     },
+    "webpack-bundle-analyzer": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz",
+      "integrity": "sha1-Y+2G63HMTNqG9o5oWoRTC6ASZEk=",
+      "requires": {
+        "acorn": "5.2.1",
+        "chalk": "1.1.3",
+        "commander": "2.11.0",
+        "ejs": "2.5.7",
+        "express": "4.16.2",
+        "filesize": "3.5.11",
+        "gzip-size": "3.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "opener": "1.4.3",
+        "ws": "4.0.0"
+      }
+    },
     "webpack-dev-middleware": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
@@ -8649,31 +7144,6 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
-    "white-space-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
-      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg=="
-    },
-    "wide-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-      "requires": {
-        "string-width": "1.0.2"
-      },
-      "dependencies": {
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        }
-      }
-    },
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -8722,21 +7192,17 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
-    "write-stream": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz",
-      "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=",
+    "ws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz",
+      "integrity": "sha512-QYslsH44bH8O7/W2815u5DpnCpXWpEK44FmaHffNwgJI4JMaSZONgPBTOfrxJ29mXKbXak+LsJ2uAkDTYq2ptQ==",
       "requires": {
-        "readable-stream": "0.0.4"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz",
-          "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40="
-        }
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.1",
+        "ultron": "1.1.1"
       }
     },
     "xml-char-classes": {
@@ -8748,7 +7214,8 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
@@ -8832,15 +7299,6 @@
         }
       }
     },
-    "yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "fd-slicer": "1.0.1"
-      }
-    },
     "yml-loader": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/yml-loader/-/yml-loader-2.1.0.tgz",
diff --git a/package.json b/package.json
index 390c419..5c07c7f 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   "scripts": {
     "start": "webpack-dev-server -w",
     "prepare": "npm run build",
+    "analyze": "ANALYZE_BUNDLE=true webpack -p",
     "build": "npm run build:main && npm run build:main:settings && npm run build:module && npm run build:module:settings ",
     "build:main": "BABEL_ENV=main babel src -s -d lib",
     "build:module": "BABEL_ENV=module babel src -s -d module",
@@ -31,7 +32,8 @@
     "react-jss": "^7.2.0",
     "react-resize-detector": "^1.1.0",
     "shortid": "^2.2.8",
-    "three": "^0.88.0"
+    "three": "^0.88.0",
+    "webpack-bundle-analyzer": "^2.9.2"
   },
   "devDependencies": {
     "babel-cli": "6.24.1",
diff --git a/webpack.config.js b/webpack.config.js
index 58bcbeb..985b6b9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,9 @@
 const path = require('path');
-// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const HTMLWebpackPlugin = require('html-webpack-plugin');
 
-const devMode = true;
+const devMode = process.env.NODE_ENV !== 'production';
+const analyzeBundle = process.env.ANALYZE_BUNDLE;
 
 const babelLoader = {
   loader: 'babel-loader',
@@ -61,13 +62,13 @@ module.exports = {
       }
     ]
   },
-  plugins: [
+  plugins: analyzeBundle ? [new BundleAnalyzerPlugin()] : [
     new HTMLWebpackPlugin({
       title: 'Doodle3D Slicer',
       template: require('html-webpack-template'),
       inject: false,
       appMountId: 'app'
-    }),
+    })
   ],
   devtool: "source-map",
   devServer: {

From d4743ef867796adf36ef8235f0c1553011c83be5 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 12:06:14 +0100
Subject: [PATCH 045/163] improve bundle size

---
 src/interface/index.js            | 18 ++++++--------
 src/interface/utils.js            | 41 +++++++++++--------------------
 src/sliceActions/createLines.js   |  4 +--
 src/sliceActions/helpers/GCode.js |  8 +++---
 src/sliceActions/optimizePaths.js | 10 ++++----
 src/sliceActions/slice.js         | 19 ++++++--------
 src/slicer.js                     | 23 +++++++----------
 src/slicer.worker.js              |  5 ++--
 webpack.config.js                 |  3 ++-
 9 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 0bd4969..10b94ff 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -1,9 +1,6 @@
+import * as THREE from 'three';
 import _ from 'lodash';
 import React from 'react';
-import { Quaternion } from 'three/src/math/Quaternion.js';
-import { Vector3 } from 'three/src/math/Vector3.js';
-import { Mesh } from 'three/src/objects/Mesh.js';
-import { Box3 } from 'three/src/math/Box3.js';
 import PropTypes from 'proptypes';
 import { centerGeometry, placeOnGround, createScene, fetchProgress, slice, TabTemplate } from './utils.js';
 import injectSheet from 'react-jss';
@@ -21,7 +18,6 @@ import ReactResizeDetector from 'react-resize-detector';
 import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
 import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
-import { Matrix4 } from 'three/src/math/Matrix4.js';
 import muiThemeable from 'material-ui/styles/muiThemeable';
 import Dialog from 'material-ui/Dialog';
 
@@ -145,7 +141,7 @@ class Interface extends React.Component {
       .then(resonse => resonse.json())
       .then(json => JSONToSketchData(json))
       .then(file => createSceneData(file))
-      .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new Matrix4() }))
+      .then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new THREE.Matrix4() }))
       .then(mesh => this.updateMesh(mesh));
   };
 
@@ -194,9 +190,9 @@ class Interface extends React.Component {
     }
   };
 
-  rotateX = () => this.rotate(new Vector3(0, 0, 1), Math.PI / 2.0);
-  rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
-  rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
+  rotateX = () => this.rotate(new THREE.Vector3(0, 0, 1), Math.PI / 2.0);
+  rotateY = () => this.rotate(new THREE.Vector3(1, 0, 0), Math.PI / 2.0);
+  rotateZ = () => this.rotate(new THREE.Vector3(0, 1, 0), Math.PI / 2.0);
   rotate = (axis, angle) => {
     const { scene: { mesh, render }, isSlicing } = this.state;
     if (isSlicing) return;
@@ -221,7 +217,7 @@ class Interface extends React.Component {
     this.closePopover();
     this.setState({ isSlicing: true, progress: { action: '', percentage: 0, step: 0 }, error: null });
 
-    const exportMesh = new Mesh(mesh.geometry, mesh.material);
+    const exportMesh = new THREE.Mesh(mesh.geometry, mesh.material);
     exportMesh.applyMatrix(matrix);
 
     try {
@@ -292,7 +288,7 @@ class Interface extends React.Component {
 
   calculateDimensions = () => {
     const { scene: { mesh } } = this.state;
-    const { x, y, z } = new Box3().setFromObject(mesh).getSize();
+    const { x, y, z } = new THREE.Box3().setFromObject(mesh).getSize();
     this.setState({ objectDimensions: `${Math.round(x)}x${Math.round(y)}x${Math.round(z)}mm` });
   };
 
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 7f98ec4..4f2b811 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -1,17 +1,4 @@
 import * as THREE from 'three';
-import { Box3 } from 'three/src/math/Box3.js';
-import { Matrix4 } from 'three/src/math/Matrix4.js';
-import { Vector3 } from 'three/src/math/Vector3.js';
-import { Scene } from 'three/src/scenes/Scene.js';
-import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera.js';
-import { AmbientLight } from 'three/src/lights/AmbientLight.js';
-import { DirectionalLight } from 'three/src/lights/DirectionalLight.js';
-import { MeshPhongMaterial } from 'three/src/materials/MeshPhongMaterial.js';
-import { BoxGeometry } from 'three/src/geometries/BoxGeometry.js';
-import { Mesh } from 'three/src/objects/Mesh.js';
-import { BoxHelper } from 'three/src/helpers/BoxHelper.js';
-import { WebGLRenderer } from 'three/src/renderers/WebGLRenderer.js';
-import { DoubleSide } from 'three/src/constants.js';
 import 'three/examples/js/controls/EditorControls';
 import printerSettings from '../settings/printer.yml';
 import materialSettings from '../settings/material.yml';
@@ -23,7 +10,7 @@ import PropTypes from 'prop-types';
 import fileSaver from 'file-saver';
 
 export function placeOnGround(mesh) {
-  const boundingBox = new Box3().setFromObject(mesh);
+  const boundingBox = new THREE.Box3().setFromObject(mesh);
 
   mesh.position.y -= boundingBox.min.y;
   mesh.updateMatrix();
@@ -33,35 +20,35 @@ export function centerGeometry(mesh) {
   // center geometry
   mesh.geometry.computeBoundingBox();
   const center = mesh.geometry.boundingBox.getCenter();
-  mesh.geometry.applyMatrix(new Matrix4().makeTranslation(-center.x, -center.y, -center.z));
+  mesh.geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-center.x, -center.y, -center.z));
 }
 
 export function createScene({ pixelRatio, muiTheme }) {
-  const scene = new Scene();
+  const scene = new THREE.Scene();
 
-  const camera = new PerspectiveCamera(50, 1, 1, 10000);
+  const camera = new THREE.PerspectiveCamera(50, 1, 1, 10000);
   camera.position.set(0, 400, 300);
-  camera.lookAt(new Vector3(0, 0, 0));
+  camera.lookAt(new THREE.Vector3(0, 0, 0));
 
-  const directionalLightA = new DirectionalLight(0xa2a2a2);
+  const directionalLightA = new THREE.DirectionalLight(0xa2a2a2);
   directionalLightA.position.set(1, 1, 1);
   scene.add(directionalLightA);
 
-  const directionalLightB = new DirectionalLight(0xa2a2a2);
+  const directionalLightB = new THREE.DirectionalLight(0xa2a2a2);
   directionalLightB.position.set(-1, 1, -1);
   scene.add(directionalLightB);
 
-  const light = new AmbientLight(0x656565);
+  const light = new THREE.AmbientLight(0x656565);
   scene.add(light);
 
-  const material = new MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: DoubleSide, specular: 0xc5c5c5, shininess: 5 });
-  const mesh = new Mesh(new THREE.Geometry(), material);
+  const material = new THREE.MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: THREE.DoubleSide, specular: 0xc5c5c5, shininess: 5 });
+  const mesh = new THREE.Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 
-  const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary2Color);
+  const box = new THREE.BoxHelper(new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1).applyMatrix(new THREE.Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary2Color);
   scene.add(box);
 
-  let renderer = new WebGLRenderer({ alpha: true, antialias: true });
+  let renderer = new THREE.WebGLRenderer({ alpha: true, antialias: true });
   let editorControls = new THREE.EditorControls(camera, renderer.domElement);
 
   box.scale.set(1., 1., 1.);
@@ -80,7 +67,7 @@ export function createScene({ pixelRatio, muiTheme }) {
   const updateCanvas = (canvas) => {
     if (!renderer || renderer.domElement !== canvas) {
       if (renderer) renderer.dispose();
-      renderer = new WebGLRenderer({ canvas, alpha: true, antialias: true });
+      renderer = new THREE.WebGLRenderer({ canvas, alpha: true, antialias: true });
       renderer.setClearColor(0xffffff, 0);
     }
     if (!editorControls || editorControls.domElement !== canvas) {
@@ -138,7 +125,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
   const centerX = dimensions.x / 2;
   const centerY = dimensions.y / 2;
 
-  const matrix = new Matrix4().makeTranslation(centerY, 0, centerX).multiply(mesh.matrix);
+  const matrix = new THREE.Matrix4().makeTranslation(centerY, 0, centerX).multiply(mesh.matrix);
   const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
     updateProgress({
       action: progress.action,
diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index 62b7c19..e9f9fd2 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,4 +1,4 @@
-import { Line3 } from 'three/src/math/Line3.js';
+import * as THREE from 'three';
 import { normalize } from './helpers/VectorUtils.js';
 
 function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
@@ -9,7 +9,7 @@ function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
     index = lines.length;
     lineLookup[`${a}_${b}`] = index;
 
-    const line = new Line3(geometry.vertices[a], geometry.vertices[b]);
+    const line = new THREE.Line3(geometry.vertices[a], geometry.vertices[b]);
     lines.push({ line, faces: [] });
   }
 
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index cf2fbb4..ea51272 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,4 +1,4 @@
-import { Vector2 } from 'three/src/math/Vector2.js';
+import * as THREE from 'three';
 import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
@@ -16,7 +16,7 @@ export default class {
 
     this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
     this._currentValues = {};
-    this._nozzlePosition = new Vector2(0, 0);
+    this._nozzlePosition = new THREE.Vector2(0, 0);
     this._extruder = 0.0;
     this._duration = 0.0;
     this._isRetracted = false;
@@ -47,7 +47,7 @@ export default class {
   }
 
   moveTo(x, y, z, { speed }) {
-    const newNozzlePosition = new Vector2(x, y).multiplyScalar(PRECISION);
+    const newNozzlePosition = new THREE.Vector2(x, y).multiplyScalar(PRECISION);
     const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
 
     this._duration += lineLength / speed;
@@ -66,7 +66,7 @@ export default class {
   }
 
   lineTo(x, y, z, { speed, flowRate }) {
-    const newNozzlePosition = new Vector2(x, y).multiplyScalar(PRECISION);
+    const newNozzlePosition = new THREE.Vector2(x, y).multiplyScalar(PRECISION);
     const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
 
     this._extruder += this._nozzleToFilamentRatio * lineLength * flowRate;
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 661e7e0..18043ef 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -1,8 +1,8 @@
-import { Vector2 } from 'three/src/math/Vector2.js';
+import * as THREE from 'three';
 import Shape from 'clipper-js';
 
 export default function optimizePaths(slices, settings) {
-  const start = new Vector2(0, 0);
+  const start = new THREE.Vector2(0, 0);
 
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
@@ -102,7 +102,7 @@ function optimizeShape(shape, start) {
 
       if (shape.closed) {
         for (let j = 0; j < path.length; j += 1) {
-          const point = new Vector2().copy(path[j]);
+          const point = new THREE.Vector2().copy(path[j]);
           const length = point.sub(start).length();
           if (minLength === false || length < minLength) {
             minPath = path;
@@ -112,7 +112,7 @@ function optimizeShape(shape, start) {
           }
         }
       } else {
-        const startPoint = new Vector2().copy(path[0]);
+        const startPoint = new THREE.Vector2().copy(path[0]);
         const lengthToStart = startPoint.sub(start).length();
         if (minLength === false || lengthToStart < minLength) {
           minPath = path;
@@ -121,7 +121,7 @@ function optimizeShape(shape, start) {
           pathIndex = i;
         }
 
-        const endPoint = new Vector2().copy(path[path.length - 1]);
+        const endPoint = new THREE.Vector2().copy(path[path.length - 1]);
         const lengthToEnd = endPoint.sub(start).length();
         if (lengthToEnd < minLength) {
           minPath = path;
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index a7064e3..fcd13fc 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -1,9 +1,4 @@
-import { Color } from 'three/src/math/Color.js';
-import { BufferGeometry } from 'three/src/core/BufferGeometry.js';
-import { BufferAttribute } from 'three/src/core/BufferAttribute.js';
-import { LineBasicMaterial } from 'three/src/materials/LineBasicMaterial.js';
-import { VertexColors } from 'three/src/constants.js';
-import { LineSegments } from 'three/src/objects/LineSegments.js';
+import * as THREE from 'three';
 import calculateLayersIntersections from './calculateLayersIntersections.js';
 import createLines from './createLines.js';
 import generateInfills from './generateInfills.js';
@@ -98,7 +93,7 @@ function gcodeToString(gcode) {
 }
 
 const MAX_SPEED = 100 * 60;
-const COLOR = new Color();
+const COLOR = new THREE.Color();
 function createGcodeGeometry(gcode) {
   const positions = [];
   const colors = [];
@@ -123,13 +118,13 @@ function createGcodeGeometry(gcode) {
     }
   }
 
-  const geometry = new BufferGeometry();
+  const geometry = new THREE.BufferGeometry();
 
-  geometry.addAttribute('position', new BufferAttribute(new Float32Array(positions), 3));
-  geometry.addAttribute('color', new BufferAttribute(new Float32Array(colors), 3));
+  geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(positions), 3));
+  geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(colors), 3));
 
-  const material = new LineBasicMaterial({ vertexColors: VertexColors });
-  const linePreview = new LineSegments(geometry, material);
+  const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+  const linePreview = new THREE.LineSegments(geometry, material);
 
   return linePreview;
 }
diff --git a/src/slicer.js b/src/slicer.js
index 5341d9f..c49ec2e 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -1,11 +1,6 @@
-import { VertexColors } from 'three/src/constants.js';
-import { BufferAttribute } from 'three/src/core/BufferAttribute.js';
-import { LineBasicMaterial } from 'three/src/materials/LineBasicMaterial.js';
-import { LineSegments } from 'three/src/objects/LineSegments.js';
+import * as THREE from 'three';
 import slice from './sliceActions/slice.js';
 import SlicerWorker from './slicer.worker.js';
-import { FrontSide, DoubleSide } from 'three/src/constants.js';
-import { BufferGeometry } from 'three/src/core/BufferGeometry.js'
 
 export function sliceMesh(settings, mesh, sync = false, constructLinePreview = false, onProgress) {
   if (!mesh || !mesh.isMesh) {
@@ -21,7 +16,7 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
   if (!geometry) {
     throw new Error('Missing required geometry argument');
   } else if (geometry.isBufferGeometry) {
-    geometry = new Geometry().fromBufferGeometry(geometry);
+    geometry = new THREE.Geometry().fromBufferGeometry(geometry);
   } else if (geometry.isGeometry) {
     geometry = geometry.clone();
   } else {
@@ -38,9 +33,9 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
 
   const openObjectIndexes = materials instanceof Array ? materials.map(({ side }) => {
     switch (side) {
-      case FrontSide:
+      case THREE.FrontSide:
         return false;
-      case DoubleSide:
+      case THREE.DoubleSide:
         return true;
       default:
         return false;
@@ -76,14 +71,14 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
           slicerWorker.terminate();
 
           if (data.gcode.linePreview) {
-            const geometry = new BufferGeometry();
+            const geometry = new THREE.BufferGeometry();
 
             const { position, color } = data.gcode.linePreview;
-            geometry.addAttribute('position', new BufferAttribute(new Float32Array(position), 3));
-            geometry.addAttribute('color', new BufferAttribute(new Float32Array(color), 3));
+            geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(position), 3));
+            geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(color), 3));
 
-            const material = new LineBasicMaterial({ vertexColors: VertexColors });
-            const linePreview = new LineSegments(geometry, material);
+            const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+            const linePreview = new THREE.LineSegments(geometry, material);
 
             data.gcode.linePreview = linePreview;
           }
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index 2d866ef..f06ce93 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -1,7 +1,6 @@
 import 'core-js'; // polyfills
 import slice from './sliceActions/slice.js';
-import { Matrix4 } from 'three/src/math/Matrix4.js';
-import { JSONLoader } from 'three/src/loaders/JSONLoader.js';
+import * as THREE from 'three';
 
 const onProgress = progress => {
   self.postMessage({
@@ -10,7 +9,7 @@ const onProgress = progress => {
   });
 }
 
-const loader = new JSONLoader();
+const loader = new THREE.JSONLoader();
 
 self.addEventListener('message', (event) => {
   const { message, data } = event.data;
diff --git a/webpack.config.js b/webpack.config.js
index 985b6b9..9e4da86 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -70,7 +70,8 @@ module.exports = {
       appMountId: 'app'
     })
   ],
-  devtool: "source-map",
+  devtool: false,
+  devtool: devMode ? 'source-map' : false,
   devServer: {
     contentBase: 'dist'
   }

From a892d6ff896dfff5fca4b9ef881a3fd9c9ee7fee Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 12:24:20 +0100
Subject: [PATCH 046/163] update package lock

---
 package-lock.json | 1867 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 1714 insertions(+), 153 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 795aae2..927312f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@doodle3d/cal": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/@doodle3d/cal/-/cal-0.0.8.tgz",
+      "integrity": "sha512-1qXg62qaZkc/zYPan37CXvUtaJk4aFVLz2y8cqnkN9Y0r1Er5soIZ5esMz4YYyjUrQGawBoYcGvatRALYnzlvg=="
+    },
     "@doodle3d/clipper-js": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.7.tgz",
@@ -17,6 +22,114 @@
       "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz",
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
+    "@doodle3d/doodle3d-core": {
+      "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
+      "requires": {
+        "@doodle3d/cal": "0.0.8",
+        "@doodle3d/clipper-js": "1.0.7",
+        "@doodle3d/fill-path": "1.0.7",
+        "@doodle3d/potrace-js": "0.0.6",
+        "@doodle3d/threejs-export-obj": "0.0.8",
+        "@doodle3d/threejs-export-stl": "0.0.5",
+        "@doodle3d/touch-events": "0.0.7",
+        "babel-polyfill": "6.26.0",
+        "bezier-js": "2.2.5",
+        "blueimp-canvas-to-blob": "3.14.0",
+        "bowser": "1.8.1",
+        "fit-curve": "0.1.6",
+        "google-fonts-webpack-plugin": "0.4.4",
+        "imports-loader": "0.7.1",
+        "jss": "9.5.1",
+        "keycode": "2.1.9",
+        "lodash": "4.17.4",
+        "memoizee": "0.3.10",
+        "normalize-wheel": "1.0.1",
+        "pouchdb": "6.4.1",
+        "proptypes": "1.1.0",
+        "raf": "3.4.0",
+        "ramda": "0.21.0",
+        "react": "16.1.0",
+        "react-addons-update": "15.6.2",
+        "react-jss": "7.2.0",
+        "react-notification-system-redux": "1.2.0",
+        "react-redux": "5.0.6",
+        "react-resize-detector": "1.1.0",
+        "react-svg-inline": "2.0.1",
+        "redux-form": "7.2.0",
+        "redux-undo": "1.0.0-beta9-9-7",
+        "reselect": "3.0.1",
+        "semver": "5.4.1",
+        "shortid": "2.2.8",
+        "three": "0.88.0",
+        "three-js-csg": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045",
+        "valid-url": "1.0.9"
+      },
+      "dependencies": {
+        "jss": {
+          "version": "9.5.1",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
+          "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
+          "requires": {
+            "is-in-browser": "1.1.3",
+            "symbol-observable": "1.1.0",
+            "warning": "3.0.0"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
+          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+        }
+      }
+    },
+    "@doodle3d/fill-path": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz",
+      "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==",
+      "requires": {
+        "@doodle3d/clipper-js": "1.0.7"
+      }
+    },
+    "@doodle3d/potrace-js": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@doodle3d/potrace-js/-/potrace-js-0.0.6.tgz",
+      "integrity": "sha512-w1+sG3ClsSaQwo3ks5wl6QLe4aWEHBe8QePq0IeAcj+lypqo770sUcWVfEZWUFBumAhSlCJg3GRc8MsycHy8LA=="
+    },
+    "@doodle3d/threejs-export-obj": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-obj/-/threejs-export-obj-0.0.8.tgz",
+      "integrity": "sha512-HVnJCvrjj3FqHJ5+CLVT1oZ0OjS2eOvrpMKjo71Jg7bdrusluIRlF7w9JdaoZs3ScWASAucu2cvTKJ+OAm3Rhw==",
+      "requires": {
+        "jszip": "3.1.5",
+        "three": "0.88.0"
+      }
+    },
+    "@doodle3d/threejs-export-stl": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@doodle3d/threejs-export-stl/-/threejs-export-stl-0.0.5.tgz",
+      "integrity": "sha512-GeApmYL657Dug8/+WOHGGijJbQ52dN2AWkhz9FsCe9sehZRhCg0fOg4LKXNS0XGKWMQbyumlbrmCWZrK73sfJA==",
+      "requires": {
+        "babel-preset-env": "1.6.1",
+        "three": "0.88.0"
+      }
+    },
+    "@doodle3d/touch-events": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/@doodle3d/touch-events/-/touch-events-0.0.7.tgz",
+      "integrity": "sha512-EpL8IEGKKy2gqFFlxA4n84IeAyPTrEzle0jwmRv+mmVBzwGr6xDl5Ga5vJIrg2WcYs4Xc7qWbiKSHEXvEpDLlg==",
+      "requires": {
+        "eventdispatcher.js": "0.0.2",
+        "pepjs": "0.4.3"
+      }
+    },
+    "abstract-leveldown": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-3.0.0.tgz",
+      "integrity": "sha512-KUWx9UWGQD12zsmLNj64/pndaz4iJh/Pj7nopgkfDG6RlCcbMZvT6+9l7dchK4idog2Is8VdC/PvNbFuFmalIQ==",
+      "requires": {
+        "xtend": "4.0.1"
+      }
+    },
     "accepts": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
@@ -103,6 +216,20 @@
         "micromatch": "2.3.11"
       }
     },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "are-we-there-yet": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.3"
+      }
+    },
     "argparse": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
@@ -112,6 +239,11 @@
         "sprintf-js": "1.0.3"
       }
     },
+    "argsarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
+    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -181,6 +313,11 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
     "asn1.js": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
@@ -201,6 +338,11 @@
         "util": "0.10.3"
       }
     },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+    },
     "async": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
@@ -221,6 +363,26 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "attempt-x": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.1.tgz",
+      "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA=="
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
     "babel-cli": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.24.1.tgz",
@@ -312,7 +474,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
       "requires": {
         "babel-helper-explode-assignable-expression": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -364,7 +525,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -376,7 +536,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -388,7 +547,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -398,7 +556,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -409,8 +566,7 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -418,7 +574,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-traverse": "6.25.0",
@@ -462,7 +617,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -472,7 +626,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -482,7 +635,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
@@ -493,7 +645,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -503,7 +654,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -514,8 +664,7 @@
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -523,7 +672,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -536,7 +684,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
       "requires": {
         "babel-helper-optimise-call-expression": "6.24.1",
         "babel-messages": "6.23.0",
@@ -579,7 +726,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -587,8 +733,7 @@
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
@@ -628,8 +773,7 @@
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
@@ -664,8 +808,7 @@
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
@@ -682,7 +825,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
       "requires": {
         "babel-helper-remap-async-to-generator": "6.24.1",
         "babel-plugin-syntax-async-functions": "6.13.0",
@@ -738,7 +880,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -747,7 +888,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -756,7 +896,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.26.0",
@@ -769,7 +908,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -780,7 +918,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -790,7 +927,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -803,7 +939,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -820,7 +955,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -831,14 +965,12 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -846,7 +978,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
       "requires": {
         "babel-helper-define-map": "6.26.0",
         "babel-helper-function-name": "6.24.1",
@@ -863,7 +994,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-template": "6.25.0"
@@ -873,7 +1003,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -882,7 +1011,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -892,7 +1020,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -901,7 +1028,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
       "requires": {
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -912,7 +1038,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -921,7 +1046,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -932,7 +1056,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-strict-mode": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -944,7 +1067,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
           "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "esutils": "2.0.2",
@@ -955,7 +1077,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.4.1",
             "regenerator-runtime": "0.11.0"
@@ -965,7 +1086,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
           "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "babel-traverse": "6.26.0",
@@ -978,7 +1098,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
           "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-          "dev": true,
           "requires": {
             "babel-code-frame": "6.26.0",
             "babel-messages": "6.23.0",
@@ -995,7 +1114,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
           "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-          "dev": true,
           "requires": {
             "babel-runtime": "6.26.0",
             "esutils": "2.0.2",
@@ -1006,14 +1124,12 @@
         "babylon": {
           "version": "6.18.0",
           "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
+          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
         },
         "regenerator-runtime": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-          "dev": true
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
         }
       }
     },
@@ -1021,7 +1137,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
       "requires": {
         "babel-helper-hoist-variables": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1032,7 +1147,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
       "requires": {
         "babel-plugin-transform-es2015-modules-amd": "6.24.1",
         "babel-runtime": "6.26.0",
@@ -1043,7 +1157,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
       "requires": {
         "babel-helper-replace-supers": "6.24.1",
         "babel-runtime": "6.26.0"
@@ -1053,7 +1166,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
       "requires": {
         "babel-helper-call-delegate": "6.24.1",
         "babel-helper-get-function-arity": "6.24.1",
@@ -1067,7 +1179,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1077,7 +1188,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1086,7 +1196,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1097,7 +1206,6 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1106,7 +1214,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0"
       }
@@ -1115,7 +1222,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
       "requires": {
         "babel-helper-regex": "6.26.0",
         "babel-runtime": "6.26.0",
@@ -1126,7 +1232,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
       "requires": {
         "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
         "babel-plugin-syntax-exponentiation-operator": "6.13.0",
@@ -1235,7 +1340,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
       "requires": {
         "regenerator-transform": "0.10.1"
       }
@@ -1253,7 +1357,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0"
@@ -1263,7 +1366,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "core-js": "2.5.3",
@@ -1274,7 +1376,6 @@
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
           "requires": {
             "core-js": "2.5.3",
             "regenerator-runtime": "0.11.1"
@@ -1283,16 +1384,14 @@
             "regenerator-runtime": {
               "version": "0.11.1",
               "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-              "dev": true
+              "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
             }
           }
         },
         "core-js": {
           "version": "2.5.3",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
-          "dev": true
+          "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
         }
       }
     },
@@ -1300,7 +1399,6 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
       "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
-      "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
         "babel-plugin-syntax-trailing-function-commas": "6.22.0",
@@ -1529,11 +1627,24 @@
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
       "dev": true
     },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "bezier-js": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
+      "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
+    },
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary-extensions": {
       "version": "1.8.0",
@@ -1541,12 +1652,30 @@
       "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
       "dev": true
     },
+    "bindings": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="
+    },
+    "bl": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
       "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
+    "blueimp-canvas-to-blob": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz",
+      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ=="
+    },
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
@@ -1600,6 +1729,14 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
     "bowser": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.8.1.tgz",
@@ -1711,7 +1848,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.8.0.tgz",
       "integrity": "sha512-iiWHM1Et6Q4TQpB7Ar6pxuM3TNMXasVJY4Y/oh3q38EwR3Z+IdZ9MyVf7PI4MJFB4xpwMcZgs9bEUnPG2E3TCA==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000760",
         "electron-to-chromium": "1.3.27"
@@ -1728,6 +1864,19 @@
         "isarray": "1.0.0"
       }
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+    },
+    "buffer-from": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
+      "integrity": "sha1-V7GLHaChnsBvM4N6UnWiQjUb114=",
+      "requires": {
+        "is-array-buffer-x": "1.7.0"
+      }
+    },
     "buffer-indexof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
@@ -1757,6 +1906,11 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
+    "cached-constructors-x": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.0.tgz",
+      "integrity": "sha512-JVP0oilYlPgBTD8bkQ+of7hSIJRtydCCJiMtzdRMXVQ98gdj0NyrJTZzbu5wtlO26Ev/1HXRTtbBNsVlLJ3+3A=="
+    },
     "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -1794,8 +1948,12 @@
     "caniuse-lite": {
       "version": "1.0.30000760",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz",
-      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8=",
-      "dev": true
+      "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -1846,6 +2004,11 @@
         "readdirp": "2.1.0"
       }
     },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -1856,6 +2019,11 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "classnames": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
+      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
+    },
     "clean-css": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
@@ -1876,17 +2044,28 @@
         "wordwrap": "0.0.2"
       }
     },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
     },
     "commander": {
       "version": "2.11.0",
@@ -1955,6 +2134,11 @@
         "date-now": "0.1.4"
       }
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -1995,8 +2179,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "create-ecdh": {
       "version": "4.0.0",
@@ -2055,6 +2238,14 @@
         "which": "1.3.0"
       }
     },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -2121,11 +2312,25 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
       "requires": {
         "es5-ext": "0.10.35"
       }
     },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -2154,8 +2359,20 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+    },
+    "deferred-leveldown": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-2.0.3.tgz",
+      "integrity": "sha512-8c2Hv+vIwKNc7qqy4zE3t5DIsln+FQnudcyjLYstHwLFg7XnXZT/H8gQb8lj6xi8xqGM0Bz633ZWcCkonycBTA==",
+      "requires": {
+        "abstract-leveldown": "3.0.0"
+      }
     },
     "define-properties": {
       "version": "1.1.2",
@@ -2189,6 +2406,16 @@
         }
       }
     },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
     "depd": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
@@ -2331,11 +2558,25 @@
         "domelementtype": "1.3.0"
       }
     },
+    "double-ended-queue": {
+      "version": "2.1.0-0",
+      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
+      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
+    },
     "duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
     },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -2349,8 +2590,7 @@
     "electron-to-chromium": {
       "version": "1.3.27",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
-      "dev": true
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0="
     },
     "elliptic": {
       "version": "6.4.0",
@@ -2370,8 +2610,7 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
     },
     "encodeurl": {
       "version": "1.0.1",
@@ -2386,6 +2625,39 @@
         "iconv-lite": "0.4.19"
       }
     },
+    "encoding-down": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-3.0.1.tgz",
+      "integrity": "sha512-uvx+39YNqiPLqhXAvOSGBVy/oYBh4p2ShwG9YFCipwgfOhnVIOxuOPE3R9dEGM44bn0VHIrC3ojXq6lNf2ulwg==",
+      "requires": {
+        "abstract-leveldown": "3.0.0",
+        "level-codec": "8.0.0",
+        "level-errors": "1.1.2"
+      },
+      "dependencies": {
+        "level-codec": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz",
+          "integrity": "sha512-gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="
+        }
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "end-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz",
+      "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=",
+      "requires": {
+        "write-stream": "0.4.3"
+      }
+    },
     "enhanced-resolve": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
@@ -2408,7 +2680,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
       "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "dev": true,
       "requires": {
         "prr": "0.0.0"
       }
@@ -2450,17 +2721,20 @@
       "version": "0.10.35",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
       "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-      "dev": true,
       "requires": {
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
       }
     },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
+    },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35",
@@ -2481,6 +2755,11 @@
         "event-emitter": "0.3.5"
       }
     },
+    "es6-promise": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
+    },
     "es6-set": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -2498,7 +2777,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
@@ -2574,12 +2852,16 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
       "requires": {
         "d": "1.0.0",
         "es5-ext": "0.10.35"
       }
     },
+    "eventdispatcher.js": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/eventdispatcher.js/-/eventdispatcher.js-0.0.2.tgz",
+      "integrity": "sha1-wntZzkEEa2iUEu3M/UzYr8ZM2DU="
+    },
     "eventemitter3": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
@@ -2644,6 +2926,11 @@
         "fill-range": "2.2.3"
       }
     },
+    "expand-template": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz",
+      "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ=="
+    },
     "express": {
       "version": "4.16.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
@@ -2696,6 +2983,11 @@
         }
       }
     },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
     "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -2705,12 +2997,22 @@
         "is-extglob": "1.0.0"
       }
     },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
+    "fast-future": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz",
+      "integrity": "sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo="
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -2747,6 +3049,14 @@
         }
       }
     },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
     "file-saver": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
@@ -2821,6 +3131,11 @@
         "pinkie-promise": "2.0.1"
       }
     },
+    "fit-curve": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/fit-curve/-/fit-curve-0.1.6.tgz",
+      "integrity": "sha1-w72+b1oqO+j4Aerr2kBpGRJWqVs="
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -2842,6 +3157,21 @@
       "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
       "dev": true
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -3769,6 +4099,33 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
+      }
+    },
     "get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
@@ -3787,6 +4144,26 @@
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
+    "github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
+    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -3838,6 +4215,33 @@
         "pinkie-promise": "2.0.1"
       }
     },
+    "google-fonts-webpack-plugin": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-0.4.4.tgz",
+      "integrity": "sha512-+e2D9/DVBG9EDydRovzoqMZ658SsTBGbC0c65GyZqkwNvdj8vRSYQKXqbz7/yt7QaXsCPT1MpH45r3ivWOitcw==",
+      "requires": {
+        "lodash": "4.17.4",
+        "node-fetch": "1.7.3",
+        "webpack-sources": "0.2.3",
+        "yauzl": "2.9.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
+          "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE="
+        },
+        "webpack-sources": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
+          "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
+          "requires": {
+            "source-list-map": "1.1.2",
+            "source-map": "0.5.6"
+          }
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -3858,6 +4262,31 @@
       "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
       "dev": true
     },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        }
+      }
+    },
     "has": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@@ -3881,6 +4310,34 @@
       "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
       "dev": true
     },
+    "has-own-property-x": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
+      "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "to-object-x": "1.5.0",
+        "to-property-key-x": "2.0.2"
+      }
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "requires": {
+        "has-symbol-support-x": "1.4.1"
+      }
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
     "hash-base": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
@@ -3900,6 +4357,17 @@
         "minimalistic-assert": "1.0.0"
       }
     },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
     "he": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
@@ -3917,6 +4385,11 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+    },
     "hoist-non-react-statics": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
@@ -4122,6 +4595,16 @@
         }
       }
     },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -4144,6 +4627,11 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "import-local": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz",
@@ -4178,7 +4666,6 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
       "integrity": "sha1-8gS180cCoywdt9SNidXoZ6BEElM=",
-      "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
         "source-map": "0.5.6"
@@ -4199,6 +4686,11 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
+    "infinity-x": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.0.tgz",
+      "integrity": "sha512-wjy2TupBtZ+aAniKt+xs/PO0xOkuaL6wBysUKbgD7aL1PMW/qY5xXDG59zXZ7dU+gk3zwXOu4yIEWPCEFBTgHQ=="
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4214,6 +4706,11 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
     "inline-style-prefixer": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz",
@@ -4263,6 +4760,18 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
       "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
     },
+    "is-array-buffer-x": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/is-array-buffer-x/-/is-array-buffer-x-1.7.0.tgz",
+      "integrity": "sha512-ufSZRMY2WZX5xyNvk0NOZAG7cgi35B/sGQDGqv8w0X7MoQ2GC9vedanJhuYTPaC4PUCqLQsda1w7NF+dPZmAJw==",
+      "requires": {
+        "attempt-x": "1.1.1",
+        "has-to-string-tag-x": "1.4.1",
+        "is-object-like-x": "1.6.0",
+        "object-get-own-property-descriptor-x": "3.2.0",
+        "to-string-tag-x": "1.4.2"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4302,8 +4811,7 @@
     "is-date-object": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
     },
     "is-dotfile": {
       "version": "1.0.3",
@@ -4332,6 +4840,14 @@
       "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
       "dev": true
     },
+    "is-falsey-x": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.1.tgz",
+      "integrity": "sha512-XWNZC4A+3FX1ECoMjspuEFgSdio82IWjqY/suE0gZ10QA7nzHd/KraRq7Tc5VEHtFRgTRyTdY6W+ykPrDnyoAQ==",
+      "requires": {
+        "to-boolean-x": "1.0.1"
+      }
+    },
     "is-finite": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
@@ -4341,11 +4857,19 @@
         "number-is-nan": "1.0.1"
       }
     },
+    "is-finite-x": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.2.tgz",
+      "integrity": "sha512-HyFrxJZsgmP5RtR1PVlVvHSP4VslZOqr4uoq4x3rDrSOFaYp4R9tfmiWtAzQxPzixXhac3cYEno3NuVn0OHk2Q==",
+      "requires": {
+        "infinity-x": "1.0.0",
+        "is-nan-x": "1.0.1"
+      }
+    },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -4355,6 +4879,21 @@
       "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
       "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU="
     },
+    "is-function-x": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.3.0.tgz",
+      "integrity": "sha512-SreSSU1dlgYaXR5c0mm4qJHKYHIiGiEY+7Cd8/aRLLoMP/VvofD2XcWgBnP833ajpU5XzXbUSpfysnfKZLJFlg==",
+      "requires": {
+        "attempt-x": "1.1.1",
+        "has-to-string-tag-x": "1.4.1",
+        "is-falsey-x": "1.0.1",
+        "is-primitive": "2.0.0",
+        "normalize-space-x": "3.0.0",
+        "replace-comments-x": "2.0.0",
+        "to-boolean-x": "1.0.1",
+        "to-string-tag-x": "1.4.2"
+      }
+    },
     "is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
@@ -4369,6 +4908,32 @@
       "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
       "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
     },
+    "is-index-x": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.1.0.tgz",
+      "integrity": "sha512-qULKLMepQLGC8rSVdi8uF2vI4LiDrU9XSDg1D+Aa657GIB7GV1jHpga7uXgQvkt/cpQ5mVBHUFTpSehYSqT6+A==",
+      "requires": {
+        "math-clamp-x": "1.2.0",
+        "max-safe-integer": "1.0.1",
+        "to-integer-x": "3.0.0",
+        "to-number-x": "2.0.0",
+        "to-string-symbols-supported-x": "1.0.0"
+      }
+    },
+    "is-nan-x": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.1.tgz",
+      "integrity": "sha512-VfNJgfuT8USqKCYQss8g7sFvCzDnL+OOVMQoXhVoulZAyp0ZTj3oyZaaPrn2dxepAkKSQI2BiKHbBabX1DqVtw=="
+    },
+    "is-nil-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.1.tgz",
+      "integrity": "sha512-cfTKWI5iSR04SSCzzugTH5tS2rYG7kwI8yl/AqWkyuxZ7k55cbA47Y7Lezdg1N9aaELd+UxLg628bdQeNQ6BUw==",
+      "requires": {
+        "lodash.isnull": "3.0.0",
+        "validate.io-undefined": "1.0.3"
+      }
+    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -4378,6 +4943,15 @@
         "kind-of": "3.2.2"
       }
     },
+    "is-object-like-x": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.6.0.tgz",
+      "integrity": "sha512-mc3dBMv1jEOdk0f1i2RkJFsZDux0MuHqGwHOoRo770ShUOf4VE6tWThAW8dAZARr9a5RN+iNX1yzMDA5ad1clQ==",
+      "requires": {
+        "is-function-x": "3.3.0",
+        "is-primitive": "2.0.0"
+      }
+    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -4426,8 +5000,12 @@
     "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
     "is-regex": {
       "version": "1.0.4",
@@ -4443,11 +5021,20 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
+    "is-string": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
+      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
+    },
     "is-symbol": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -4464,8 +5051,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isexe": {
       "version": "2.0.0",
@@ -4491,6 +5077,11 @@
         "whatwg-fetch": "2.0.3"
       }
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -4506,6 +5097,12 @@
         "esprima": "4.0.0"
       }
     },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -4518,12 +5115,30 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "dev": true
     },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
     "json3": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
@@ -4533,8 +5148,30 @@
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
     },
     "jss": {
       "version": "8.1.0",
@@ -4618,6 +5255,43 @@
         "css-vendor": "0.3.8"
       }
     },
+    "jszip": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
+      "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
+      "requires": {
+        "core-js": "2.3.0",
+        "es6-promise": "3.0.2",
+        "lie": "3.1.1",
+        "pako": "1.0.6",
+        "readable-stream": "2.0.6"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
+          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "keycode": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz",
@@ -4653,6 +5327,93 @@
         "invert-kv": "1.0.0"
       }
     },
+    "level": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/level/-/level-2.1.1.tgz",
+      "integrity": "sha512-jhsItEs/L5bf5ctKsvIPcMzeh4nwXxnL3Tsxm4E9My07jcFfqEYwKP57Y9AZu7tmtECdyK6bvCqoClwuOBuY9w==",
+      "requires": {
+        "level-packager": "2.1.0",
+        "leveldown": "2.1.1"
+      }
+    },
+    "level-codec": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.1.tgz",
+      "integrity": "sha512-Ua/R9B9r3RasXdRmOtd+t9TCOEIIlts+TN/7XTT2unhDaL6sJn83S3rUyljbr6lVtw49N3/yA0HHjpV6Kzb2aQ=="
+    },
+    "level-errors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz",
+      "integrity": "sha512-Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==",
+      "requires": {
+        "errno": "0.1.4"
+      }
+    },
+    "level-iterator-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.0.tgz",
+      "integrity": "sha512-TWOYw8HR5mhj6xwoVLo0yu26RPL6v28KgvhK1kY1CJf9LyL+rJXjx99zhORTYhN9ysOBIH+iaxAiqRteA+C1/g==",
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "level-packager": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-2.1.0.tgz",
+      "integrity": "sha512-I97zvGOZ6fJ9OFfYv+QmgBpDWbC+UaP5ERJ3oraTyk1v+ABAL4tazris5ym5qL2iLe+qNjXNM/iP8LQcoZMEWw==",
+      "requires": {
+        "encoding-down": "3.0.1",
+        "levelup": "2.0.1"
+      }
+    },
+    "level-write-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz",
+      "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=",
+      "requires": {
+        "end-stream": "0.1.0"
+      }
+    },
+    "leveldown": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-2.1.1.tgz",
+      "integrity": "sha512-JNMCTSchq1YtQLMGePmT07UE7hIIYR4GHpZI7+nUXbM9XgNtRAwcBGhnyJyITwpTILTkUcNPBKZ9lZmTUj2E3g==",
+      "requires": {
+        "abstract-leveldown": "3.0.0",
+        "bindings": "1.3.0",
+        "fast-future": "1.0.2",
+        "nan": "2.8.0",
+        "prebuild-install": "2.4.1"
+      },
+      "dependencies": {
+        "nan": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+          "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
+        }
+      }
+    },
+    "levelup": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-2.0.1.tgz",
+      "integrity": "sha1-PckbPmMtN8nlRiOchkEYsATJ+GA=",
+      "requires": {
+        "deferred-leveldown": "2.0.3",
+        "level-errors": "1.1.2",
+        "level-iterator-stream": "2.0.0",
+        "xtend": "4.0.1"
+      }
+    },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "requires": {
+        "immediate": "3.0.6"
+      }
+    },
     "load-json-file": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -4675,7 +5436,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "dev": true,
       "requires": {
         "big.js": "3.2.0",
         "emojis-list": "2.1.0",
@@ -4705,6 +5465,16 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
     },
+    "lodash-es": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
+      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
+    },
+    "lodash.isnull": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
+      "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4="
+    },
     "lodash.merge": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz",
@@ -4761,6 +5531,19 @@
         "yallist": "2.1.2"
       }
     },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "requires": {
+        "es5-ext": "0.10.35"
+      }
+    },
+    "ltgt": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.0.tgz",
+      "integrity": "sha1-tlul/LNJopkkyOMz98alVi8uSEI="
+    },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -4828,6 +5611,28 @@
         }
       }
     },
+    "math-clamp-x": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.2.0.tgz",
+      "integrity": "sha512-tqpjpBcIf9UulApz3EjWXqTZpMlr2vLN9PryC9ghoyCuRmqZaf3JJhPddzgQpJnKLi2QhoFnvKBFtJekAIBSYg==",
+      "requires": {
+        "to-number-x": "2.0.0"
+      }
+    },
+    "math-sign-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
+      "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
+      "requires": {
+        "is-nan-x": "1.0.1",
+        "to-number-x": "2.0.0"
+      }
+    },
+    "max-safe-integer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
+      "integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA="
+    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -4864,6 +5669,60 @@
         "mimic-fn": "1.1.0"
       }
     },
+    "memoizee": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.10.tgz",
+      "integrity": "sha1-TsoNiu057J0Bf0xcLy9kMvQuXI8=",
+      "requires": {
+        "d": "0.1.1",
+        "es5-ext": "0.10.35",
+        "es6-weak-map": "0.1.4",
+        "event-emitter": "0.3.5",
+        "lru-queue": "0.1.0",
+        "next-tick": "0.2.2",
+        "timers-ext": "0.1.2"
+      },
+      "dependencies": {
+        "d": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+          "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+          "requires": {
+            "es5-ext": "0.10.35"
+          }
+        },
+        "es6-iterator": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+          "integrity": "sha1-1vWLjE/EE8JJtLqhl2j45NfIlE4=",
+          "requires": {
+            "d": "0.1.1",
+            "es5-ext": "0.10.35",
+            "es6-symbol": "2.0.1"
+          }
+        },
+        "es6-symbol": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+          "integrity": "sha1-dhtcZ8/U8dGK+yNPaR1nhoLLO/M=",
+          "requires": {
+            "d": "0.1.1",
+            "es5-ext": "0.10.35"
+          }
+        },
+        "es6-weak-map": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz",
+          "integrity": "sha1-cGzvnpmqI2undmwjnIueKG6n0ig=",
+          "requires": {
+            "d": "0.1.1",
+            "es5-ext": "0.10.35",
+            "es6-iterator": "0.1.3",
+            "es6-symbol": "2.0.1"
+          }
+        }
+      }
+    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -5082,6 +5941,11 @@
       "dev": true,
       "optional": true
     },
+    "nan-x": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.0.tgz",
+      "integrity": "sha512-yw4Fhe2/UTzanQ4f0yHWkRnfTuHZFAi4GZDjXS4G+qv5BqXTqPJBbSxpa7MyyW9v4Y4ZySZQik1vcbNkhdnIOg=="
+    },
     "ncname": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
@@ -5096,6 +5960,11 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
+    "next-tick": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+      "integrity": "sha1-ddpKkn7liH45BliABltzNkE7MQ0="
+    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -5105,6 +5974,14 @@
         "lower-case": "1.1.4"
       }
     },
+    "node-abi": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
+      "integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==",
+      "requires": {
+        "semver": "5.4.1"
+      }
+    },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -5151,6 +6028,11 @@
         "vm-browserify": "0.0.4"
       }
     },
+    "noop-logger": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+      "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
+    },
     "normalize-jss": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/normalize-jss/-/normalize-jss-4.0.0.tgz",
@@ -5178,6 +6060,21 @@
         "remove-trailing-separator": "1.0.2"
       }
     },
+    "normalize-space-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
+      "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "trim-x": "3.0.0",
+        "white-space-x": "3.0.0"
+      }
+    },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -5187,6 +6084,17 @@
         "path-key": "2.0.1"
       }
     },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
     "nth-check": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
@@ -5199,14 +6107,35 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
+    "object-get-own-property-descriptor-x": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/object-get-own-property-descriptor-x/-/object-get-own-property-descriptor-x-3.2.0.tgz",
+      "integrity": "sha512-Z/0fIrptD9YuzN+SNK/1kxAEaBcPQM4gSrtOSMSi9eplnL/AbyQcAyAlreAoAzmBon+DQ1Z+AdhxyQSvav5Fyg==",
+      "requires": {
+        "attempt-x": "1.1.1",
+        "has-own-property-x": "3.2.0",
+        "has-symbol-support-x": "1.4.1",
+        "is-falsey-x": "1.0.1",
+        "is-index-x": "1.1.0",
+        "is-primitive": "2.0.0",
+        "is-string": "1.0.4",
+        "property-is-enumerable-x": "1.1.0",
+        "to-object-x": "1.5.0",
+        "to-property-key-x": "2.0.2"
+      }
+    },
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
@@ -5247,7 +6176,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1.0.2"
       }
@@ -5296,8 +6224,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "2.1.0",
@@ -5357,8 +6284,7 @@
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
     },
     "param-case": {
       "version": "2.1.1",
@@ -5394,6 +6320,17 @@
         "is-glob": "2.0.1"
       }
     },
+    "parse-int-x": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
+      "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "nan-x": "1.0.0",
+        "to-string-x": "1.4.2",
+        "trim-left-x": "3.0.0"
+      }
+    },
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -5468,6 +6405,21 @@
         "sha.js": "2.4.9"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
+    "pepjs": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.4.3.tgz",
+      "integrity": "sha1-FggOlwqud5kTdWwtrviOqnSG30E="
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -5517,6 +6469,97 @@
         }
       }
     },
+    "pouchdb": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.1.tgz",
+      "integrity": "sha512-7YrhsBXbQh/iPA8O5Nzixi9QigaQJjqbbCFr+D7Kc258oeXNW9a0t/tOME1Lh84TJiFRuN9982FGVnrBrUhLiA==",
+      "requires": {
+        "argsarray": "0.0.1",
+        "buffer-from": "0.1.1",
+        "clone-buffer": "1.0.0",
+        "debug": "3.0.1",
+        "double-ended-queue": "2.1.0-0",
+        "immediate": "3.0.6",
+        "inherits": "2.0.3",
+        "level": "2.1.1",
+        "level-codec": "7.0.1",
+        "level-write-stream": "1.0.0",
+        "leveldown": "2.1.1",
+        "levelup": "2.0.1",
+        "lie": "3.1.1",
+        "ltgt": "2.2.0",
+        "readable-stream": "1.0.33",
+        "request": "2.80.0",
+        "spark-md5": "3.0.0",
+        "through2": "2.0.3",
+        "uuid": "3.2.1",
+        "vuvuzela": "1.0.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
+          "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "integrity": "sha1-OjYN1mwbHX/UcFOJhg7aHQ9hEmw=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        },
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        }
+      }
+    },
+    "prebuild-install": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.4.1.tgz",
+      "integrity": "sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA==",
+      "requires": {
+        "expand-template": "1.1.0",
+        "github-from-package": "0.0.0",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "node-abi": "2.1.2",
+        "noop-logger": "0.1.1",
+        "npmlog": "4.1.2",
+        "os-homedir": "1.0.2",
+        "pump": "1.0.3",
+        "rc": "1.2.4",
+        "simple-get": "1.4.3",
+        "tar-fs": "1.16.0",
+        "tunnel-agent": "0.6.0",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -5536,8 +6579,7 @@
     "private": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
-      "dev": true
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE="
     },
     "process": {
       "version": "0.11.10",
@@ -5548,8 +6590,7 @@
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "promise": {
       "version": "7.3.1",
@@ -5569,6 +6610,15 @@
         "object-assign": "4.1.1"
       }
     },
+    "property-is-enumerable-x": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/property-is-enumerable-x/-/property-is-enumerable-x-1.1.0.tgz",
+      "integrity": "sha512-22cKy3w3OpRswU6to9iKWDDlg+F9vF2REcwGlGW23jyLjHb1U/jJEWA44sWupOnkhGfDgotU6Lw+N2oyhNi+5A==",
+      "requires": {
+        "to-object-x": "1.5.0",
+        "to-property-key-x": "2.0.2"
+      }
+    },
     "proptypes": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proptypes/-/proptypes-1.1.0.tgz",
@@ -5586,8 +6636,7 @@
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
-      "dev": true
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo="
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -5608,11 +6657,19 @@
         "randombytes": "2.0.5"
       }
     },
+    "pump": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
       "version": "6.5.1",
@@ -5647,6 +6704,26 @@
       "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
       "dev": true
     },
+    "raf": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
+      "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
+      "requires": {
+        "performance-now": "2.1.0"
+      },
+      "dependencies": {
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+        }
+      }
+    },
+    "ramda": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
+      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU="
+    },
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -5729,6 +6806,24 @@
       "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
       "dev": true
     },
+    "rc": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz",
+      "integrity": "sha1-oPYGyq4qO4YrvQ74VILAElsxX6M=",
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "react": {
       "version": "16.1.0",
       "resolved": "https://registry.npmjs.org/react/-/react-16.1.0.tgz",
@@ -5799,6 +6894,45 @@
         "theming": "1.1.0"
       }
     },
+    "react-notification-system": {
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/react-notification-system/-/react-notification-system-0.2.16.tgz",
+      "integrity": "sha1-m52iCw00eGtgBXxStCUW6hKVN0o=",
+      "requires": {
+        "create-react-class": "15.6.2",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.0"
+      }
+    },
+    "react-notification-system-redux": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-notification-system-redux/-/react-notification-system-redux-1.2.0.tgz",
+      "integrity": "sha1-FPsJFccuTBLZmD/+ByVOLNGexd8=",
+      "requires": {
+        "prop-types": "15.6.0",
+        "react-notification-system": "0.2.16"
+      }
+    },
+    "react-redux": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.6.tgz",
+      "integrity": "sha512-8taaaGu+J7PMJQDJrk/xiWEYQmdo3mkXw6wPr3K3LxvXis3Fymiq7c13S+Tpls/AyNUAsoONkU81AP0RA6y6Vw==",
+      "requires": {
+        "hoist-non-react-statics": "2.3.1",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.4",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.6.0"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
+        }
+      }
+    },
     "react-resize-detector": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-1.1.0.tgz",
@@ -5807,6 +6941,15 @@
         "prop-types": "15.6.0"
       }
     },
+    "react-svg-inline": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-svg-inline/-/react-svg-inline-2.0.1.tgz",
+      "integrity": "sha512-9YVqJ80g1gPWAvD9CS/z4cKPD45ZSMjjzwxFAmQJiMEoAo1Ajhz92WirXag3ftltDN5lPNkVWx/KOnEWB/PaMQ==",
+      "requires": {
+        "classnames": "2.2.5",
+        "prop-types": "15.6.0"
+      }
+    },
     "react-tap-event-plugin": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-3.0.2.tgz",
@@ -5864,7 +7007,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -5915,23 +7057,47 @@
         "strip-indent": "1.0.1"
       }
     },
+    "redux-form": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.2.0.tgz",
+      "integrity": "sha512-qbgeI19drwnm9FeGAotDA1vsZO8q94XF7IxPDuJmSXxDYX2rqzhND6NROahCBJfBK5xM1cchvmgscO2rry1EEw==",
+      "requires": {
+        "deep-equal": "1.0.1",
+        "es6-error": "4.1.1",
+        "hoist-non-react-statics": "2.3.1",
+        "invariant": "2.2.2",
+        "is-promise": "2.1.0",
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.4",
+        "prop-types": "15.6.0"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
+          "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
+        }
+      }
+    },
+    "redux-undo": {
+      "version": "1.0.0-beta9-9-7",
+      "resolved": "https://registry.npmjs.org/redux-undo/-/redux-undo-1.0.0-beta9-9-7.tgz",
+      "integrity": "sha1-/juqGycUI9fdu/w6gscbApotuLo="
+    },
     "regenerate": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-      "dev": true
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg=="
     },
     "regenerator-runtime": {
       "version": "0.10.5",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
       "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.25.0",
@@ -5952,7 +7118,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
       "requires": {
         "regenerate": "1.3.3",
         "regjsgen": "0.2.0",
@@ -5962,14 +7127,12 @@
     "regjsgen": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
     },
     "regjsparser": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
       "requires": {
         "jsesc": "0.5.0"
       },
@@ -5977,8 +7140,7 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
         }
       }
     },
@@ -6036,6 +7198,69 @@
         "is-finite": "1.0.2"
       }
     },
+    "replace-comments-x": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
+      "integrity": "sha512-+vMP4jqU+8HboLWms6YMNEiaZG5hh1oR6ENCnGYDF/UQ7aYiJUK/8tcl3+KZAHRCKKa3gqzrfiarlUBHQSgRlg==",
+      "requires": {
+        "require-coercible-to-string-x": "1.0.0",
+        "to-string-x": "1.4.2"
+      }
+    },
+    "request": {
+      "version": "2.80.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.80.0.tgz",
+      "integrity": "sha1-jMFi1215OBze/dNQXXa4C2BYm9A=",
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.3.2",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.4.3",
+        "uuid": "3.2.1"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.3.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+        },
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        }
+      }
+    },
+    "require-coercible-to-string-x": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.0.tgz",
+      "integrity": "sha512-Rpfd4sMdflPAKecdKhfAtQHlZzzle4UMUgxJ01hXtTcNWMV8w9GeZnKhEyrT73kgrflBOP1zg41amUPZGcNspA==",
+      "requires": {
+        "require-object-coercible-x": "1.4.1",
+        "to-string-x": "1.4.2"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6048,12 +7273,25 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
+    "require-object-coercible-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.1.tgz",
+      "integrity": "sha512-0YHa2afepsLfQvwQ1P2XvDZnGOUia5sC07ZijIRU2dnsRxnuilXWF6B2CFaKGDA9eZl39lJHrXCDsnfgroRd6Q==",
+      "requires": {
+        "is-nil-x": "1.4.1"
+      }
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "reselect": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
+    },
     "resolve-cwd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
@@ -6129,8 +7367,7 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-      "dev": true
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
     },
     "send": {
       "version": "0.16.1",
@@ -6207,8 +7444,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -6259,20 +7495,37 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simple-assign": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz",
       "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o="
     },
+    "simple-get": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz",
+      "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=",
+      "requires": {
+        "once": "1.4.0",
+        "unzip-response": "1.0.2",
+        "xtend": "4.0.1"
+      }
+    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
     "sockjs": {
       "version": "0.3.18",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz",
@@ -6317,8 +7570,7 @@
     "source-map": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-      "dev": true
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
     },
     "source-map-support": {
       "version": "0.4.15",
@@ -6329,6 +7581,11 @@
         "source-map": "0.5.6"
       }
     },
+    "spark-md5": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz",
+      "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8="
+    },
     "spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
@@ -6385,6 +7642,28 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -6455,11 +7734,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
     },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -6489,6 +7772,11 @@
         "get-stdin": "4.0.1"
       }
     },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -6505,6 +7793,28 @@
       "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
       "dev": true
     },
+    "tar-fs": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
+      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
+      "requires": {
+        "chownr": "1.0.1",
+        "mkdirp": "0.5.1",
+        "pump": "1.0.3",
+        "tar-stream": "1.5.5"
+      }
+    },
+    "tar-stream": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
+      "requires": {
+        "bl": "1.2.1",
+        "end-of-stream": "1.4.1",
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
     "theming": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/theming/-/theming-1.1.0.tgz",
@@ -6536,6 +7846,18 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
+    "three-js-csg": {
+      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "requires": {
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
     "thunky": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
@@ -6557,23 +7879,146 @@
         "setimmediate": "1.0.5"
       }
     },
+    "timers-ext": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
+      "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
+      "requires": {
+        "es5-ext": "0.10.35",
+        "next-tick": "1.0.0"
+      },
+      "dependencies": {
+        "next-tick": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+        }
+      }
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
       "dev": true
     },
+    "to-boolean-x": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.1.tgz",
+      "integrity": "sha512-PstxY3K6hVEHnY3FITs8XBoJbt0RI1e4MLIhAL9hWa3BtVLCrb86vU5z6lEKh7uZZjiPiLqIKMmfMro1nNgtXQ=="
+    },
     "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
     },
+    "to-integer-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
+      "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
+      "requires": {
+        "is-finite-x": "3.0.2",
+        "is-nan-x": "1.0.1",
+        "math-sign-x": "3.0.0",
+        "to-number-x": "2.0.0"
+      }
+    },
+    "to-number-x": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
+      "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "nan-x": "1.0.0",
+        "parse-int-x": "2.0.0",
+        "to-primitive-x": "1.1.0",
+        "trim-x": "3.0.0"
+      }
+    },
+    "to-object-x": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/to-object-x/-/to-object-x-1.5.0.tgz",
+      "integrity": "sha512-AKn5GQcdWky+s20vjWkt+Wa6y3dxQH3yQyMBhOfBOPldUwqwhgvlqcIg5H092ntNc+TX8/Cxzs1kMHH19pyCnA==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "require-object-coercible-x": "1.4.1"
+      }
+    },
+    "to-primitive-x": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/to-primitive-x/-/to-primitive-x-1.1.0.tgz",
+      "integrity": "sha512-gyMY0gi3wjK3e4MUBKqv9Zl8QGcWguIkaUr2VJmoBEsOpDcpDZSEyljR773eVG4maS48uX7muLkoQoh/BA82OQ==",
+      "requires": {
+        "has-symbol-support-x": "1.4.1",
+        "is-date-object": "1.0.1",
+        "is-function-x": "3.3.0",
+        "is-nil-x": "1.4.1",
+        "is-primitive": "2.0.0",
+        "is-symbol": "1.0.1",
+        "require-object-coercible-x": "1.4.1",
+        "validate.io-undefined": "1.0.3"
+      }
+    },
+    "to-property-key-x": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-property-key-x/-/to-property-key-x-2.0.2.tgz",
+      "integrity": "sha512-YISLpZFYIazNm0P8hLsKEEUEZ3m8U3+eDysJZqTu3+B9tQp+2TrMpaEGT8Agh4fZ5LSoums60/glNEzk5ozqrg==",
+      "requires": {
+        "has-symbol-support-x": "1.4.1",
+        "to-primitive-x": "1.1.0",
+        "to-string-x": "1.4.2"
+      }
+    },
+    "to-string-symbols-supported-x": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.0.tgz",
+      "integrity": "sha512-HbVH673pybrUmhzESGHUm17BBJvqb7BU8HciOvuEYm9ipuDyjmddhvkVqpVW6sM/C5/zhJo17n7O7I/24loJIQ==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "has-symbol-support-x": "1.4.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "to-string-tag-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.2.tgz",
+      "integrity": "sha512-ytO9eLigxsQQLGuab0C1iSSTzKdJNVSlBg0Spg4J/rGAVrQJ5y774mo0SSzgGeTT4RJGGyJNfObXaTMzX0XDOQ==",
+      "requires": {
+        "lodash.isnull": "3.0.0",
+        "validate.io-undefined": "1.0.3"
+      }
+    },
+    "to-string-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.2.tgz",
+      "integrity": "sha512-/WP5arlwtCpAAexCCHiQBW0eXwse84osWyP1Qtaz71nsYSuUpOkT6tBm8nQ4IIUfSh5hji0hDupUCD2xbbOL6A==",
+      "requires": {
+        "is-symbol": "1.0.1"
+      }
+    },
     "toposort": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
       "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
       "dev": true
     },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-left-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
+      "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "require-coercible-to-string-x": "1.0.0",
+        "white-space-x": "3.0.0"
+      }
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -6586,12 +8031,45 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "trim-right-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
+      "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
+      "requires": {
+        "cached-constructors-x": "1.0.0",
+        "require-coercible-to-string-x": "1.0.0",
+        "white-space-x": "3.0.0"
+      }
+    },
+    "trim-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
+      "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
+      "requires": {
+        "trim-left-x": "3.0.0",
+        "trim-right-x": "3.0.0"
+      }
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
     "type-is": {
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
@@ -6677,6 +8155,11 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
+    "unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
+    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -6755,8 +8238,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "utila": {
       "version": "0.4.0",
@@ -6784,6 +8266,11 @@
         "user-home": "1.1.1"
       }
     },
+    "valid-url": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
     "validate-npm-package-license": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
@@ -6794,11 +8281,33 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
+    "validate.io-undefined": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
+      "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+        }
+      }
+    },
     "vm-browserify": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
@@ -6808,6 +8317,11 @@
         "indexof": "0.0.1"
       }
     },
+    "vuvuzela": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz",
+      "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws="
+    },
     "warning": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
@@ -7144,6 +8658,31 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "white-space-x": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
+      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg=="
+    },
+    "wide-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "requires": {
+        "string-width": "1.0.2"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        }
+      }
+    },
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -7192,8 +8731,22 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write-stream": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz",
+      "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=",
+      "requires": {
+        "readable-stream": "0.0.4"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz",
+          "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40="
+        }
+      }
     },
     "ws": {
       "version": "4.0.0",
@@ -7214,8 +8767,7 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
       "version": "3.2.1",
@@ -7299,6 +8851,15 @@
         }
       }
     },
+    "yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "fd-slicer": "1.0.1"
+      }
+    },
     "yml-loader": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/yml-loader/-/yml-loader-2.1.0.tgz",

From 961337138ba0303386f2f7bf4ebf604115da8747 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 12:38:35 +0100
Subject: [PATCH 047/163] fix grid size calculation

---
 src/sliceActions/generateInfills.js | 2 +-
 src/sliceActions/getFillTemplate.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index 20335fd..e741493 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -22,7 +22,7 @@ export default function generateInfills(slices, settings) {
   const bottomSkinCount = Math.ceil(bottomThickness / layerHeight);
   const topSkinCount = Math.ceil(topThickness / layerHeight);
   const nozzleRadius = nozzleDiameter / 2;
-  const outerFillTemplateSize = Math.sqrt(2 * Math.pow(nozzleDiameter, 2));
+  const outerFillTemplateSize = nozzleDiameter;
 
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
diff --git a/src/sliceActions/getFillTemplate.js b/src/sliceActions/getFillTemplate.js
index 98ee8be..6b3db95 100644
--- a/src/sliceActions/getFillTemplate.js
+++ b/src/sliceActions/getFillTemplate.js
@@ -1,8 +1,10 @@
 import Shape from 'clipper-js';
 
-export default function getFillTemplate(bounds, size, even, uneven) {
+export default function getFillTemplate(bounds, gridSize, even, uneven) {
   const paths = [];
 
+  const size = Math.sqrt(2 * Math.pow(gridSize, 2));
+
   const left = Math.floor(bounds.left / size) * size;
   const right = Math.ceil(bounds.right / size) * size;
   const top = Math.floor(bounds.top / size) * size;

From 198ca783f7fa31f3e33399091ddb2f280b92944e Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 13:59:42 +0100
Subject: [PATCH 048/163] update package lock

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 927312f..da8be14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,6 +79,9 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
           "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+        },
+        "three-js-csg": {
+          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -7846,9 +7849,6 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
-    "three-js-csg": {
-      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
-    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",

From 60c70cdbd5bf13f9ea1445a1a57d06dc63afd88a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 14:02:34 +0100
Subject: [PATCH 049/163] difference line shapes with fill shapes

---
 src/sliceActions/shapesToSlices.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
index a6ace31..71d3ab7 100644
--- a/src/sliceActions/shapesToSlices.js
+++ b/src/sliceActions/shapesToSlices.js
@@ -27,14 +27,16 @@ export default function shapesToSlices(shapes, settings) {
 
     for (let i = 0; i < fillShapes.length; i ++) {
       const fillShape = fillShapes[i];
+      if (fillShape.paths.length === 0) continue;
+
       slice.add(fillShape, true);
 
-      // if (lineShapesClosed.paths.length > 0) {
-      //   lineShapesClosed = lineShapesClosed.difference(closedShape);
-      // }
-      // if (lineShapesOpen.paths.length > 0) {
-      //   lineShapesOpen = lineShapesOpen.difference(closedShape);
-      // }
+      if (lineShapesClosed.paths.length > 0) {
+        lineShapesClosed = lineShapesClosed.difference(fillShape);
+      }
+      if (lineShapesOpen.paths.length > 0) {
+        lineShapesOpen = lineShapesOpen.difference(fillShape);
+      }
     }
 
     if (lineShapesClosed.paths.length > 0) {

From 0bb646a5ac994aa4e6b1eb8a9e7642c553db5b5b Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 14:24:01 +0100
Subject: [PATCH 050/163] move z offset to constant

---
 src/constants.js                                 |  1 +
 src/settings/default.yml                         |  1 -
 src/sliceActions/calculateLayersIntersections.js | 13 +++++++------
 src/sliceActions/slicesToGCode.js                |  7 +++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index f8b06f8..828d62e 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,3 +1,4 @@
 export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
+export const Z_OFFSET = 0.3;
diff --git a/src/settings/default.yml b/src/settings/default.yml
index f69d507..84806ad 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -1,4 +1,3 @@
-zOffset: 0.3
 dimensions:
   x: 200
   y: 200
diff --git a/src/sliceActions/calculateLayersIntersections.js b/src/sliceActions/calculateLayersIntersections.js
index c077bd9..a9c2ddd 100644
--- a/src/sliceActions/calculateLayersIntersections.js
+++ b/src/sliceActions/calculateLayersIntersections.js
@@ -1,11 +1,12 @@
+import { Z_OFFSET } from '../constants.js';
+
 export default function calculateLayersIntersections(lines, settings) {
   const {
     dimensions: { z: dimensionsZ },
-    layerHeight,
-    zOffset
+    layerHeight
   } = settings;
 
-  const numLayers = Math.floor((dimensionsZ - zOffset) / layerHeight);
+  const numLayers = Math.floor((dimensionsZ - Z_OFFSET) / layerHeight);
 
   const layers = Array.from(Array(numLayers)).map(() => ({
     points: {},
@@ -15,12 +16,12 @@ export default function calculateLayersIntersections(lines, settings) {
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex ++) {
     const { line, faces } = lines[lineIndex];
 
-    const min = Math.ceil((Math.min(line.start.y, line.end.y) - zOffset) / layerHeight);
-    const max = Math.floor((Math.max(line.start.y, line.end.y) - zOffset) / layerHeight);
+    const min = Math.ceil((Math.min(line.start.y, line.end.y) - Z_OFFSET) / layerHeight);
+    const max = Math.floor((Math.max(line.start.y, line.end.y) - Z_OFFSET) / layerHeight);
 
     for (let layerIndex = min; layerIndex <= max; layerIndex ++) {
       if (layerIndex >= 0 && layerIndex < numLayers) {
-        const y = layerIndex * layerHeight + zOffset;
+        const y = layerIndex * layerHeight + Z_OFFSET;
 
         let x, z;
         if (line.start.y === line.end.y) {
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index cbc38a2..14070b1 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -1,6 +1,6 @@
 import GCode from './helpers/GCode.js';
 import comb from './helpers/comb.js';
-import { PRECISION } from '../constants.js';
+import { PRECISION, Z_OFFSET } from '../constants.js';
 
 const PROFILE_TYPES = ['support', 'innerShell', 'outerShell', 'innerInfill', 'outerInfill', 'brim'];
 
@@ -12,8 +12,7 @@ export default function slicesToGCode(slices, settings) {
     travelSpeed,
     retraction,
     travel,
-    combing,
-    zOffset
+    combing
   } = settings;
 
   const filamentSurfaceArea = Math.pow((filamentThickness / 2), 2) * Math.PI;
@@ -32,7 +31,7 @@ export default function slicesToGCode(slices, settings) {
   let isFirstLayer = true;
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
-    const z = layer * layerHeight + zOffset;
+    const z = layer * layerHeight + Z_OFFSET;
 
     if (layer === 1) {
       gcode.turnFanOn();

From ca3718e4925a686a0a4c22655175d875c486ec79 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 15:27:08 +0100
Subject: [PATCH 051/163] Remove tiny holes

#18
---
 package-lock.json                  | 16 ++++++++--------
 package.json                       |  2 +-
 src/constants.js                   |  1 +
 src/sliceActions/shapesToSlices.js |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da8be14..8e6597c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,9 +10,9 @@
       "integrity": "sha512-1qXg62qaZkc/zYPan37CXvUtaJk4aFVLz2y8cqnkN9Y0r1Er5soIZ5esMz4YYyjUrQGawBoYcGvatRALYnzlvg=="
     },
     "@doodle3d/clipper-js": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.7.tgz",
-      "integrity": "sha512-8Ji8rrFWZ7LAEpIp1SQZJgewxt0FUBFeDku+ZRIR5PS0Jc6Abbq5KykQLVh1zOh3oqX2Cgl+myhqMhFeZXqutA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.10.tgz",
+      "integrity": "sha512-BSLvOvS9ECFyV90BsG1rXPb9W/g0j+azlPu5ntohFdIyUJPIzmRNAYq4lreQKBO8FSF0e9BVGG0QX8vC6ZQa4w==",
       "requires": {
         "@doodle3d/clipper-lib": "6.4.2-b"
       }
@@ -26,7 +26,7 @@
       "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
       "requires": {
         "@doodle3d/cal": "0.0.8",
-        "@doodle3d/clipper-js": "1.0.7",
+        "@doodle3d/clipper-js": "1.0.10",
         "@doodle3d/fill-path": "1.0.7",
         "@doodle3d/potrace-js": "0.0.6",
         "@doodle3d/threejs-export-obj": "0.0.8",
@@ -79,9 +79,6 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
           "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
-        },
-        "three-js-csg": {
-          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -90,7 +87,7 @@
       "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz",
       "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==",
       "requires": {
-        "@doodle3d/clipper-js": "1.0.7"
+        "@doodle3d/clipper-js": "1.0.10"
       }
     },
     "@doodle3d/potrace-js": {
@@ -7849,6 +7846,9 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
+    "three-js-csg": {
+      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
+    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/package.json b/package.json
index 5c07c7f..8b655e4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "build:module:settings": "cp -r src/settings module"
   },
   "dependencies": {
-    "@doodle3d/clipper-js": "^1.0.7",
+    "@doodle3d/clipper-js": "^1.0.10",
     "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",
diff --git a/src/constants.js b/src/constants.js
index 828d62e..2bc85da 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,4 +1,5 @@
 export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
+export const MIN_AREA = 25;
 export const Z_OFFSET = 0.3;
diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
index 71d3ab7..23bea79 100644
--- a/src/sliceActions/shapesToSlices.js
+++ b/src/sliceActions/shapesToSlices.js
@@ -1,7 +1,7 @@
 import Shape from 'clipper-js';
 import Slice from './helpers/Slice.js';
 
-import { PRECISION } from '../constants.js';
+import { PRECISION, MIN_AREA } from '../constants.js';
 
 export default function shapesToSlices(shapes, settings) {
   const sliceLayers = [];
@@ -11,6 +11,7 @@ export default function shapesToSlices(shapes, settings) {
 
     fillShapes = new Shape(fillShapes, true, true, true, true)
       .fixOrientation()
+      .thresholdArea(MIN_AREA / Math.pow(PRECISION, 2))
       .simplify('pftNonZero')
       .clean(1)
       .seperateShapes();

From 2f04aa9c506a72f3a2ba6b087fb06b669be59943 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 15:30:08 +0100
Subject: [PATCH 052/163] fix threshold area function

#18
---
 src/constants.js                   | 2 +-
 src/sliceActions/shapesToSlices.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index 2bc85da..4977e27 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,5 +1,5 @@
 export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
-export const MIN_AREA = 25;
+export const MIN_AREA = 10;
 export const Z_OFFSET = 0.3;
diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
index 23bea79..b681a72 100644
--- a/src/sliceActions/shapesToSlices.js
+++ b/src/sliceActions/shapesToSlices.js
@@ -11,9 +11,9 @@ export default function shapesToSlices(shapes, settings) {
 
     fillShapes = new Shape(fillShapes, true, true, true, true)
       .fixOrientation()
-      .thresholdArea(MIN_AREA / Math.pow(PRECISION, 2))
       .simplify('pftNonZero')
       .clean(1)
+      .thresholdArea(MIN_AREA / Math.pow(PRECISION, 2))
       .seperateShapes();
 
     lineShapesClosed = new Shape(lineShapesClosed, true, true, true, true)

From 485f741077ec210684d7d7539db29843bf11cd98 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 15:33:12 +0100
Subject: [PATCH 053/163] change min area

---
 src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.js b/src/constants.js
index 4977e27..17803b6 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,5 +1,5 @@
 export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
-export const MIN_AREA = 10;
+export const MIN_AREA = 1; // holes smaller as 1mm2 get removed
 export const Z_OFFSET = 0.3;

From f28722aec52129b0ec407c824c108dd4e505ff2e Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 18 Jan 2018 16:32:54 +0100
Subject: [PATCH 054/163] rename percentage to density

---
 src/interface/Settings.js           | 4 ++--
 src/settings/default.yml            | 2 +-
 src/settings/quality.yml            | 6 +++---
 src/sliceActions/generateInfills.js | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index b578672..ec94401 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -156,7 +156,7 @@ class Settings extends React.Component {
       case 'settings.innerShell.flowRate':
       case 'settings.outerShell.speed':
       case 'settings.outerShell.flowRate':
-      case 'settings.innerInfill.precentage':
+      case 'settings.innerInfill.density':
       case 'settings.innerInfill.speed':
       case 'settings.innerInfill.flowRate':
       case 'settings.outerInfill.speed':
@@ -367,7 +367,7 @@ class Settings extends React.Component {
               <NumberField name="settings.outerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.outerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Inner infill</p>
-              <NumberField name="settings.innerInfill.precentage" min={0} max={100} fullWidth floatingLabelText="Percentage" />
+              <NumberField name="settings.innerInfill.density" min={0} max={100} fullWidth floatingLabelText="Density" />
               <NumberField name="settings.innerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.innerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Outer infill</p>
diff --git a/src/settings/default.yml b/src/settings/default.yml
index 84806ad..b3c42ec 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -38,7 +38,7 @@ outerShell:
 innerInfill:
   flowRate: 1.0
   speed: 80.0
-  precentage: 20.0
+  density: 20.0
 outerInfill:
   flowRate: 1.0
   speed: 50.0
diff --git a/src/settings/quality.yml b/src/settings/quality.yml
index 1c840bf..96134d9 100644
--- a/src/settings/quality.yml
+++ b/src/settings/quality.yml
@@ -15,7 +15,7 @@ low:
     speed: 70.0
   innerInfill:
     speed: 80.0
-    precentage: 10.0
+    density: 10.0
 medium:
   title: "Medium"
   layerHeight: .15
@@ -33,7 +33,7 @@ medium:
     speed: 40.0
   innerInfill:
     speed: 80.0
-    precentage: 10.0
+    density: 10.0
 high:
   title: "High"
   thickness:
@@ -51,4 +51,4 @@ high:
     speed: 30.0
   innerInfill:
     speed: 70.0
-    precentage: 20.0
+    density: 20.0
diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index e741493..6d854aa 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -5,7 +5,7 @@ import Shape from 'clipper-js';
 export default function generateInfills(slices, settings) {
   let {
     layerHeight,
-    innerInfill: { precentage: infillPercentage },
+    innerInfill: { density: infillDensity },
     thickness: {
       top: topThickness,
       bottom: bottomThickness
@@ -13,11 +13,11 @@ export default function generateInfills(slices, settings) {
     nozzleDiameter
   } = settings;
 
-  infillPercentage /= 100;
+  infillDensity /= 100;
   nozzleDiameter /= PRECISION;
 
-  const bidirectionalInfill = infillPercentage < 0.8;
-  const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillPercentage;
+  const bidirectionalInfill = infillDensity < 0.8;
+  const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillDensity;
 
   const bottomSkinCount = Math.ceil(bottomThickness / layerHeight);
   const topSkinCount = Math.ceil(topThickness / layerHeight);

From 4dc5e4849e35f8d97e157c2020ee351427d598d4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 22 Jan 2018 18:12:33 +0100
Subject: [PATCH 055/163] update fetch progress

---
 src/interface/index.js |  2 +-
 src/interface/utils.js | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 10b94ff..47f8bff 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import _ from 'lodash';
 import React from 'react';
 import PropTypes from 'proptypes';
-import { centerGeometry, placeOnGround, createScene, fetchProgress, slice, TabTemplate } from './utils.js';
+import { centerGeometry, placeOnGround, createScene, slice, TabTemplate } from './utils.js';
 import injectSheet from 'react-jss';
 import RaisedButton from 'material-ui/RaisedButton';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 4f2b811..3dd601e 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -84,20 +84,33 @@ export function createScene({ pixelRatio, muiTheme }) {
   return { editorControls, scene, mesh, camera, renderer, render, box, setSize, updateCanvas, focus };
 }
 
-export function fetchProgress(url, { method = 'get', headers = {}, body = {} } = {}, onProgress) {
+export function fetchProgress(url, data = {}, onProgress) {
   return new Promise((resolve, reject) => {
+    const request = new Request(url, data);
     const xhr = new XMLHttpRequest();
-    xhr.open(method, url);
-    if (headers) {
-      for (const key in headers) {
-        const header = headers[key];
-        xhr.setRequestHeader(key, header);
-      }
+
+    xhr.onload = () => {
+      const { status, statusText, responseURL: url } = xhr;
+      resolve(new Response(xhr.response, { status, statusText, url }));
+    }
+    xhr.onerror = () => reject(new TypeError('Network request failed'));
+    xhr.ontimeout = () => reject(new TypeError('Network request failed'));
+
+    xhr.open(request.method, url);
+
+    if (request.credentials === 'include') {
+      xhr.withCredentials = true
+    } else if (request.credentials === 'omit') {
+      xhr.withCredentials = false
     }
-    xhr.onload = event => resolve(event.target.responseText);
-    xhr.onerror = reject;
     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
-    xhr.send(body);
+    if (xhr.responseType) xhr.responseType = 'blob';
+
+    request.headers.forEach((value, name) => {
+      xhr.setRequestHeader(name, value)
+    });
+
+    xhr.send(data.body);
   });
 }
 

From d5ea6709679acefb31c8a20e80b7d995df5ef652 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 23 Jan 2018 12:19:43 +0100
Subject: [PATCH 056/163] add ip in settings config for the doodle3d printer

---
 package-lock.json         |  21 ++++---
 package.json              |   1 +
 src/interface/Settings.js |  56 +++++++++++------
 test.js                   | 122 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 174 insertions(+), 26 deletions(-)
 create mode 100644 test.js

diff --git a/package-lock.json b/package-lock.json
index 8e6597c..21fcd11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,8 +54,8 @@
         "react-notification-system-redux": "1.2.0",
         "react-redux": "5.0.6",
         "react-resize-detector": "1.1.0",
-        "react-svg-inline": "2.0.1",
-        "redux-form": "7.2.0",
+        "react-svg-inline": "2.1.0",
+        "redux-form": "7.2.1",
         "redux-undo": "1.0.0-beta9-9-7",
         "reselect": "3.0.1",
         "semver": "5.4.1",
@@ -6942,9 +6942,9 @@
       }
     },
     "react-svg-inline": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/react-svg-inline/-/react-svg-inline-2.0.1.tgz",
-      "integrity": "sha512-9YVqJ80g1gPWAvD9CS/z4cKPD45ZSMjjzwxFAmQJiMEoAo1Ajhz92WirXag3ftltDN5lPNkVWx/KOnEWB/PaMQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-svg-inline/-/react-svg-inline-2.1.0.tgz",
+      "integrity": "sha512-GzRID5IcEQ8dnnaUtTb9MDTAbhuaOiVKKAVLgrCNuehHsg3DuZbe82bjc9JhmPv0zsDWhDrJwzADNgzEvE6VeQ==",
       "requires": {
         "classnames": "2.2.5",
         "prop-types": "15.6.0"
@@ -7058,9 +7058,9 @@
       }
     },
     "redux-form": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.2.0.tgz",
-      "integrity": "sha512-qbgeI19drwnm9FeGAotDA1vsZO8q94XF7IxPDuJmSXxDYX2rqzhND6NROahCBJfBK5xM1cchvmgscO2rry1EEw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.2.1.tgz",
+      "integrity": "sha512-KWV+rq+L1QGoRSKoJXbGS8Mw2q4ta5FVyGxW5ZYnAEjXZAukvUCkqDUzobBmOqiRHvrZ3/ssEA7kJFdu7rV8+w==",
       "requires": {
         "deep-equal": "1.0.1",
         "es6-error": "4.1.1",
@@ -8271,6 +8271,11 @@
       "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
       "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
     },
+    "validate-ip": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/validate-ip/-/validate-ip-1.0.1.tgz",
+      "integrity": "sha1-615PY+HRq8buRuGK4gaXv1vtBto="
+    },
     "validate-npm-package-license": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
diff --git a/package.json b/package.json
index 8b655e4..473f113 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "react-resize-detector": "^1.1.0",
     "shortid": "^2.2.8",
     "three": "^0.88.0",
+    "validate-ip": "^1.0.1",
     "webpack-bundle-analyzer": "^2.9.2"
   },
   "devDependencies": {
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index ec94401..d28b5ee 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -18,6 +18,7 @@ import materialSettings from '../settings/material.yml';
 import qualitySettings from '../settings/quality.yml';
 import update from 'react-addons-update';
 import SettingsIcon from 'material-ui-icons/Settings';
+import validateIp from 'validate-ip';
 
 const styles = {
   textFieldRow: {
@@ -79,6 +80,7 @@ class Settings extends React.Component {
       open: false,
       name: '',
       printer: '',
+      ip: '',
       error: null
     },
     managePrinter: {
@@ -102,25 +104,22 @@ class Settings extends React.Component {
 
     let state = _.cloneDeep(this.state);
 
-    const removeAddPrinterError = () => {
-      state = update(state, { addPrinter: { error: { $set: null } } });
-    };
-
     switch (fieldName) {
       case 'managePrinter.printer':
       case 'managePrinter.name':
+      case 'managePrinter.ip':
         state = _.set(state, fieldName, value);
+        state = update(state, { managePrinter: { error: { $set: null } } });
         break;
 
       case 'addPrinter.printer':
-        state = update(state, { addPrinter: { printer: { $set: value } } });
-        state = update(state, { addPrinter: { name: { $set: printerSettings[value].title } } });
-        removeAddPrinterError();
-        break;
-
       case 'addPrinter.name':
-        state = update(state, { addPrinter: { name: { $set: value } } });
-        removeAddPrinterError();
+      case 'addPrinter.ip':
+        state = _.set(state, fieldName, value);
+        if (fieldName === 'addPrinter.printer') {
+          state = update(state, { addPrinter: { name: { $set: printerSettings[value].title } } });
+        }
+        state = update(state, { addPrinter: { error: { $set: null } } });
         break;
 
       case 'activePrinter':
@@ -204,12 +203,13 @@ class Settings extends React.Component {
   constructSettings(localStorage) {
     if (!localStorage.active) return defaultSettings;
 
-    const { printer, material, quality, advanced } = localStorage.printers[localStorage.active].settings;
+    const { ip, settings: { printer, material, quality, advanced } } = localStorage.printers[localStorage.active];
     let settings = {
       ...defaultSettings,
       printer,
       material,
       quality
+      ip
     };
 
     settings = _.merge({}, settings, printerSettings[printer]);
@@ -225,10 +225,14 @@ class Settings extends React.Component {
   }
 
   addPrinter = () => {
-    const { name, printer } = this.state.addPrinter;
+    const { name, printer, ip } = this.state.addPrinter;
 
     if (!name || !printer) {
-      this.setState({ addPrinter: { ...this.state.addPrinter, error: 'Please enter a name and printer' } });
+      this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a name and printer' } } }));
+      return;
+    }
+    if (printer === 'doodle3d_printer' && !validateIp(ip)) {
+      this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a valid IP adress' } } }));
       return;
     }
 
@@ -237,7 +241,7 @@ class Settings extends React.Component {
       active: id,
       printers: {
         ...this.state.localStorage.printers,
-        [id]: { name, settings: { printer, material: 'pla', quality: 'medium', advanced: {} } }
+        [id]: { name, ip, settings: { printer, material: 'pla', quality: 'medium', advanced: {} } }
       }
     };
     this.setState({ localStorage });
@@ -250,11 +254,22 @@ class Settings extends React.Component {
   };
 
   editPrinter = () => {
-    const { localStorage: { active, printers }, managePrinter: { printer, name } } = this.state;
+    const { localStorage: { active, printers }, managePrinter: { printer, name, ip } } = this.state;
+
+    if (!name) {
+      this.setState(update(this.state, { managePrinter: { error: { $set: 'Please enter a name' } } }));
+      return;
+    }
+    if (printer === 'doodle3d_printer' && !validateIp(ip)) {
+      this.setState(update(this.state, { managePrinter: { error: { $set: 'Please enter a valid IP adress' } } }));
+      return;
+    }
+
     const localStorage = update(this.state.localStorage, {
       printers: {
         [active]: {
           name: { $set: name },
+          ip: { $set: ip },
           settings: {
             printer: { $set: printer }
           }
@@ -288,7 +303,7 @@ class Settings extends React.Component {
 
   closeAddPrinterDialog = () => this.setAddPrinterDialog(false);
   openAddPrinterDialog = () => this.setAddPrinterDialog(true);
-  setAddPrinterDialog = (open) => this.setState({ addPrinter: { name: '', printer: '', error: null, open } });
+  setAddPrinterDialog = (open) => this.setState({ addPrinter: { ip: '', name: '', printer: '', error: null, open } });
 
   closeManagePrinterDialog = () => this.setManagePrinterDialog(false);
   openManagePrinterDialog = () => this.setManagePrinterDialog(true);
@@ -299,7 +314,9 @@ class Settings extends React.Component {
       managePrinter: {
         open,
         name: printers[active].name,
-        printer: printers[active].settings.printer
+        ip: printers[active].ip,
+        printer: printers[active].settings.printer,
+        error: null
       }
     });
   }
@@ -415,6 +432,7 @@ class Settings extends React.Component {
             ))}
           </SelectField>
           <TextField name="addPrinter.name" floatingLabelText="Name" fullWidth />
+          {(addPrinter.printer === 'doodle3d_printer') && <TextField name="addPrinter.ip" floatingLabelText="IP Adress" fullWidth />}
           {addPrinter.error && <p className={classes.error}>{addPrinter.error}</p>}
         </Dialog>
         <Dialog
@@ -444,6 +462,8 @@ class Settings extends React.Component {
             ))}
           </SelectField>
           <TextField name="managePrinter.name" floatingLabelText="Name" fullWidth />
+          {(managePrinter.printer === 'doodle3d_printer') && <TextField name="managePrinter.ip" floatingLabelText="IP Adress" fullWidth />}
+          {managePrinter.error && <p className={classes.error}>{managePrinter.error}</p>}
         </Dialog>
       </div>
     );
diff --git a/test.js b/test.js
new file mode 100644
index 0000000..d448d41
--- /dev/null
+++ b/test.js
@@ -0,0 +1,122 @@
+import 'babel-polyfill'
+import React from 'react';
+import { render } from 'react-dom';
+import injectTapEventPlugin from 'react-tap-event-plugin';
+// import './fetch.js';
+
+injectTapEventPlugin();
+
+const IP = 'http://10.0.0.109';
+const DEFAULT_GCODE = `; Generated with Doodle3D Slicer V0.0.18
+G28
+G1 X30 Y30
+G1 X90 Y30
+G1 X30 Y30
+G1 X90 Y30
+G1 X30 Y30
+G1 X90 Y30
+G1 X30 Y30
+G1 X90 Y30
+G1 X30 Y30
+G1 X90 Y30
+G1 X30 Y30
+G1 X90 Y30
+; test
+`;
+
+const CIRCLE = `; Generated with Doodle3D Slicer V0.0.18
+G28
+G1 X50 Y70
+G1 X56.180339887498945 Y69.02113032590307
+G1 X61.75570504584947 Y66.18033988749895
+G1 X66.18033988749895 Y61.75570504584947
+G1 X69.02113032590307 Y56.180339887498945
+G1 X70 Y50
+G1 X69.02113032590307 Y43.819660112501055
+G1 X66.18033988749895 Y38.24429495415054
+G1 X61.75570504584947 Y33.819660112501055
+G1 X56.18033988749895 Y30.97886967409693
+G1 X50 Y30
+G1 X43.819660112501055 Y30.978869674096927
+G1 X38.24429495415054 Y33.819660112501055
+G1 X33.819660112501055 Y38.24429495415053
+G1 X30.97886967409693 Y43.81966011250105
+G1 X30 Y49.99999999999999
+G1 X30.978869674096927 Y56.180339887498945
+G1 X33.81966011250105 Y61.75570504584946
+G1 X38.24429495415053 Y66.18033988749895
+G1 X43.81966011250105 Y69.02113032590307
+; test
+`;
+
+// export function fetch(url, data = {}, onProgress) {
+//   return new Promise((resolve, reject) => {
+//     const request = new Request(url, data);
+//     const xhr = new XMLHttpRequest();
+//
+//     xhr.onload = () => {
+//       const { status, statusText, responseURL: url } = xhr;
+//       resolve(new Response(xhr.response, { status, statusText, url }));
+//     }
+//     xhr.onerror = () => reject(new TypeError('Network request failed'));
+//     xhr.ontimeout = () => reject(new TypeError('Network request failed'));
+//
+//     xhr.open(request.method, url);
+//
+//     if (request.credentials === 'include') {
+//       xhr.withCredentials = true
+//     } else if (request.credentials === 'omit') {
+//       xhr.withCredentials = false
+//     }
+//     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
+//     if (xhr.responseType) xhr.responseType = 'blob';
+//
+//     request.headers.forEach((value, name) => {
+//       xhr.setRequestHeader(name, value)
+//     });
+//
+//     xhr.send(data.body);
+//   });
+// }
+
+class Print extends React.Component {
+  home = () => fetch(`${IP}/set?code=G28`, { method: 'GET', mode: 'no-cors' });
+  status = () => fetch(`${IP}/inquiry`, { method: 'GET', mode: 'no-cors' })
+    .then(response => response.text())
+    .then(result => console.log('result: ', result));
+  start = () => fetch(`${IP}/set?code=M565`, { method: 'GET', mode: 'no-cors' });
+  stop = () => fetch(`${IP}/set?cmd={P:X}`, { method: 'GET', mode: 'no-cors' });
+  upload = async () => {
+    const gcode = this.refs.gcode.value;
+
+    const headers = new Headers();
+    headers.append('Content-Disposition', 'form-data; name="file"; filename="doodle.gcode"');
+    headers.append('Content-Type', 'application/octet-stream');
+    headers.append('Accept', 'application/json');
+
+    const body = new FormData();
+    const file = new File([gcode], 'doodle.gcode', { type: 'application/octet-stream' });
+    body.append('file', file);
+
+    const result = await fetch(`${IP}/upload`, { method: 'POST', mode: 'no-cors', headers, body });
+  };
+
+  render() {
+    return (
+      <span>
+        <button onTouchTap={this.home} type="button">Home</button>
+        <button onTouchTap={this.status} type="button">Status</button>
+        <button onTouchTap={this.start} type="button">Start</button>
+        <button onTouchTap={this.stop} type="button">Stop</button>
+        <div>
+          <textarea ref="gcode" cols="80" rows="20" defaultValue={CIRCLE} />
+          <button onTouchTap={this.upload} type="button">Upload</button>
+        </div>
+      </span>
+    );
+  }
+}
+
+render((
+  <Print />
+), document.getElementById('app'));

From e384c74f8e6c801147b957b89ba43a675bba8b43 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 23 Jan 2018 12:36:05 +0100
Subject: [PATCH 057/163] fix typo

---
 src/interface/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index d28b5ee..ee61bad 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -208,7 +208,7 @@ class Settings extends React.Component {
       ...defaultSettings,
       printer,
       material,
-      quality
+      quality,
       ip
     };
 

From 67981872aaf0d2f109a61b51df8c2a2dbe036a66 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 23 Jan 2018 16:35:04 +0100
Subject: [PATCH 058/163] implement print to malyan

---
 src/interface/index.js | 11 +++++++++--
 src/interface/utils.js | 29 +++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 47f8bff..7f8f9b2 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -209,6 +209,13 @@ class Interface extends React.Component {
     const { name } = this.props;
 
     if (isSlicing) return;
+    if (!settings) {
+      this.setState({ error: 'please select a printer first' });
+    }
+    if (target === 'WIFI' && !settings.ip) {
+      this.setState({ error: 'please connect to a WiFi enabled printer' });
+      return;
+    }
     if (!mesh) {
       this.setState({ error: 'there is no file to slice' });
       return;
@@ -311,7 +318,7 @@ class Interface extends React.Component {
 
   render() {
     const { classes, onCancel } = this.props;
-    const { isSlicing, progress, showFullScreen, error, objectDimensions, openUrlDialog } = this.state;
+    const { isSlicing, progress, showFullScreen, error, objectDimensions, openUrlDialog, settings } = this.state;
 
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
 
@@ -349,7 +356,7 @@ class Interface extends React.Component {
               onRequestClose={this.closePopover}
             >
             <Menu>
-              <MenuItem primaryText="Send over WiFi" onTouchTap={() => this.slice('WIFI')} />
+              <MenuItem disabled={!Boolean(settings && settings.ip)} primaryText="Send over WiFi" onTouchTap={() => this.slice('WIFI')} />
               <MenuItem primaryText="Download GCode" onTouchTap={() => this.slice('DOWNLOAD')} />
             </Menu>
             </Popover>
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 3dd601e..915e0ea 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -106,9 +106,10 @@ export function fetchProgress(url, data = {}, onProgress) {
     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
     if (xhr.responseType) xhr.responseType = 'blob';
 
-    request.headers.forEach((value, name) => {
-      xhr.setRequestHeader(name, value)
-    });
+    // Malyan printer doesn't like headers...
+    // request.headers.forEach((value, name) => {
+    //   xhr.setRequestHeader(name, value)
+    // });
 
     xhr.send(data.body);
   });
@@ -118,8 +119,6 @@ const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
 const CONNECT_URL = 'http://connect.doodle3d.com/';
 
 export async function slice(target, name, mesh, settings, updateProgress) {
-  if (!settings) throw { message: 'please select a printer first', code: 0 };
-
   let steps;
   let currentStep = 0;
   switch (target) {
@@ -127,6 +126,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       steps = 1;
       break;
     case 'WIFI':
+    case 'DOODLE3D-WIFI-BOX':
       steps = 2;
       break;
     default:
@@ -151,12 +151,29 @@ export async function slice(target, name, mesh, settings, updateProgress) {
 
   switch (target) {
     case 'DOWNLOAD': {
-      const blob = new File([gcode], `${name}.gcode`, { type: 'text/plain;charset=utf-8' });
+      const blob = new File([gcode], `${name}.gcode`, { type: 'text/plain' });
       fileSaver.saveAs(blob);
       break;
     }
 
     case 'WIFI': {
+      const body = new FormData();
+      const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
+      body.append('file', file);
+
+      await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progess) => {
+        updateProgress({
+          action: 'Uploading',
+          percentage: currentStep / steps + progess.loaded / progess.total / steps
+        });
+      });
+      currentStep ++;
+      await fetchProgress(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET' });
+      await fetchProgress(`http://${settings.ip}/set?code=M565`, { method: 'GET' });
+      break;
+    }
+
+    case 'DOODLE3D-WIFI-BOX': {
       // upload G-code file to AWS S3
       const { data: { reservation, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
         .then(response => response.json());

From 5d49ee0c74307701defb4a1b54e199420a361b33 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 23 Jan 2018 16:58:28 +0100
Subject: [PATCH 059/163] send code "M563 S4" before uploading

---
 src/interface/utils.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 915e0ea..8f9b381 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -161,10 +161,11 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
       body.append('file', file);
 
-      await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progess) => {
+      await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
+      await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progress) => {
         updateProgress({
           action: 'Uploading',
-          percentage: currentStep / steps + progess.loaded / progess.total / steps
+          percentage: currentStep / steps + progress.loaded / progress.total / steps
         });
       });
       currentStep ++;
@@ -193,10 +194,10 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       }).trim()}\n${gcode}`;
       body.append('file', file);
 
-      await fetchProgress(reservation.url, { method: 'POST', body }, (progess) => {
+      await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
         updateProgress({
           action: 'Uploading',
-          percentage: currentStep / steps + progess.loaded / progess.total / steps
+          percentage: currentStep / steps + progress.loaded / progress.total / steps
         });
       });
       currentStep ++;

From 7906bfe43d6f391e3c08977fdc32906eec7c9e22 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 12:39:34 +0100
Subject: [PATCH 060/163] remove weird code

---
 src/sliceActions/slicesToGCode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 14070b1..209ce9b 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -62,11 +62,11 @@ export default function slicesToGCode(slices, settings) {
 
           const unRetract = isOuterShell;
           const profile = isOuterShell ? profiles.outerShell : profiles.innerShell;
-          pathToGCode(outline, combing && true, gcode, shell, false, unRetract, z, profile);
+          pathToGCode(outline, combing, gcode, shell, false, unRetract, z, profile);
         }
 
-        pathToGCode(outline, combing && true, gcode, part.outerFill, false, false, z, profiles.outerInfill);
-        pathToGCode(outline, combing && true, gcode, part.innerFill, true, false, z, profiles.innerInfill);
+        pathToGCode(outline, combing, gcode, part.outerFill, false, false, z, profiles.outerInfill);
+        pathToGCode(outline, combing, gcode, part.innerFill, true, false, z, profiles.innerInfill);
       } else {
         const retract = !(slice.parts.length === 1 && typeof slice.support === 'undefined');
         pathToGCode(null, false, gcode, part.shape, retract, retract, z, profiles.outerShell);

From 5b934f0e71275ab3341f6fbe23686bbdd1e005e3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 12:39:56 +0100
Subject: [PATCH 061/163] rename infill density to density

---
 src/sliceActions/generateInfills.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index 6d854aa..fd04edc 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -5,7 +5,7 @@ import Shape from 'clipper-js';
 export default function generateInfills(slices, settings) {
   let {
     layerHeight,
-    innerInfill: { density: infillDensity },
+    innerInfill: { density },
     thickness: {
       top: topThickness,
       bottom: bottomThickness
@@ -13,11 +13,11 @@ export default function generateInfills(slices, settings) {
     nozzleDiameter
   } = settings;
 
-  infillDensity /= 100;
+  density /= 100;
   nozzleDiameter /= PRECISION;
 
-  const bidirectionalInfill = infillDensity < 0.8;
-  const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillDensity;
+  const bidirectionalInfill = density < 0.8;
+  const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / density;
 
   const bottomSkinCount = Math.ceil(bottomThickness / layerHeight);
   const topSkinCount = Math.ceil(topThickness / layerHeight);

From 88291ba5499c0759ab731160e7fe3b86938a6654 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 12:50:41 +0100
Subject: [PATCH 062/163] implement support

#33
---
 src/interface/Settings.js           | 17 +++++++
 src/settings/default.yml            |  5 +-
 src/sliceActions/generateSupport.js | 73 ++++++++---------------------
 src/sliceActions/optimizePaths.js   |  2 +-
 src/sliceActions/slicesToGCode.js   |  2 +-
 5 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index ec94401..5c7fb5e 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -166,6 +166,14 @@ class Settings extends React.Component {
       case 'settings.brim.flowRate':
       case 'settings.firstLayer.speed':
       case 'settings.firstLayer.flowRate':
+      case 'settings.support.enabled':
+      case 'settings.support.speed':
+      case 'settings.support.distanceY':
+      case 'settings.support.density':
+      case 'settings.support.minArea':
+      case 'settings.support.margin':
+      case 'settings.support.speed':
+      case 'settings.support.flowRate':
         if (!localStorage.active) return this.openAddPrinterDialog();
 
         if (value === null) {
@@ -357,6 +365,15 @@ class Settings extends React.Component {
               <NumberField name="settings.brim.size" min={0} max={20} fullWidth floatingLabelText="Size" />
               <NumberField name="settings.brim.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.brim.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
+              <p>Support</p>
+              <Checkbox name="settings.support.enabled" label="Enabled" />
+              <NumberField name="settings.support.speed" min={0.1} fullWidth floatingLabelText="Accaptance Margin" />
+              <NumberField name="settings.support.distanceY" min={0.1} fullWidth floatingLabelText="Distance Y" />
+              <NumberField name="settings.support.density" min={0} max={100} fullWidth floatingLabelText="Density" />
+              <NumberField name="settings.support.margin" min={0.1} fullWidth floatingLabelText="Margin" />
+              <NumberField name="settings.support.minArea" min={1} fullWidth floatingLabelText="Min Area" />
+              <NumberField name="settings.support.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
+              <NumberField name="settings.support.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>First layer</p>
               <NumberField name="settings.firstLayer.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
               <NumberField name="settings.firstLayer.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
diff --git a/src/settings/default.yml b/src/settings/default.yml
index b3c42ec..d38ba24 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -22,11 +22,10 @@ travel:
   speed: 200.0
 support:
   enabled: false
-  acceptanceMargin: 1.5
+  minArea: 2
   distanceY: 0.4
-  gridSize: 6.0
+  density: 5.0
   margin: 2.0
-  plateSize: 4.0
   flowRate: 0.8
   speed: 40.0
 innerShell:
diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 8e9e0c3..3f1f767 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -7,70 +7,37 @@ export default function generateSupport(slices, settings) {
 
   let {
     layerHeight,
-    support: {
-      gridSize: supportGridSize,
-      margin: supportMargin,
-      plateSize: plateSize,
-      distanceY: supportDistanceY
-    },
+    support: { density, margin, minArea, distanceY },
     nozzleDiameter
   } = settings;
 
-  supportGridSize /= PRECISION;
-  supportMargin /= PRECISION;
-  plateSize /= PRECISION;
+  density /= 100;
+  margin /= PRECISION;
   nozzleDiameter /= PRECISION;
-  var supportDistanceLayers = Math.max(Math.ceil(supportDistanceY / layerHeight), 1);
 
-  var supportAreas = new Shape([], true);
+  const bidirectionalInfill = density < 0.8;
+  const infillGridSize = nozzleDiameter *  2 / density;
+  const supportDistanceLayers = Math.max(Math.ceil(distanceY / layerHeight), 1);
 
-  for (var layer = slices.length - 1 - supportDistanceLayers; layer >= 0; layer --) {
-    var currentSlice = slices[layer];
+  let supportArea = new Shape([], true);
 
-    if (supportAreas.length > 0) {
+  for (let layer = slices.length - 1 - supportDistanceLayers; layer >= supportDistanceLayers; layer --) {
+    const currentLayer = slices[layer + supportDistanceLayers - 1];
+    const upSkin = slices[layer + supportDistanceLayers];
+    const downSkin = slices[layer - supportDistanceLayers];
 
-      if (layer >= supportDistanceLayers) {
-        var sliceSkin = slices[layer - supportDistanceLayers].outline;
-        sliceSkin = sliceSkin;
+    const neededSupportArea = upSkin.outline.difference(currentLayer.outline.offset(margin));
 
-        var supportAreasSlimmed = supportAreas.difference(sliceSkin.offset(supportMargin));
-        if (supportAreasSlimmed.area() < 100.0) {
-          supportAreas = supportAreas.difference(sliceSkin);
-        }
-        else {
-          supportAreas = supportAreasSlimmed;
-        }
-      }
-
-      var supportTemplate = getFillTemplate(supportAreas.bounds(), supportGridSize, true, true);
-      var supportFill = supportTemplate.intersect(supportAreas);
-      if (supportFill.length === 0) {
-        currentSlice.support = supportAreas.clone();
-      }
-      else {
-        currentSlice.support = supportFill;
-      }
+    if (neededSupportArea.totalArea() * Math.pow(PRECISION, 2) > minArea) {
+      supportArea = supportArea.union(neededSupportArea);
     }
+    if (downSkin) supportArea = supportArea.difference(downSkin.outline.offset(margin));
 
-    var supportSkin = slices[layer + supportDistanceLayers - 1].outline;
+    const even = (layer % 2 === 0);
+    const bounds = supportArea.shapeBounds();
+    const innerFillTemplate = getFillTemplate(bounds, infillGridSize, bidirectionalInfill || even, bidirectionalInfill || !even);
 
-    var slice = slices[layer + supportDistanceLayers];
-    for (var i = 0; i < slice.parts.length; i ++) {
-      var slicePart = slice.parts[i];
-
-      if (slicePart.intersect.closed) {
-        var outerLine = slicePart.outerLine;
-      }
-      else {
-        var outerLine = slicePart.intersect.offset(supportMargin);
-      }
-
-      var overlap = supportSkin.offset(supportMargin).intersect(outerLine);
-      var overhang = outerLine.difference(overlap);
-
-      if (overlap.length === 0 || overhang.length > 0) {
-        supportAreas = supportAreas.join(overhang);
-      }
-    }
+    slices[layer].support = supportArea.clone().join(supportArea.intersect(innerFillTemplate));
+    slices[layer].supportOutline = supportArea;
   }
 }
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 18043ef..cde3fb3 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -74,7 +74,7 @@ export default function optimizePaths(slices, settings) {
 
     slice.parts = parts;
 
-    if (typeof slice.support !== 'undefined' && slice.support.length > 0) {
+    if (typeof slice.support !== 'undefined' && slice.support.paths.length > 0) {
       slice.support = optimizeShape(slice.support, start);
       start.copy(slice.support.lastPoint(true));
     }
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 209ce9b..e794499 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -74,7 +74,7 @@ export default function slicesToGCode(slices, settings) {
     }
 
     if (typeof slice.support !== 'undefined') {
-      pathToGCode(null, false, gcode, slice.support, true, true, z, profiles.support);
+      pathToGCode(slice.supportOutline, combing, gcode, slice.support, true, true, z, profiles.support);
     }
   }
 

From 70aa39d89f351a37a90cc9f96497b66f4160dbc5 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 13:59:39 +0100
Subject: [PATCH 063/163] support infill is always bidirectional

---
 src/sliceActions/generateSupport.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 3f1f767..76181de 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -15,7 +15,6 @@ export default function generateSupport(slices, settings) {
   margin /= PRECISION;
   nozzleDiameter /= PRECISION;
 
-  const bidirectionalInfill = density < 0.8;
   const infillGridSize = nozzleDiameter *  2 / density;
   const supportDistanceLayers = Math.max(Math.ceil(distanceY / layerHeight), 1);
 
@@ -33,9 +32,8 @@ export default function generateSupport(slices, settings) {
     }
     if (downSkin) supportArea = supportArea.difference(downSkin.outline.offset(margin));
 
-    const even = (layer % 2 === 0);
     const bounds = supportArea.shapeBounds();
-    const innerFillTemplate = getFillTemplate(bounds, infillGridSize, bidirectionalInfill || even, bidirectionalInfill || !even);
+    const innerFillTemplate = getFillTemplate(bounds, infillGridSize, true, true);
 
     slices[layer].support = supportArea.clone().join(supportArea.intersect(innerFillTemplate));
     slices[layer].supportOutline = supportArea;

From 5cef2777fbf0cf386a5d3c82f42c5af9d239534a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 14:00:49 +0100
Subject: [PATCH 064/163] save precision squared in const

---
 src/sliceActions/generateSupport.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 76181de..2c8393b 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -2,6 +2,8 @@ import getFillTemplate from './getFillTemplate.js';
 import Shape from 'clipper-js';
 import { PRECISION } from '../constants.js';
 
+const PRECISION_SQUARED = Math.pow(PRECISION, 2);
+
 export default function generateSupport(slices, settings) {
   if (!settings.support.enabled) return;
 
@@ -27,7 +29,7 @@ export default function generateSupport(slices, settings) {
 
     const neededSupportArea = upSkin.outline.difference(currentLayer.outline.offset(margin));
 
-    if (neededSupportArea.totalArea() * Math.pow(PRECISION, 2) > minArea) {
+    if (neededSupportArea.totalArea() * PRECISION_SQUARED > minArea) {
       supportArea = supportArea.union(neededSupportArea);
     }
     if (downSkin) supportArea = supportArea.difference(downSkin.outline.offset(margin));

From de2acfe6be0c1b6e776742dfedc9503d786db8c5 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 16:03:44 +0100
Subject: [PATCH 065/163] Add malyan controls

not styled yet
---
 src/interface/MalyanControl.js |  61 +++++++++++++++++
 src/interface/index.js         |   2 +
 src/interface/utils.js         |  32 ++++++++-
 test.js                        | 122 ---------------------------------
 4 files changed, 94 insertions(+), 123 deletions(-)
 create mode 100644 src/interface/MalyanControl.js
 delete mode 100644 test.js

diff --git a/src/interface/MalyanControl.js b/src/interface/MalyanControl.js
new file mode 100644
index 0000000..fd5f6e4
--- /dev/null
+++ b/src/interface/MalyanControl.js
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'proptypes';
+import muiThemeable from 'material-ui/styles/muiThemeable';
+import injectSheet from 'react-jss';
+import FlatButton from 'material-ui/FlatButton';
+import { sleep, getMalyanStatus } from './utils.js';
+
+const styles = {
+
+};
+
+class MalyanControl extends React.Component {
+  static propTypes = {
+    ip: PropTypes.string.isRequired
+  };
+
+  state = {
+    status: null,
+    mounted: true
+  };
+
+  componentDidMount = async () => {
+    const { ip } = this.props;
+    while (this.state.mounted) {
+      const status = await getMalyanStatus(ip).catch(() => null);
+      this.setState({ status });
+      await sleep(1000);
+    }
+  };
+
+  home = () => {
+    const { ip } = this.props;
+    fetch(`http://${ip}/set?code=G28`, { method: 'GET' });
+  };
+
+  stop = () => {
+    const { ip } = this.props;
+    fetch(`http://${ip}/set?cmd={P:X}`, { method: 'GET' });
+  };
+
+  componentWillUnmount() {
+    this.setState({ mounted: false });
+  }
+
+  render() {
+    const { status } = this.state;
+    return (
+      <div>
+        {status && <span>
+          <p>Nozzle temperature: {status.nozzleTemperature}/{status.nozzleTargetTemperature}</p>
+          <p>Bed temperature: {status.bedTemperature}/{status.bedTargetTemperature}</p>
+          {status.state === 'printing' && <p>Progress: {status.progress}%</p>}
+        </span>}
+        <FlatButton label="Stop" onTouchTap={this.stop} />
+        <FlatButton label="Home" onTouchTap={this.home} />
+      </div>
+    );
+  }
+}
+
+export default muiThemeable()(injectSheet(styles)(MalyanControl));
diff --git a/src/interface/index.js b/src/interface/index.js
index 7f8f9b2..37e4d36 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -14,6 +14,7 @@ import Menu from 'material-ui/Menu';
 import MenuItem from 'material-ui/MenuItem';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Settings from './Settings.js';
+import MalyanControl from './MalyanControl.js';
 import ReactResizeDetector from 'react-resize-detector';
 import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
@@ -334,6 +335,7 @@ class Interface extends React.Component {
             {isSlicing && <p>{progress.action}</p>}
             {isSlicing && <LinearProgress mode="determinate" value={progress.percentage * 100.0} />}
           </div>
+          {settings && settings.printer === 'doodle3d_printer' && <MalyanControl ip={settings.ip} />}
           <div className={classes.sliceButtons}>
             {onCancel && <RaisedButton
               label="Cancel"
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 8f9b381..53f2c4c 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -115,6 +115,32 @@ export function fetchProgress(url, data = {}, onProgress) {
   });
 }
 
+export function getMalyanStatus(ip) {
+  return fetch(`http://${ip}/inquiry`, { method: 'GET' })
+    .then(response => response.text())
+    .then(statusText => {
+      const [nozzleTemperature, nozzleTargetTemperature, bedTemperature, bedTargetTemperature, progress] = statusText.match(/\d+/g);
+      const status = { nozzleTemperature, nozzleTargetTemperature, bedTemperature, bedTargetTemperature, progress };
+
+      switch (statusText.charAt(statusText.length - 1)) {
+        case 'I':
+          status.state = 'idle';
+          break;
+        case 'P':
+          status.state = 'printing';
+          break;
+        default:
+          status.state = 'unknown';
+          break;
+      }
+      return status;
+    })
+}
+
+export function sleep(time) {
+  return new Promise(resolve => setTimeout(resolve, time));
+}
+
 const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
 const CONNECT_URL = 'http://connect.doodle3d.com/';
 
@@ -127,6 +153,10 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       break;
     case 'WIFI':
     case 'DOODLE3D-WIFI-BOX':
+      if (settings.printer === 'doodle3d_printer') {
+        const { state } = await getMalyanStatus(settings.ip);
+        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 1 };
+      }
       steps = 2;
       break;
     default:
@@ -161,7 +191,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
       body.append('file', file);
 
-      await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
+      // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
       await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progress) => {
         updateProgress({
           action: 'Uploading',
diff --git a/test.js b/test.js
deleted file mode 100644
index d448d41..0000000
--- a/test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import 'babel-polyfill'
-import React from 'react';
-import { render } from 'react-dom';
-import injectTapEventPlugin from 'react-tap-event-plugin';
-// import './fetch.js';
-
-injectTapEventPlugin();
-
-const IP = 'http://10.0.0.109';
-const DEFAULT_GCODE = `; Generated with Doodle3D Slicer V0.0.18
-G28
-G1 X30 Y30
-G1 X90 Y30
-G1 X30 Y30
-G1 X90 Y30
-G1 X30 Y30
-G1 X90 Y30
-G1 X30 Y30
-G1 X90 Y30
-G1 X30 Y30
-G1 X90 Y30
-G1 X30 Y30
-G1 X90 Y30
-; test
-`;
-
-const CIRCLE = `; Generated with Doodle3D Slicer V0.0.18
-G28
-G1 X50 Y70
-G1 X56.180339887498945 Y69.02113032590307
-G1 X61.75570504584947 Y66.18033988749895
-G1 X66.18033988749895 Y61.75570504584947
-G1 X69.02113032590307 Y56.180339887498945
-G1 X70 Y50
-G1 X69.02113032590307 Y43.819660112501055
-G1 X66.18033988749895 Y38.24429495415054
-G1 X61.75570504584947 Y33.819660112501055
-G1 X56.18033988749895 Y30.97886967409693
-G1 X50 Y30
-G1 X43.819660112501055 Y30.978869674096927
-G1 X38.24429495415054 Y33.819660112501055
-G1 X33.819660112501055 Y38.24429495415053
-G1 X30.97886967409693 Y43.81966011250105
-G1 X30 Y49.99999999999999
-G1 X30.978869674096927 Y56.180339887498945
-G1 X33.81966011250105 Y61.75570504584946
-G1 X38.24429495415053 Y66.18033988749895
-G1 X43.81966011250105 Y69.02113032590307
-; test
-`;
-
-// export function fetch(url, data = {}, onProgress) {
-//   return new Promise((resolve, reject) => {
-//     const request = new Request(url, data);
-//     const xhr = new XMLHttpRequest();
-//
-//     xhr.onload = () => {
-//       const { status, statusText, responseURL: url } = xhr;
-//       resolve(new Response(xhr.response, { status, statusText, url }));
-//     }
-//     xhr.onerror = () => reject(new TypeError('Network request failed'));
-//     xhr.ontimeout = () => reject(new TypeError('Network request failed'));
-//
-//     xhr.open(request.method, url);
-//
-//     if (request.credentials === 'include') {
-//       xhr.withCredentials = true
-//     } else if (request.credentials === 'omit') {
-//       xhr.withCredentials = false
-//     }
-//     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
-//     if (xhr.responseType) xhr.responseType = 'blob';
-//
-//     request.headers.forEach((value, name) => {
-//       xhr.setRequestHeader(name, value)
-//     });
-//
-//     xhr.send(data.body);
-//   });
-// }
-
-class Print extends React.Component {
-  home = () => fetch(`${IP}/set?code=G28`, { method: 'GET', mode: 'no-cors' });
-  status = () => fetch(`${IP}/inquiry`, { method: 'GET', mode: 'no-cors' })
-    .then(response => response.text())
-    .then(result => console.log('result: ', result));
-  start = () => fetch(`${IP}/set?code=M565`, { method: 'GET', mode: 'no-cors' });
-  stop = () => fetch(`${IP}/set?cmd={P:X}`, { method: 'GET', mode: 'no-cors' });
-  upload = async () => {
-    const gcode = this.refs.gcode.value;
-
-    const headers = new Headers();
-    headers.append('Content-Disposition', 'form-data; name="file"; filename="doodle.gcode"');
-    headers.append('Content-Type', 'application/octet-stream');
-    headers.append('Accept', 'application/json');
-
-    const body = new FormData();
-    const file = new File([gcode], 'doodle.gcode', { type: 'application/octet-stream' });
-    body.append('file', file);
-
-    const result = await fetch(`${IP}/upload`, { method: 'POST', mode: 'no-cors', headers, body });
-  };
-
-  render() {
-    return (
-      <span>
-        <button onTouchTap={this.home} type="button">Home</button>
-        <button onTouchTap={this.status} type="button">Status</button>
-        <button onTouchTap={this.start} type="button">Start</button>
-        <button onTouchTap={this.stop} type="button">Stop</button>
-        <div>
-          <textarea ref="gcode" cols="80" rows="20" defaultValue={CIRCLE} />
-          <button onTouchTap={this.upload} type="button">Upload</button>
-        </div>
-      </span>
-    );
-  }
-}
-
-render((
-  <Print />
-), document.getElementById('app'));

From 56929c6af749f6af004f237c21aabe877e875939 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 24 Jan 2018 16:06:39 +0100
Subject: [PATCH 066/163] concat doodle3d printer and the doodle3d wifi box
 into one target

---
 src/interface/utils.js | 87 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 44 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 53f2c4c..470b227 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -152,7 +152,6 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       steps = 1;
       break;
     case 'WIFI':
-    case 'DOODLE3D-WIFI-BOX':
       if (settings.printer === 'doodle3d_printer') {
         const { state } = await getMalyanStatus(settings.ip);
         if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 1 };
@@ -187,54 +186,54 @@ export async function slice(target, name, mesh, settings, updateProgress) {
     }
 
     case 'WIFI': {
-      const body = new FormData();
-      const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
-      body.append('file', file);
+      if (settings.printer === 'doodle3d_printer') {
+        const body = new FormData();
+        const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
+        body.append('file', file);
 
-      // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
-      await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progress) => {
-        updateProgress({
-          action: 'Uploading',
-          percentage: currentStep / steps + progress.loaded / progress.total / steps
+        // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
+        await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progress) => {
+          updateProgress({
+            action: 'Uploading',
+            percentage: currentStep / steps + progress.loaded / progress.total / steps
+          });
         });
-      });
-      currentStep ++;
-      await fetchProgress(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET' });
-      await fetchProgress(`http://${settings.ip}/set?code=M565`, { method: 'GET' });
-      break;
-    }
+        await fetchProgress(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET' });
+        await fetchProgress(`http://${settings.ip}/set?code=M565`, { method: 'GET' });
 
-    case 'DOODLE3D-WIFI-BOX': {
-      // upload G-code file to AWS S3
-      const { data: { reservation, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
-        .then(response => response.json());
+        currentStep ++;
+      } else {
+        // upload G-code file to AWS S3
+        const { data: { reservation, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
+          .then(response => response.json());
 
-      const body = new FormData();
-      const { fields } = reservation;
-      for (const key in fields) {
-        body.append(key, fields[key]);
+        const body = new FormData();
+        const { fields } = reservation;
+        for (const key in fields) {
+          body.append(key, fields[key]);
+        }
+
+        const file = `;${JSON.stringify({
+          ...settings,
+          name: `${name}.gcode`,
+          printer: { type: settings.printers, title: printerSettings[settings.printer].title },
+          material: { type: settings.material, title: materialSettings[settings.material].title },
+          quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
+        }).trim()}\n${gcode}`;
+        body.append('file', file);
+
+        await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
+          updateProgress({
+            action: 'Uploading',
+            percentage: currentStep / steps + progress.loaded / progress.total / steps
+          });
+        });
+        currentStep ++;
+
+        const url = `${CONNECT_URL}?uuid=${id}`;
+        const popup = window.open(url, '_blank');
+        if (!popup) throw { message: 'popup was blocked by browser', code: 3, url };
       }
-
-      const file = `;${JSON.stringify({
-        ...settings,
-        name: `${name}.gcode`,
-        printer: { type: settings.printers, title: printerSettings[settings.printer].title },
-        material: { type: settings.material, title: materialSettings[settings.material].title },
-        quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
-      }).trim()}\n${gcode}`;
-      body.append('file', file);
-
-      await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
-        updateProgress({
-          action: 'Uploading',
-          percentage: currentStep / steps + progress.loaded / progress.total / steps
-        });
-      });
-      currentStep ++;
-
-      const url = `${CONNECT_URL}?uuid=${id}`;
-      const popup = window.open(url, '_blank');
-      if (!popup) throw { message: 'popup was blocked by browser', code: 3, url };
       break;
     }
 

From e09ed8012c5cfccb60dada26a61ba1d35abc3ada Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 12:12:47 +0100
Subject: [PATCH 067/163] use fetch no-cors mode to make form posts to malyan

so we can upload from cross origin
because fetch has no progress we fake malyan upload progress by
updating 20kb every second

@companje
---
 src/interface/MalyanControl.js | 20 ++++++++++----------
 src/interface/utils.js         | 24 +++++++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/interface/MalyanControl.js b/src/interface/MalyanControl.js
index fd5f6e4..d3c8dfe 100644
--- a/src/interface/MalyanControl.js
+++ b/src/interface/MalyanControl.js
@@ -19,23 +19,23 @@ class MalyanControl extends React.Component {
     mounted: true
   };
 
-  componentDidMount = async () => {
-    const { ip } = this.props;
-    while (this.state.mounted) {
-      const status = await getMalyanStatus(ip).catch(() => null);
-      this.setState({ status });
-      await sleep(1000);
-    }
-  };
+  // componentDidMount = async () => {
+  //   const { ip } = this.props;
+  //   while (this.state.mounted) {
+  //     const status = await getMalyanStatus(ip).catch(() => null);
+  //     this.setState({ status });
+  //     await sleep(1000);
+  //   }
+  // };
 
   home = () => {
     const { ip } = this.props;
-    fetch(`http://${ip}/set?code=G28`, { method: 'GET' });
+    fetch(`http://${ip}/set?code=G28`, { method: 'GET', mode: 'no-cors' });
   };
 
   stop = () => {
     const { ip } = this.props;
-    fetch(`http://${ip}/set?cmd={P:X}`, { method: 'GET' });
+    fetch(`http://${ip}/set?cmd={P:X}`, { method: 'GET', mode: 'no-cors' });
   };
 
   componentWillUnmount() {
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 470b227..00ac588 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -152,10 +152,10 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       steps = 1;
       break;
     case 'WIFI':
-      if (settings.printer === 'doodle3d_printer') {
-        const { state } = await getMalyanStatus(settings.ip);
-        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 1 };
-      }
+      // if (settings.printer === 'doodle3d_printer') {
+      //   const { state } = await getMalyanStatus(settings.ip);
+      //   if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 1 };
+      // }
       steps = 2;
       break;
     default:
@@ -191,15 +191,25 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
         body.append('file', file);
 
+        let loaded = 0;
+        const interval = setInterval(() => {
+          loaded += 15 * 1024;
+          updateProgress({
+            action: 'Uploading',
+            percentage: (currentStep + loaded / file.size) / steps
+          });
+        }, 1000);
+
         // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
-        await fetchProgress(`http://${settings.ip}/upload`, { method: 'POST', body }, (progress) => {
+        await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => {
           updateProgress({
             action: 'Uploading',
             percentage: currentStep / steps + progress.loaded / progress.total / steps
           });
         });
-        await fetchProgress(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET' });
-        await fetchProgress(`http://${settings.ip}/set?code=M565`, { method: 'GET' });
+        clearInterval(interval);
+        await fetch(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET', mode: 'no-cors' });
+        await fetch(`http://${settings.ip}/set?code=M565`, { method: 'GET', mode: 'no-cors' });
 
         currentStep ++;
       } else {

From e091f425a1d14bbf73147e5ecc1f8e93bef4b55d Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 12:13:11 +0100
Subject: [PATCH 068/163] simplify progress updating

by @companje
---
 src/interface/utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 00ac588..fb3d72f 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -171,7 +171,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
   const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
     updateProgress({
       action: progress.action,
-      percentage: currentStep / steps + progress.done / progress.total / steps
+      percentage: (currentStep + progress.done / progress.total) / steps
     });
   }).catch(error => {
     throw { message: `error during slicing: ${error.message}`, code: 2 };
@@ -204,7 +204,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => {
           updateProgress({
             action: 'Uploading',
-            percentage: currentStep / steps + progress.loaded / progress.total / steps
+            percentage: (currentStep + progress.loaded / progress.total) / steps
           });
         });
         clearInterval(interval);
@@ -235,7 +235,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
           updateProgress({
             action: 'Uploading',
-            percentage: currentStep / steps + progress.loaded / progress.total / steps
+            percentage: (currentStep + progress.loaded / progress.total) / steps
           });
         });
         currentStep ++;

From 109cd0898ca513909bfa6888016f1450a3eae139 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 12:17:14 +0100
Subject: [PATCH 069/163] move malyan controls next to print button

---
 src/interface/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 37e4d36..3dfd8ee 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -335,13 +335,13 @@ class Interface extends React.Component {
             {isSlicing && <p>{progress.action}</p>}
             {isSlicing && <LinearProgress mode="determinate" value={progress.percentage * 100.0} />}
           </div>
-          {settings && settings.printer === 'doodle3d_printer' && <MalyanControl ip={settings.ip} />}
           <div className={classes.sliceButtons}>
             {onCancel && <RaisedButton
               label="Cancel"
               className={`${classes.button}`}
               onTouchTap={onCancel}
             />}
+            {settings && settings.printer === 'doodle3d_printer' && <MalyanControl ip={settings.ip} />}
             <RaisedButton
               label="Print"
               ref="button"

From 0067c7a9e1fffbae1474609b281ceeaf2a97d928 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 12:17:59 +0100
Subject: [PATCH 070/163] update scripts

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 473f113..2d4bd6c 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,9 @@
   "esnext": "src/index.js",
   "scripts": {
     "start": "webpack-dev-server -w",
+    "dist": "NODE_ENV=production webpack -p",
     "prepare": "npm run build",
-    "analyze": "ANALYZE_BUNDLE=true webpack -p",
+    "analyze": "NODE_ENV=production ANALYZE_BUNDLE=true webpack -p",
     "build": "npm run build:main && npm run build:main:settings && npm run build:module && npm run build:module:settings ",
     "build:main": "BABEL_ENV=main babel src -s -d lib",
     "build:module": "BABEL_ENV=module babel src -s -d module",

From 8c3d444eed1d8ca4fe0393c2291d55f1429eb8f4 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Thu, 25 Jan 2018 17:47:36 +0100
Subject: [PATCH 071/163] design

---
 package-lock.json         |  6 +++---
 package.json              |  1 +
 src/interface/Settings.js | 12 +++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 21fcd11..7e6bc8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,6 +79,9 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
           "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+        },
+        "three-js-csg": {
+          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -7846,9 +7849,6 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
-    "three-js-csg": {
-      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
-    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/package.json b/package.json
index 2d4bd6c..5ca28fa 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "start": "webpack-dev-server -w",
     "dist": "NODE_ENV=production webpack -p",
     "prepare": "npm run build",
+    "upload": "npm run dist && scp -r dist/* doodle3d.com:/domains/doodle3d.com/print",
     "analyze": "NODE_ENV=production ANALYZE_BUNDLE=true webpack -p",
     "build": "npm run build:main && npm run build:main:settings && npm run build:module && npm run build:module:settings ",
     "build:main": "BABEL_ENV=main babel src -s -d lib",
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 9a5276c..809e8c6 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -29,14 +29,20 @@ const styles = {
     width: '100%',
     flexGrow: 1,
     overflowY: 'auto',
-    '& p, h3': {
+    '& p': {
       fontWeight: 'bold',
       margin: '30px 0 0 0'
+    },
+    '& h3': {
+      fontWeight: 'bold',
+      marginTop: '20px',
+      marginBottom: '20px',
     }
   },
   error: {
     color: red500
-  }
+  },
+  
 };
 
 const getLocalStorage = () => {
@@ -353,7 +359,7 @@ class Settings extends React.Component {
             <MenuItem key={value} value={value} primaryText={title} />
           ))}
         </SelectField>
-        <h3>Printer Setup</h3>
+        <h3>Print Setup</h3>
         <Tabs>
           <Tab buttonStyle={{ color: grey800, backgroundColor: 'white' }} label="Basic">
             <div>

From e289fd848a9537704b0fb510f634e02d29e6e077 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Thu, 25 Jan 2018 17:47:42 +0100
Subject: [PATCH 072/163] z offset

---
 src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.js b/src/constants.js
index 17803b6..f1ec128 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,4 +2,4 @@ export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
 export const MIN_AREA = 1; // holes smaller as 1mm2 get removed
-export const Z_OFFSET = 0.3;
+export const Z_OFFSET = 0.15;

From fb06bfb1356ea9855e14d3bd29fb1db6114601a3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 12:24:01 +0100
Subject: [PATCH 073/163] add comment

---
 src/interface/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index fb3d72f..3947019 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -191,6 +191,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
         body.append('file', file);
 
+        // because fetch has no way of retrieving progress we fake progress
         let loaded = 0;
         const interval = setInterval(() => {
           loaded += 15 * 1024;

From abf426c5f299e4fde0bdda5d52f1305101601d54 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 17:57:38 +0100
Subject: [PATCH 074/163] Add export to wifi box

---
 package-lock.json               | 254 +++++++++++++-------------------
 package.json                    |   1 +
 src/interface/Settings.js       |  35 ++++-
 src/interface/WifiBoxControl.js |  60 ++++++++
 src/interface/index.js          |  48 ++----
 src/interface/utils.js          |  23 ++-
 6 files changed, 218 insertions(+), 203 deletions(-)
 create mode 100644 src/interface/WifiBoxControl.js

diff --git a/package-lock.json b/package-lock.json
index 7e6bc8c..48b8998 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,8 +22,17 @@
       "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz",
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
+    "@doodle3d/doodle3d-api": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.2.tgz",
+      "integrity": "sha512-zrm6NOGkX27Rzd6Bgyjiz9GWGOh23MQAL9JncaMZQmJ55Zrf3hw9alGs0a948qcgNw/HBbqnAZFZypWqTfd5rw==",
+      "requires": {
+        "eventdispatcher.js": "0.0.2",
+        "whatwg-fetch": "2.0.3"
+      }
+    },
     "@doodle3d/doodle3d-core": {
-      "version": "github:doodle3d/doodle3d-core#36a73c233e569fca79d2059a50edb6bdb511aa58",
+      "version": "github:doodle3d/doodle3d-core#ad944024006ae63f6b7da49d663bd1ba8dacfac4",
       "requires": {
         "@doodle3d/cal": "0.0.8",
         "@doodle3d/clipper-js": "1.0.10",
@@ -44,7 +53,7 @@
         "lodash": "4.17.4",
         "memoizee": "0.3.10",
         "normalize-wheel": "1.0.1",
-        "pouchdb": "6.4.1",
+        "pouchdb": "6.4.2",
         "proptypes": "1.1.0",
         "raf": "3.4.0",
         "ramda": "0.21.0",
@@ -168,7 +177,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
       "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
-      "dev": true,
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
@@ -342,9 +350,9 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "async": {
       "version": "2.6.0",
@@ -377,9 +385,9 @@
       "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA=="
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.6.0",
@@ -1733,11 +1741,11 @@
       "dev": true
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "bowser": {
@@ -2242,11 +2250,21 @@
       }
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "requires": {
-        "boom": "2.10.1"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "crypto-browserify": {
@@ -2325,13 +2343,6 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "date-now": {
@@ -2448,6 +2459,11 @@
         "repeating": "2.0.1"
       }
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+    },
     "detect-node": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz",
@@ -3008,8 +3024,7 @@
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-      "dev": true
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
     },
     "fast-future": {
       "version": "1.0.2",
@@ -3019,8 +3034,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "faye-websocket": {
       "version": "0.10.0",
@@ -3166,9 +3180,9 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.5",
@@ -4153,13 +4167,6 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "github-from-package": {
@@ -4266,28 +4273,17 @@
       "dev": true
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        }
+        "ajv": "5.3.0",
+        "har-schema": "2.0.0"
       }
     },
     "has": {
@@ -4361,14 +4357,14 @@
       }
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.1.0"
       }
     },
     "he": {
@@ -4389,9 +4385,9 @@
       }
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
     },
     "hoist-non-react-statics": {
       "version": "1.2.0",
@@ -4599,11 +4595,11 @@
       }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
-        "assert-plus": "0.2.0",
+        "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
         "sshpk": "1.13.1"
       }
@@ -5126,16 +5122,7 @@
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "requires": {
-        "jsonify": "0.0.0"
-      }
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -5153,11 +5140,6 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5167,13 +5149,6 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "jss": {
@@ -5388,7 +5363,7 @@
         "bindings": "1.3.0",
         "fast-future": "1.0.2",
         "nan": "2.8.0",
-        "prebuild-install": "2.4.1"
+        "prebuild-install": "2.5.0"
       },
       "dependencies": {
         "nan": {
@@ -6419,9 +6394,9 @@
       "integrity": "sha1-FggOlwqud5kTdWwtrviOqnSG30E="
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "2.3.0",
@@ -6473,14 +6448,14 @@
       }
     },
     "pouchdb": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.1.tgz",
-      "integrity": "sha512-7YrhsBXbQh/iPA8O5Nzixi9QigaQJjqbbCFr+D7Kc258oeXNW9a0t/tOME1Lh84TJiFRuN9982FGVnrBrUhLiA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-6.4.2.tgz",
+      "integrity": "sha512-z4rq2lLB/wYULcVb0O5G41hv/V/RMUqDNbmgDhAvvqeyBTkCf6RLL1bMCEo+m+igM4iFfITkKVJj8gnYehh/fg==",
       "requires": {
         "argsarray": "0.0.1",
         "buffer-from": "0.1.1",
         "clone-buffer": "1.0.0",
-        "debug": "3.0.1",
+        "debug": "3.1.0",
         "double-ended-queue": "2.1.0-0",
         "immediate": "3.0.6",
         "inherits": "2.0.3",
@@ -6492,7 +6467,7 @@
         "lie": "3.1.1",
         "ltgt": "2.2.0",
         "readable-stream": "1.0.33",
-        "request": "2.80.0",
+        "request": "2.83.0",
         "spark-md5": "3.0.0",
         "through2": "2.0.3",
         "uuid": "3.2.1",
@@ -6500,9 +6475,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
-          "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "requires": {
             "ms": "2.0.0"
           }
@@ -6536,10 +6511,11 @@
       }
     },
     "prebuild-install": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.4.1.tgz",
-      "integrity": "sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.0.tgz",
+      "integrity": "sha512-3wlyZgmkeeyduOR8Ursu5gKr3yWAYObACa5aJOtt2farRRFV/+zXk/Y3wM6yQRMqmqHh+pHAwyKp5r82K699Rg==",
       "requires": {
+        "detect-libc": "1.0.3",
         "expand-template": "1.1.0",
         "github-from-package": "0.0.0",
         "minimist": "1.2.0",
@@ -6713,13 +6689,6 @@
       "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
       "requires": {
         "performance-now": "2.1.0"
-      },
-      "dependencies": {
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-        }
       }
     },
     "ramda": {
@@ -7211,43 +7180,34 @@
       }
     },
     "request": {
-      "version": "2.80.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.80.0.tgz",
-      "integrity": "sha1-jMFi1215OBze/dNQXXa4C2BYm9A=",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "requires": {
-        "aws-sign2": "0.6.0",
+        "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
         "combined-stream": "1.0.5",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
         "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.3.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
         "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.4.3",
+        "tunnel-agent": "0.6.0",
         "uuid": "3.2.1"
       },
       "dependencies": {
-        "qs": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-        },
         "uuid": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
@@ -7522,11 +7482,11 @@
       "dev": true
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "sockjs": {
@@ -7658,13 +7618,6 @@
         "getpass": "0.1.7",
         "jsbn": "0.1.1",
         "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "statuses": {
@@ -8304,13 +8257,6 @@
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
       }
     },
     "vm-browserify": {
diff --git a/package.json b/package.json
index 5ca28fa..bb46353 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@doodle3d/clipper-js": "^1.0.10",
+    "@doodle3d/doodle3d-api": "^1.0.2",
     "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 809e8c6..3eccf81 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -19,6 +19,7 @@ import qualitySettings from '../settings/quality.yml';
 import update from 'react-addons-update';
 import SettingsIcon from 'material-ui-icons/Settings';
 import validateIp from 'validate-ip';
+import { Doodle3DManager } from 'doodle3d-api';
 
 const styles = {
   textFieldRow: {
@@ -82,6 +83,7 @@ class Settings extends React.Component {
 
   state = {
     localStorage: getLocalStorage(),
+    wifiBoxes: [],
     addPrinter: {
       open: false,
       name: '',
@@ -102,6 +104,21 @@ class Settings extends React.Component {
     } else {
       this.openAddPrinterDialog();
     }
+
+    const doodle3DManager = new Doodle3DManager();
+    doodle3DManager.checkNonServerBoxes = false;
+    doodle3DManager.setAutoUpdate(true, 1000);
+
+    doodle3DManager.addEventListener('boxeschanged', ({ boxes: wifiBoxes }) => {
+      this.setState({ wifiBoxes });
+    });
+
+    this.setState({ doodle3DManager })
+  }
+
+  componentWillUnMount() {
+    const { doodle3DManager } = this.state;
+    if (doodle3DManager) doodle3DManager.setAutoUpdate(false);
   }
 
   changeSettings = (fieldName, value) => {
@@ -336,7 +353,7 @@ class Settings extends React.Component {
   }
 
   render() {
-    const { addPrinter, managePrinter, localStorage } = this.state;
+    const { addPrinter, managePrinter, localStorage, wifiBoxes } = this.state;
     const { classes, disabled } = this.props;
 
     return (
@@ -437,6 +454,7 @@ class Settings extends React.Component {
           open={addPrinter.open}
           onRequestClose={this.closeAddPrinterDialog}
           contentStyle={{ maxWidth: '400px' }}
+          autoScrollBodyContent
           actions={[
             <FlatButton
               label="Cancel"
@@ -455,7 +473,12 @@ class Settings extends React.Component {
             ))}
           </SelectField>
           <TextField name="addPrinter.name" floatingLabelText="Name" fullWidth />
-          {(addPrinter.printer === 'doodle3d_printer') && <TextField name="addPrinter.ip" floatingLabelText="IP Adress" fullWidth />}
+          {(addPrinter.printer === 'doodle3d_printer') ?
+            <TextField name="addPrinter.ip" floatingLabelText="IP Adress" fullWidth /> :
+            <SelectField name="addPrinter.ip" floatingLabelText="Doodle3D WiFi-Box" fullWidth>
+              {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
+            </SelectField>
+          }
           {addPrinter.error && <p className={classes.error}>{addPrinter.error}</p>}
         </Dialog>
         <Dialog
@@ -463,6 +486,7 @@ class Settings extends React.Component {
           open={managePrinter.open}
           onRequestClose={this.closeManagePrinterDialog}
           contentStyle={{ maxWidth: '400px' }}
+          autoScrollBodyContent
           actions={[
             <FlatButton
               label="Cancel"
@@ -485,7 +509,12 @@ class Settings extends React.Component {
             ))}
           </SelectField>
           <TextField name="managePrinter.name" floatingLabelText="Name" fullWidth />
-          {(managePrinter.printer === 'doodle3d_printer') && <TextField name="managePrinter.ip" floatingLabelText="IP Adress" fullWidth />}
+          {(managePrinter.printer === 'doodle3d_printer') ?
+            <TextField name="managePrinter.ip" floatingLabelText="IP Adress" fullWidth /> :
+            <SelectField name="managePrinter.ip" floatingLabelText="Doodle3D WiFi-Box" fullWidth>
+              {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
+            </SelectField>
+          }
           {managePrinter.error && <p className={classes.error}>{managePrinter.error}</p>}
         </Dialog>
       </div>
diff --git a/src/interface/WifiBoxControl.js b/src/interface/WifiBoxControl.js
new file mode 100644
index 0000000..ca73950
--- /dev/null
+++ b/src/interface/WifiBoxControl.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'proptypes';
+import muiThemeable from 'material-ui/styles/muiThemeable';
+import injectSheet from 'react-jss';
+import FlatButton from 'material-ui/FlatButton';
+import { sleep, getMalyanStatus } from './utils.js';
+import { Doodle3DBox } from 'doodle3d-api';
+
+const styles = {
+
+};
+
+class WifiBoxControl extends React.Component {
+  static propTypes = {
+    ip: PropTypes.string.isRequired
+  };
+
+  state = {
+    box: null,
+    status: null
+  };
+
+  componentDidMount = async () => {
+    const { ip } = this.props;
+
+    const box = new Doodle3DBox(ip);
+    window.d3dbox = box;
+    box.addEventListener('update', ({ state }) => this.setState({ status: state }));
+    box.setAutoUpdate(true, 1000);
+
+    this.setState({ box });
+
+    const alive = await box.checkAlive();
+  };
+
+  stop = async () => {
+    const { box } = this.state;
+    const result = await box.printer.stop();
+    console.log('result: ', result);
+  };
+
+  componentWillUnmount() {
+    const { box } = this.state;
+    if (box) box.setAutoUpdate(false);
+
+    this.setState({ mounted: false });
+  }
+
+  render() {
+    const { status } = this.state;
+
+    return (
+      <div>
+        <FlatButton label="Stop" onTouchTap={this.stop} />
+      </div>
+    );
+  }
+}
+
+export default muiThemeable()(injectSheet(styles)(WifiBoxControl));
diff --git a/src/interface/index.js b/src/interface/index.js
index 3dfd8ee..5d4895d 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -15,6 +15,7 @@ import MenuItem from 'material-ui/MenuItem';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Settings from './Settings.js';
 import MalyanControl from './MalyanControl.js';
+import WifiBoxControl from './WifiBoxControl.js';
 import ReactResizeDetector from 'react-resize-detector';
 import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
@@ -119,8 +120,7 @@ class Interface extends React.Component {
       error: null,
       mesh: null,
       objectDimensions: '0x0x0mm',
-      popover: { open: false, element: null },
-      openUrlDialog: { open: false, url: '' }
+      popover: { open: false, element: null }
     };
   }
 
@@ -212,6 +212,7 @@ class Interface extends React.Component {
     if (isSlicing) return;
     if (!settings) {
       this.setState({ error: 'please select a printer first' });
+      return;
     }
     if (target === 'WIFI' && !settings.ip) {
       this.setState({ error: 'please connect to a WiFi enabled printer' });
@@ -232,12 +233,8 @@ class Interface extends React.Component {
       const updateProgres = progress => this.setState({ progress: { ...this.state.progress, ...progress } });
       await slice(target, name, exportMesh, settings, updateProgres);
     } catch (error) {
-      if (error.code === 3) {
-        this.setState({ openUrlDialog: { open: true, url: error.url } });
-      } else {
-        this.setState({ error: error.message });
-        throw error;
-      }
+      this.setState({ error: error.message });
+      throw error;
     } finally {
       this.setState({ isSlicing: false });
     }
@@ -319,7 +316,7 @@ class Interface extends React.Component {
 
   render() {
     const { classes, onCancel } = this.props;
-    const { isSlicing, progress, showFullScreen, error, objectDimensions, openUrlDialog, settings } = this.state;
+    const { isSlicing, progress, showFullScreen, error, objectDimensions, settings } = this.state;
 
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
 
@@ -341,7 +338,10 @@ class Interface extends React.Component {
               className={`${classes.button}`}
               onTouchTap={onCancel}
             />}
-            {settings && settings.printer === 'doodle3d_printer' && <MalyanControl ip={settings.ip} />}
+            {(settings && settings.ip) && ((settings.printer === 'doodle3d_printer') ?
+              <MalyanControl ip={settings.ip} /> :
+              <WifiBoxControl ip={settings.ip} />
+            )}
             <RaisedButton
               label="Print"
               ref="button"
@@ -385,32 +385,6 @@ class Interface extends React.Component {
       </div>
     );
 
-    const closeDialog = () => this.setState({ openUrlDialog: { open: false, url: '' } });
-
-    const dialog = (
-      <Dialog
-        open={openUrlDialog.open}
-        title="Open with Doodle3D Connect"
-        contentStyle={{ maxWidth: '400px' }}
-        actions={[
-          <FlatButton
-            label="Cancel"
-            onTouchTap={closeDialog}
-          />,
-          <RaisedButton
-            label="Open"
-            primary
-            onTouchTap={() => {
-              window.open(openUrlDialog.url, '_blank');
-              closeDialog();
-            }}
-          />
-        ]}
-      >
-        <p>Click 'Open' to continue to Doodle3D Connect</p>
-      </Dialog>
-    )
-
     if (showFullScreen) {
       return (
         <div
@@ -426,7 +400,6 @@ class Interface extends React.Component {
           <h1 className={classes.title}>Doodle3D Slicer</h1>
           {d3Panel}
           {settingsPanel}
-          {dialog}
         </div>
       );
     } else {
@@ -455,7 +428,6 @@ class Interface extends React.Component {
               {d3Panel}
             </Tab>
           </Tabs>
-          {dialog}
         </div>
       );
     }
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 3947019..bc53540 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -8,6 +8,7 @@ import { grey800, red500 } from 'material-ui/styles/colors';
 import React from 'react';
 import PropTypes from 'prop-types';
 import fileSaver from 'file-saver';
+import { Doodle3DBox } from 'doodle3d-api';
 
 export function placeOnGround(mesh) {
   const boundingBox = new THREE.Box3().setFromObject(mesh);
@@ -90,8 +91,9 @@ export function fetchProgress(url, data = {}, onProgress) {
     const xhr = new XMLHttpRequest();
 
     xhr.onload = () => {
-      const { status, statusText, responseURL: url } = xhr;
-      resolve(new Response(xhr.response, { status, statusText, url }));
+      resolve(new Response(xhr.response));
+      // const { status, statusText, responseURL: url } = xhr;
+      // resolve(new Response(xhr.response, { status, statusText, url }));
     }
     xhr.onerror = () => reject(new TypeError('Network request failed'));
     xhr.ontimeout = () => reject(new TypeError('Network request failed'));
@@ -147,15 +149,22 @@ const CONNECT_URL = 'http://connect.doodle3d.com/';
 export async function slice(target, name, mesh, settings, updateProgress) {
   let steps;
   let currentStep = 0;
+  let wifiBox;
   switch (target) {
     case 'DOWNLOAD':
       steps = 1;
       break;
     case 'WIFI':
-      // if (settings.printer === 'doodle3d_printer') {
+      if (settings.printer === 'doodle3d_printer') {
       //   const { state } = await getMalyanStatus(settings.ip);
-      //   if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 1 };
-      // }
+      //   if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
+      } else {
+        wifiBox = new Doodle3DBox(settings.ip);
+        if (!await wifiBox.checkAlive()) throw { message: `can't connect to printer`, code: 4 }
+
+        const { state } = await wifiBox.info.status();
+        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
+      }
       steps = 2;
       break;
     default:
@@ -241,9 +250,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         });
         currentStep ++;
 
-        const url = `${CONNECT_URL}?uuid=${id}`;
-        const popup = window.open(url, '_blank');
-        if (!popup) throw { message: 'popup was blocked by browser', code: 3, url };
+        const result = await wifiBox.printer.fetch(id);
       }
       break;
     }

From 61b3d61f8aae68e99e5e934fc900e063cd79bfc3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 18:03:16 +0100
Subject: [PATCH 075/163] disable malign and wifi box controls

---
 src/interface/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 5d4895d..9bedb23 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -14,8 +14,8 @@ import Menu from 'material-ui/Menu';
 import MenuItem from 'material-ui/MenuItem';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Settings from './Settings.js';
-import MalyanControl from './MalyanControl.js';
-import WifiBoxControl from './WifiBoxControl.js';
+// import MalyanControl from './MalyanControl.js';
+// import WifiBoxControl from './WifiBoxControl.js';
 import ReactResizeDetector from 'react-resize-detector';
 import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
 import createSceneData from 'doodle3d-core/d3/createSceneData.js';
@@ -338,10 +338,10 @@ class Interface extends React.Component {
               className={`${classes.button}`}
               onTouchTap={onCancel}
             />}
-            {(settings && settings.ip) && ((settings.printer === 'doodle3d_printer') ?
+            {/* (settings && settings.ip) && ((settings.printer === 'doodle3d_printer') ?
               <MalyanControl ip={settings.ip} /> :
               <WifiBoxControl ip={settings.ip} />
-            )}
+            ) */}
             <RaisedButton
               label="Print"
               ref="button"

From a3c028a71c51d933d2402329add5658c63d75d19 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 25 Jan 2018 18:03:31 +0100
Subject: [PATCH 076/163] configure web pack for doodle3d api

---
 webpack.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack.config.js b/webpack.config.js
index 9e4da86..b63343f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -35,6 +35,7 @@ module.exports = {
       'clipper-lib': '@doodle3d/clipper-lib',
       'clipper-js': '@doodle3d/clipper-js',
       'doodle3d-core': `@doodle3d/doodle3d-core/${devMode ? 'module' : 'lib'}`,
+      'doodle3d-api': `@doodle3d/doodle3d-api/${devMode ? 'module' : 'lib'}`,
       'cal': '@doodle3d/cal'
     }
   },

From cdb12f4d78276e022d28c189376af826757e397b Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Fri, 26 Jan 2018 09:31:49 +0100
Subject: [PATCH 077/163] remove double setting

---
 src/interface/Settings.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 3eccf81..f204791 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -43,7 +43,7 @@ const styles = {
   error: {
     color: red500
   },
-  
+
 };
 
 const getLocalStorage = () => {
@@ -407,7 +407,6 @@ class Settings extends React.Component {
               <NumberField name="settings.brim.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
               <p>Support</p>
               <Checkbox name="settings.support.enabled" label="Enabled" />
-              <NumberField name="settings.support.speed" min={0.1} fullWidth floatingLabelText="Accaptance Margin" />
               <NumberField name="settings.support.distanceY" min={0.1} fullWidth floatingLabelText="Distance Y" />
               <NumberField name="settings.support.density" min={0} max={100} fullWidth floatingLabelText="Density" />
               <NumberField name="settings.support.margin" min={0.1} fullWidth floatingLabelText="Margin" />

From 21bd6c4714dc78ef7606570bcf369029ead18571 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 11:04:08 +0100
Subject: [PATCH 078/163] decrease autoupdate interval

---
 src/interface/WifiBoxControl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/WifiBoxControl.js b/src/interface/WifiBoxControl.js
index ca73950..f9fb5d8 100644
--- a/src/interface/WifiBoxControl.js
+++ b/src/interface/WifiBoxControl.js
@@ -26,7 +26,7 @@ class WifiBoxControl extends React.Component {
     const box = new Doodle3DBox(ip);
     window.d3dbox = box;
     box.addEventListener('update', ({ state }) => this.setState({ status: state }));
-    box.setAutoUpdate(true, 1000);
+    box.setAutoUpdate(true, 5000);
 
     this.setState({ box });
 

From 67b4084e5593ccf8a5ea4586040ce4f27bfbeac2 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 12:03:01 +0100
Subject: [PATCH 079/163] add idle check for doodle3d printer

---
 src/interface/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index bc53540..ac3eeae 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -156,8 +156,8 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       break;
     case 'WIFI':
       if (settings.printer === 'doodle3d_printer') {
-      //   const { state } = await getMalyanStatus(settings.ip);
-      //   if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
+        const { state } = await getMalyanStatus(settings.ip);
+        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
       } else {
         wifiBox = new Doodle3DBox(settings.ip);
         if (!await wifiBox.checkAlive()) throw { message: `can't connect to printer`, code: 4 }

From 635e01fd01d4d1df521a4d69a16930e2dc033420 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 12:03:22 +0100
Subject: [PATCH 080/163] update fetch progress code

---
 src/interface/utils.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index ac3eeae..4d0d1ec 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -91,14 +91,14 @@ export function fetchProgress(url, data = {}, onProgress) {
     const xhr = new XMLHttpRequest();
 
     xhr.onload = () => {
-      resolve(new Response(xhr.response));
-      // const { status, statusText, responseURL: url } = xhr;
-      // resolve(new Response(xhr.response, { status, statusText, url }));
+      const headers = new Headers(xhr.getAllResponseHeaders());
+      const { status, statusText, response, responseText, responseURL: url = headers.get('X-Request-URL') } = xhr;
+      resolve(new Response(response || responseText, { headers, status, statusText, url }));
     }
     xhr.onerror = () => reject(new TypeError('Network request failed'));
     xhr.ontimeout = () => reject(new TypeError('Network request failed'));
 
-    xhr.open(request.method, url);
+    xhr.open(request.method, url, true);
 
     if (request.credentials === 'include') {
       xhr.withCredentials = true
@@ -108,10 +108,9 @@ export function fetchProgress(url, data = {}, onProgress) {
     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
     if (xhr.responseType) xhr.responseType = 'blob';
 
-    // Malyan printer doesn't like headers...
-    // request.headers.forEach((value, name) => {
-    //   xhr.setRequestHeader(name, value)
-    // });
+    request.headers.forEach((value, name) => {
+      xhr.setRequestHeader(name, value)
+    });
 
     xhr.send(data.body);
   });

From cd2b0322d8b6507be980dfc818b2d748cab504ac Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 12:30:05 +0100
Subject: [PATCH 081/163] fix setting state in unmounted

---
 src/interface/Settings.js | 23 +++++++++++------------
 src/interface/index.js    |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index f204791..5395c6c 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -21,6 +21,10 @@ import SettingsIcon from 'material-ui-icons/Settings';
 import validateIp from 'validate-ip';
 import { Doodle3DManager } from 'doodle3d-api';
 
+const DOODLE_3D_MANAGER = new Doodle3DManager();
+DOODLE_3D_MANAGER.checkNonServerBoxes = false;
+DOODLE_3D_MANAGER.setAutoUpdate(true, 5000);
+
 const styles = {
   textFieldRow: {
     display: 'flex',
@@ -105,20 +109,15 @@ class Settings extends React.Component {
       this.openAddPrinterDialog();
     }
 
-    const doodle3DManager = new Doodle3DManager();
-    doodle3DManager.checkNonServerBoxes = false;
-    doodle3DManager.setAutoUpdate(true, 1000);
-
-    doodle3DManager.addEventListener('boxeschanged', ({ boxes: wifiBoxes }) => {
-      this.setState({ wifiBoxes });
-    });
-
-    this.setState({ doodle3DManager })
+    const eventListener = ({ boxes }) => this.setState({ wifiBoxes: boxes });
+    this.setState({ wifiBoxes: DOODLE_3D_MANAGER.boxes, eventListener });
+    DOODLE_3D_MANAGER.addEventListener('boxeschanged', eventListener);
   }
 
-  componentWillUnMount() {
-    const { doodle3DManager } = this.state;
-    if (doodle3DManager) doodle3DManager.setAutoUpdate(false);
+  componentWillUnmount() {
+    console.log('remove');
+    const { eventListener } = this.state;
+    DOODLE_3D_MANAGER.removeEventListener('boxeschanged', eventListener);
   }
 
   changeSettings = (fieldName, value) => {
diff --git a/src/interface/index.js b/src/interface/index.js
index 9bedb23..c6df580 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -115,7 +115,7 @@ class Interface extends React.Component {
     this.state = {
       scene,
       settings: null,
-      showFullScreen: false,
+      showFullScreen: window.innerWidth > MAX_FULLSCREEN_WIDTH,
       isSlicing: false,
       error: null,
       mesh: null,

From 0c7f08735f2f83c2780bceeeb052fd75ef009086 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 13:59:29 +0100
Subject: [PATCH 082/163] implement printing to ultimaker2go

---
 src/interface/utils.js   | 20 +++++++++-----------
 src/settings/default.yml | 27 +++++++++++++++++++++++++++
 src/settings/printer.yml | 31 +++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 4d0d1ec..903c959 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -91,9 +91,10 @@ export function fetchProgress(url, data = {}, onProgress) {
     const xhr = new XMLHttpRequest();
 
     xhr.onload = () => {
-      const headers = new Headers(xhr.getAllResponseHeaders());
-      const { status, statusText, response, responseText, responseURL: url = headers.get('X-Request-URL') } = xhr;
-      resolve(new Response(response || responseText, { headers, status, statusText, url }));
+      resolve(new Response(xhr.response));
+      // const headers = new Headers(xhr.getAllResponseHeaders() || '');
+      // const { status, statusText, response, responseText, responseURL: url = headers.get('X-Request-URL') } = xhr;
+      // resolve(new Response(response || responseText, { headers, status, statusText, url }));
     }
     xhr.onerror = () => reject(new TypeError('Network request failed'));
     xhr.ontimeout = () => reject(new TypeError('Network request failed'));
@@ -108,9 +109,7 @@ export function fetchProgress(url, data = {}, onProgress) {
     if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
     if (xhr.responseType) xhr.responseType = 'blob';
 
-    request.headers.forEach((value, name) => {
-      xhr.setRequestHeader(name, value)
-    });
+    // request.headers.forEach((value, name) => xhr.setRequestHeader(name, value));
 
     xhr.send(data.body);
   });
@@ -223,25 +222,24 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         currentStep ++;
       } else {
         // upload G-code file to AWS S3
-        const { data: { reservation, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
+        const { data: { reservation: { fields, url }, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
           .then(response => response.json());
 
         const body = new FormData();
-        const { fields } = reservation;
         for (const key in fields) {
           body.append(key, fields[key]);
         }
 
-        const file = `;${JSON.stringify({
+        const file = new File([`;${JSON.stringify({
           ...settings,
           name: `${name}.gcode`,
           printer: { type: settings.printers, title: printerSettings[settings.printer].title },
           material: { type: settings.material, title: materialSettings[settings.material].title },
           quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
-        }).trim()}\n${gcode}`;
+        }).trim()}\n${gcode}`], 'doodle.gcode');
         body.append('file', file);
 
-        await fetchProgress(reservation.url, { method: 'POST', body }, (progress) => {
+        await fetchProgress(url, { method: 'POST', body }, progress => {
           updateProgress({
             action: 'Uploading',
             percentage: (currentStep + progress.loaded / progress.total) / steps
diff --git a/src/settings/default.yml b/src/settings/default.yml
index d38ba24..3d46f9e 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -1,3 +1,30 @@
+startCode: |-
+  M109 S{printingTemp} ;set target temperature
+  {if heatedBed}M190 S{printingBedTemp} ;set target bed temperature
+  G21 ;metric values
+  M107 ;start with the fan off
+  G28 X0 Y0 ;move X/Y to min endstops
+  G28 Z0 ;move Z to min endstops
+  G1 Z15 F9000 ;move the platform down 15mm
+  G92 E0 ;zero the extruded length
+  G91 ;relative positioning
+  G1 F200 E10 ;extrude 10mm of feed stock
+  G92 E0 ;zero the extruded length again
+  G92 E0 ;zero the extruded length again
+  G1 F9000
+  G90 ;absolute positioning
+  M117 Printing Doodle...
+endcode: |-
+  M107 ;fan off
+  G91 ;relative positioning
+  G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure
+  G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more
+  G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way
+  M84 ;disable axes / steppers
+  G90 ;absolute positioning
+  M104 S0
+  {if heatedBed}M140 S0
+  M117 Done
 dimensions:
   x: 200
   y: 200
diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 1f8f212..43e7c8e 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -300,6 +300,37 @@ ultimaker2_plus:
     y: 223
     z: 305
 ultimaker2go:
+  startCode: |-
+    M10000
+    M10000
+    M10001 X8 Y28 SDoodle3D heat up...
+    M109 S{temperature} ;set target temperature
+    {if heatedBed}M190 S{bedTemperature} ;set target bed temperature
+    G21 ;metric values
+    G90 ;absolute positioning
+    M107 ;start with the fan off
+    G28 ; home to endstops
+    G1 Z15 F9000 ;move the platform down 15mm
+    G92 E0 ;zero the extruded length
+    G1 F200 E10 ;extrude 10mm of feed stock
+    G92 E0 ;zero the extruded length again
+    G1 F9000
+    M10000
+    M10000
+    M10001 X8 Y28 SDoodle3D printing...
+  endCode: |-
+    M10000
+    M10000
+    M10001 X20 Y28 SDoodle3D done!
+    M107 ;fan off
+    G91 ;relative positioning
+    G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure
+    G1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more
+    G28 ;home the printer
+    M84 ;disable axes / steppers
+    G90 ;absolute positioning
+    M104 S0
+    {if heatedBed}M140 S0
   title: Ultimaker 2 Go
   heatedBed: false
   filamentThickness: 2.85

From 4482bf1f7349f08bd6baa7d90010dbbe0add2a0a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 15:15:27 +0100
Subject: [PATCH 083/163] compensate for higher layer height

---
 src/constants.js                  |  2 +-
 src/sliceActions/helpers/GCode.js | 11 ++++++++---
 src/sliceActions/slicesToGCode.js |  8 +++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index f1ec128..17803b6 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,4 +2,4 @@ export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
 export const MIN_AREA = 1; // holes smaller as 1mm2 get removed
-export const Z_OFFSET = 0.15;
+export const Z_OFFSET = 0.3;
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index ea51272..233a5f9 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -11,9 +11,8 @@ export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
 export default class {
-  constructor(nozzleToFilamentRatio) {
-    this._nozzleToFilamentRatio = nozzleToFilamentRatio;
-
+  constructor(layerHeight) {
+    this._nozzleToFilamentRatio = 1;
     this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
     this._currentValues = {};
     this._nozzlePosition = new THREE.Vector2(0, 0);
@@ -27,6 +26,12 @@ export default class {
     this._gcode.push(command);
   }
 
+  updateLayerHeight(layerHeight, nozzleDiameter, filamentThickness) {
+    const filamentSurfaceArea = Math.pow((filamentThickness / 2), 2) * Math.PI;
+    const lineSurfaceArea = nozzleDiameter * layerHeight;
+    this._nozzleToFilamentRatio = lineSurfaceArea / filamentSurfaceArea;
+  }
+
   turnFanOn(fanSpeed) {
     this._isFanOn = true;
 
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index e794499..1b7aa98 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -15,11 +15,8 @@ export default function slicesToGCode(slices, settings) {
     combing
   } = settings;
 
-  const filamentSurfaceArea = Math.pow((filamentThickness / 2), 2) * Math.PI;
-  const lineSurfaceArea = nozzleDiameter * layerHeight;
-  const nozzleToFilamentRatio = lineSurfaceArea / filamentSurfaceArea;
-
-  const gcode = new GCode(nozzleToFilamentRatio);
+  const gcode = new GCode();
+  gcode.updateLayerHeight(Z_OFFSET, nozzleDiameter, filamentThickness)
 
   if (settings.startCode) gcode.addGCode(settings.startCode, settings);
 
@@ -34,6 +31,7 @@ export default function slicesToGCode(slices, settings) {
     const z = layer * layerHeight + Z_OFFSET;
 
     if (layer === 1) {
+      gcode.updateLayerHeight(layerHeight, nozzleDiameter, filamentThickness);
       gcode.turnFanOn();
       isFirstLayer = false;
     }

From 407d3355c0ad02b2da613be49728e290ee443284 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 29 Jan 2018 16:11:19 +0100
Subject: [PATCH 084/163] adding infill settings

---
 package-lock.json         | 22 +++++++++++-----------
 src/index.js              |  4 +++-
 src/interface/Settings.js | 12 ++++++++++--
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48b8998..9daa821 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
         "fit-curve": "0.1.6",
         "google-fonts-webpack-plugin": "0.4.4",
         "imports-loader": "0.7.1",
-        "jss": "9.5.1",
+        "jss": "9.6.0",
         "keycode": "2.1.9",
         "lodash": "4.17.4",
         "memoizee": "0.3.10",
@@ -75,22 +75,19 @@
       },
       "dependencies": {
         "jss": {
-          "version": "9.5.1",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
-          "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
+          "version": "9.6.0",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-9.6.0.tgz",
+          "integrity": "sha512-fnj0UV//VdgxwH0h9pOZljAwFlJMZTAeaDD6u9G0VFMSDwTgdRYxV7+/RZohZYMEVITkgXedHiQHW5ETRVAXkA==",
           "requires": {
             "is-in-browser": "1.1.3",
-            "symbol-observable": "1.1.0",
+            "symbol-observable": "1.2.0",
             "warning": "3.0.0"
           }
         },
         "symbol-observable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
-          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
-        },
-        "three-js-csg": {
-          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
         }
       }
     },
@@ -7802,6 +7799,9 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
+    "three-js-csg": {
+      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
+    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/src/index.js b/src/index.js
index 4cb81de..25e494a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,12 +4,14 @@ import _defaultSettings from './settings/default.yml';
 import printerSettings from './settings/printer.yml';
 import materialSettings from './settings/material.yml';
 import qualitySettings from './settings/quality.yml';
+import infillSettings from './settings/infill.yml';
 
 const defaultSettings = {
   default: _defaultSettings,
   printer: printerSettings,
   material: materialSettings,
-  quality: qualitySettings
+  quality: qualitySettings,
+  infill: infillSettings
 };
 
 export {
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 5395c6c..4efd0ef 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -16,6 +16,7 @@ import defaultSettings from '../settings/default.yml';
 import printerSettings from '../settings/printer.yml';
 import materialSettings from '../settings/material.yml';
 import qualitySettings from '../settings/quality.yml';
+import infillSettings from '../settings/infill.yml';
 import update from 'react-addons-update';
 import SettingsIcon from 'material-ui-icons/Settings';
 import validateIp from 'validate-ip';
@@ -148,6 +149,7 @@ class Settings extends React.Component {
         if (value !== 'add_printer') state = update(state, { localStorage: { active: { $set: value } } });
         break;
 
+      case 'settings.infill':
       case 'settings.quality':
       case 'settings.material':
         if (!localStorage.active) return this.openAddPrinterDialog();
@@ -233,7 +235,7 @@ class Settings extends React.Component {
   constructSettings(localStorage) {
     if (!localStorage.active) return defaultSettings;
 
-    const { ip, settings: { printer, material, quality, advanced } } = localStorage.printers[localStorage.active];
+    const { ip, settings: { printer, material, quality, infill, advanced } } = localStorage.printers[localStorage.active];
     let settings = {
       ...defaultSettings,
       printer,
@@ -244,6 +246,7 @@ class Settings extends React.Component {
 
     settings = _.merge({}, settings, printerSettings[printer]);
     settings = _.merge({}, settings, qualitySettings[quality]);
+    settings = _.merge({}, settings, infillSettings[quality]);
     settings = _.merge({}, settings, materialSettings[material]);
 
     for (const key in advanced) {
@@ -271,7 +274,7 @@ class Settings extends React.Component {
       active: id,
       printers: {
         ...this.state.localStorage.printers,
-        [id]: { name, ip, settings: { printer, material: 'pla', quality: 'medium', advanced: {} } }
+        [id]: { name, ip, settings: { printer, material: 'pla', infill: '20pct', quality: 'medium', advanced: {} } }
       }
     };
     this.setState({ localStorage });
@@ -384,6 +387,11 @@ class Settings extends React.Component {
                   <MenuItem key={value} value={value} primaryText={title} />
                 ))}
               </SelectField>
+              <SelectField name="settings.infill" floatingLabelText="Infill" fullWidth>
+                {Object.entries(infillSettings).map(([value, { title }]) => (
+                  <MenuItem key={value} value={value} primaryText={title} />
+                ))}
+              </SelectField>
             </div>
           </Tab>
           <Tab buttonStyle={{ color: grey800, backgroundColor: 'white' }} label="Advanced">

From a88db15c965e7e538a2cb97aa6e92745eeb21a9e Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 16:11:22 +0100
Subject: [PATCH 085/163] fix building dist

---
 package-lock.json | 30 +++++++++++++++---------------
 package.json      |  2 +-
 webpack.config.js |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48b8998..ee10a57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,9 +23,9 @@
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
     "@doodle3d/doodle3d-api": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.2.tgz",
-      "integrity": "sha512-zrm6NOGkX27Rzd6Bgyjiz9GWGOh23MQAL9JncaMZQmJ55Zrf3hw9alGs0a948qcgNw/HBbqnAZFZypWqTfd5rw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.4.tgz",
+      "integrity": "sha512-B1gynKrtBzcmvYbTCFZ9KBS8JbtdwktzfxhHdCmLw7jm/Az0IOASFk++uCXXvDenSpQnwCnu21iP4hBVOU1u1g==",
       "requires": {
         "eventdispatcher.js": "0.0.2",
         "whatwg-fetch": "2.0.3"
@@ -48,7 +48,7 @@
         "fit-curve": "0.1.6",
         "google-fonts-webpack-plugin": "0.4.4",
         "imports-loader": "0.7.1",
-        "jss": "9.5.1",
+        "jss": "9.6.0",
         "keycode": "2.1.9",
         "lodash": "4.17.4",
         "memoizee": "0.3.10",
@@ -75,19 +75,19 @@
       },
       "dependencies": {
         "jss": {
-          "version": "9.5.1",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.5.1.tgz",
-          "integrity": "sha512-py//ogG1xeztpEDmosJtrkfUXibx3qiAr+1GQvfLHp7azpqkzTPLCnainDgH7Zn0q6S7rcM1eINrVT9n/r5f2w==",
+          "version": "9.6.0",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-9.6.0.tgz",
+          "integrity": "sha512-fnj0UV//VdgxwH0h9pOZljAwFlJMZTAeaDD6u9G0VFMSDwTgdRYxV7+/RZohZYMEVITkgXedHiQHW5ETRVAXkA==",
           "requires": {
             "is-in-browser": "1.1.3",
-            "symbol-observable": "1.1.0",
+            "symbol-observable": "1.2.0",
             "warning": "3.0.0"
           }
         },
         "symbol-observable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
-          "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+          "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
         },
         "three-js-csg": {
           "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
@@ -5953,9 +5953,9 @@
       }
     },
     "node-abi": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz",
-      "integrity": "sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.2.0.tgz",
+      "integrity": "sha512-FqVC0WNNL8fQWQK3GYTESfwZXZKDbSIiEEIvufq7HV6Lj0IDDZRVa4CU/KTA0JVlqY9eTDSuPiC8FS9UfGVuzA==",
       "requires": {
         "semver": "5.4.1"
       }
@@ -6520,7 +6520,7 @@
         "github-from-package": "0.0.0",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "node-abi": "2.1.2",
+        "node-abi": "2.2.0",
         "noop-logger": "0.1.1",
         "npmlog": "4.1.2",
         "os-homedir": "1.0.2",
diff --git a/package.json b/package.json
index bb46353..789b4f2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@doodle3d/clipper-js": "^1.0.10",
-    "@doodle3d/doodle3d-api": "^1.0.2",
+    "@doodle3d/doodle3d-api": "^1.0.4",
     "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",
diff --git a/webpack.config.js b/webpack.config.js
index b63343f..fc79b3b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -71,8 +71,8 @@ module.exports = {
       appMountId: 'app'
     })
   ],
-  devtool: false,
-  devtool: devMode ? 'source-map' : false,
+  devtool: 'source-map',
+  // devtool: devMode ? 'source-map' : false,
   devServer: {
     contentBase: 'dist'
   }

From a422956146c179bb5c59da4d0934d854420365f8 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 29 Jan 2018 16:14:28 +0100
Subject: [PATCH 086/163] adding infill settings

---
 src/settings/infill.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/settings/infill.yml

diff --git a/src/settings/infill.yml b/src/settings/infill.yml
new file mode 100644
index 0000000..9bb3055
--- /dev/null
+++ b/src/settings/infill.yml
@@ -0,0 +1,17 @@
+0pct:
+  title: Hollow (0%)
+  innerInfill:
+    density: 0.0
+20pct:
+  title: Normal (20%)
+  innerInfill:
+    density: 20.0
+50pct:
+  title: Dense (50%)
+  innerInfill:
+    density: 50.0
+100pct:
+  title: Solid (100%)
+  innerInfill:
+    density: 100.0
+  

From 13cc1238f139d095ba79391474d5d78b90ab7a7f Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 16:21:12 +0100
Subject: [PATCH 087/163] Fix infill settings

---
 src/interface/Settings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 4efd0ef..364ee21 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -241,12 +241,13 @@ class Settings extends React.Component {
       printer,
       material,
       quality,
+      infill,
       ip
     };
 
     settings = _.merge({}, settings, printerSettings[printer]);
     settings = _.merge({}, settings, qualitySettings[quality]);
-    settings = _.merge({}, settings, infillSettings[quality]);
+    settings = _.merge({}, settings, infillSettings[infill]);
     settings = _.merge({}, settings, materialSettings[material]);
 
     for (const key in advanced) {

From 602b5b35fe85383af445e8a79d84e70851167003 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 29 Jan 2018 17:12:27 +0100
Subject: [PATCH 088/163] sliceInfo

---
 src/interface/index.js | 5 ++++-
 src/interface/utils.js | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index c6df580..0b4e502 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -60,7 +60,10 @@ const styles = {
     flexShrink: 0,
   },
   sliceInfo: {
-    margin: '10px 0'
+    margin: '10px 0',
+    '& p': {
+      marginBottom: '5px'
+    }
   },
   sliceButtons: {
     justifyContent: 'flex-end',
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 903c959..5d8c071 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -155,13 +155,14 @@ export async function slice(target, name, mesh, settings, updateProgress) {
     case 'WIFI':
       if (settings.printer === 'doodle3d_printer') {
         const { state } = await getMalyanStatus(settings.ip);
-        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
+        if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
+        
       } else {
         wifiBox = new Doodle3DBox(settings.ip);
         if (!await wifiBox.checkAlive()) throw { message: `can't connect to printer`, code: 4 }
 
         const { state } = await wifiBox.info.status();
-        if (state !== 'idle') throw { message: 'printer must be idle before starting a print', code: 0 };
+        if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
       }
       steps = 2;
       break;
@@ -203,7 +204,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         const interval = setInterval(() => {
           loaded += 15 * 1024;
           updateProgress({
-            action: 'Uploading',
+            action: 'Uploading to printer',
             percentage: (currentStep + loaded / file.size) / steps
           });
         }, 1000);
@@ -211,7 +212,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
         // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
         await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => {
           updateProgress({
-            action: 'Uploading',
+            action: 'Uploading to printer',
             percentage: (currentStep + progress.loaded / progress.total) / steps
           });
         });

From 47e44dfed63389f999ea599546d03e5fc7ec83b8 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 17:12:44 +0100
Subject: [PATCH 089/163] Trim extra zero in gcode

---
 src/sliceActions/helpers/GCode.js | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 233a5f9..b04d25c 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -10,6 +10,11 @@ export const POSITION_X = 'X';
 export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
+const PRECISION_INVERSE = 1 / PRECISION;
+function toFixedTrimmed(value) {
+  return (Math.round(value * PRECISION_INVERSE) / PRECISION_INVERSE).toString();
+}
+
 export default class {
   constructor(layerHeight) {
     this._nozzleToFilamentRatio = 1;
@@ -59,10 +64,10 @@ export default class {
 
     this._addGCode({
       [MOVE]: 0,
-      [POSITION_X]: newNozzlePosition.x.toFixed(3),
-      [POSITION_Y]: newNozzlePosition.y.toFixed(3),
-      [POSITION_Z]: z.toFixed(3),
-      [SPEED]: (speed * 60).toFixed(3)
+      [POSITION_X]: toFixedTrimmed(newNozzlePosition.x),
+      [POSITION_Y]: toFixedTrimmed(newNozzlePosition.y),
+      [POSITION_Z]: toFixedTrimmed(z),
+      [SPEED]: toFixedTrimmed(speed * 60)
     });
 
     this._nozzlePosition.copy(newNozzlePosition);
@@ -79,11 +84,11 @@ export default class {
 
     this._addGCode({
       [MOVE]: 1,
-      [POSITION_X]: newNozzlePosition.x.toFixed(3),
-      [POSITION_Y]: newNozzlePosition.y.toFixed(3),
-      [POSITION_Z]: z.toFixed(3),
-      [SPEED]: (speed * 60).toFixed(3),
-      [EXTRUDER]: this._extruder.toFixed(3)
+      [POSITION_X]: toFixedTrimmed(newNozzlePosition.x),
+      [POSITION_Y]: toFixedTrimmed(newNozzlePosition.y),
+      [POSITION_Z]: toFixedTrimmed(z),
+      [SPEED]: toFixedTrimmed(speed * 60),
+      [EXTRUDER]: toFixedTrimmed(this._extruder)
     });
 
     this._nozzlePosition.copy(newNozzlePosition);
@@ -100,8 +105,8 @@ export default class {
 
         this._addGCode({
           [MOVE]: 0,
-          [EXTRUDER]: this._extruder.toFixed(3),
-          [SPEED]: (speed * 60).toFixed(3)
+          [EXTRUDER]: toFixedTrimmed(this._extruder),
+          [SPEED]: toFixedTrimmed(speed * 60)
         });
       }
     }
@@ -118,8 +123,8 @@ export default class {
 
         this._addGCode({
           [MOVE]: 0,
-          [EXTRUDER]: (this._extruder - amount).toFixed(3),
-          [SPEED]: (speed * 60).toFixed(3)
+          [EXTRUDER]: toFixedTrimmed(this._extruder - amount),
+          [SPEED]: toFixedTrimmed(speed * 60)
         });
       }
     }

From 377088fa343445d57f80f2601b364f8590230e17 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 17:13:09 +0100
Subject: [PATCH 090/163] fix wegpack config

---
 webpack.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index fc79b3b..4ea95a0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -71,8 +71,7 @@ module.exports = {
       appMountId: 'app'
     })
   ],
-  devtool: 'source-map',
-  // devtool: devMode ? 'source-map' : false,
+  devtool: devMode ? 'source-map' : false,
   devServer: {
     contentBase: 'dist'
   }

From 9eb01f2f21b102ea7adaeadaf17583cf53c98bd4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 29 Jan 2018 17:17:11 +0100
Subject: [PATCH 091/163] decrease z offset

---
 src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.js b/src/constants.js
index 17803b6..d651288 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -2,4 +2,4 @@ export const PRECISION = 0.01;
 export const VERSION = '0.0.18';
 export const LOCAL_STORAGE_KEY = 'PRINTER_SETTINGS';
 export const MIN_AREA = 1; // holes smaller as 1mm2 get removed
-export const Z_OFFSET = 0.3;
+export const Z_OFFSET = 0.2;

From f809c28d26e69a3b431b34cec788c8a3131a00f0 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Tue, 30 Jan 2018 00:19:05 +0100
Subject: [PATCH 092/163] added logo

---
 img/logo.png           | Bin 0 -> 46798 bytes
 package-lock.json      |   6 +++---
 src/interface/index.js |   6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 img/logo.png

diff --git a/img/logo.png b/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..128b70b648658a1d02e222a3ce34400889b09887
GIT binary patch
literal 46798
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
Hu0mjfx30CZ

literal 0
HcmV?d00001

diff --git a/package-lock.json b/package-lock.json
index ee10a57..79f7ee1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -88,9 +88,6 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
           "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-        },
-        "three-js-csg": {
-          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -7802,6 +7799,9 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
+    "three-js-csg": {
+      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
+    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/src/interface/index.js b/src/interface/index.js
index 0b4e502..54aa924 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -22,6 +22,7 @@ import createSceneData from 'doodle3d-core/d3/createSceneData.js';
 import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
 import muiThemeable from 'material-ui/styles/muiThemeable';
 import Dialog from 'material-ui/Dialog';
+import logo from '../../img/logo.png';
 
 const MAX_FULLSCREEN_WIDTH = 720;
 
@@ -73,7 +74,7 @@ const styles = {
     margin: '5px 0 5px 5px'
   },
   controlButton: {
-    marginRight: '2px'
+    marginRight: '5px'
   },
   buttonContainer: {
     width: '100%',
@@ -89,6 +90,7 @@ const styles = {
   },
   detail: {
     userSelect: 'none',
+    marginTop: '10px',
     marginBottom: '10px'
   }
 };
@@ -400,7 +402,7 @@ class Interface extends React.Component {
           }}
         >
           <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
-          <h1 className={classes.title}>Doodle3D Slicer</h1>
+          <img src={logo} style={{ position: 'absolute', left: '20px', top: '20px', width: '150px', height: '51px' }} />
           {d3Panel}
           {settingsPanel}
         </div>

From 07f8255a3766b4eba9cb8008239ded0606d297b3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 30 Jan 2018 11:07:52 +0100
Subject: [PATCH 093/163] move styles of logo to jss

---
 src/interface/index.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 54aa924..3937a8e 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -92,6 +92,13 @@ const styles = {
     userSelect: 'none',
     marginTop: '10px',
     marginBottom: '10px'
+  },
+  logo: {
+    position: 'absolute',
+    left: '20px',
+    top: '20px',
+    width: '150px',
+    height: '51px'
   }
 };
 
@@ -402,7 +409,7 @@ class Interface extends React.Component {
           }}
         >
           <ReactResizeDetector handleWidth handleHeight onResize={this.onResizeContainer} />
-          <img src={logo} style={{ position: 'absolute', left: '20px', top: '20px', width: '150px', height: '51px' }} />
+          <img src={logo} className={classes.logo} />
           {d3Panel}
           {settingsPanel}
         </div>

From 9cc64f44a5769898b3f93e482898abebe1d8438f Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 30 Jan 2018 12:01:37 +0100
Subject: [PATCH 094/163] fix component will unmount

---
 src/interface/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 3937a8e..1045406 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -169,7 +169,7 @@ class Interface extends React.Component {
   }
 
   componentWillUnmount() {
-    const { scene: { editorControls, mesh: { material } }, renderer } = this.state;
+    const { scene: { editorControls, mesh: { material }, renderer } } = this.state;
     editorControls.dispose();
     material.dispose();
     renderer.dispose();

From fded534a10d5ed4ca53e7d975d1e484e86e1add3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 30 Jan 2018 14:32:31 +0100
Subject: [PATCH 095/163] remove log

---
 src/interface/Settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 364ee21..ad0dc62 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -116,7 +116,6 @@ class Settings extends React.Component {
   }
 
   componentWillUnmount() {
-    console.log('remove');
     const { eventListener } = this.state;
     DOODLE_3D_MANAGER.removeEventListener('boxeschanged', eventListener);
   }

From 8fde65a78a8f969b4a8fdfd055b88d3d7da1b94d Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 30 Jan 2018 17:01:54 +0100
Subject: [PATCH 096/163] remove unused import

---
 src/interface/WifiBoxControl.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/interface/WifiBoxControl.js b/src/interface/WifiBoxControl.js
index f9fb5d8..5720e35 100644
--- a/src/interface/WifiBoxControl.js
+++ b/src/interface/WifiBoxControl.js
@@ -3,7 +3,6 @@ import PropTypes from 'proptypes';
 import muiThemeable from 'material-ui/styles/muiThemeable';
 import injectSheet from 'react-jss';
 import FlatButton from 'material-ui/FlatButton';
-import { sleep, getMalyanStatus } from './utils.js';
 import { Doodle3DBox } from 'doodle3d-api';
 
 const styles = {

From 4d93ee2e9d8b9137ac78d0b93c9c2966b00a49fc Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 30 Jan 2018 19:41:30 +0100
Subject: [PATCH 097/163] add favicon

---
 favicon.ico       | Bin 0 -> 4286 bytes
 webpack.config.js |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 favicon.ico

diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..921abddd2c44ae7f4c0bfb994e33291bf2d82c0a
GIT binary patch
literal 4286
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

literal 0
HcmV?d00001

diff --git a/webpack.config.js b/webpack.config.js
index 4ea95a0..8fb2532 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -65,6 +65,7 @@ module.exports = {
   },
   plugins: analyzeBundle ? [new BundleAnalyzerPlugin()] : [
     new HTMLWebpackPlugin({
+      favicon: 'favicon.ico',
       title: 'Doodle3D Slicer',
       template: require('html-webpack-template'),
       inject: false,

From dd007b8bbf3580d4a1c98c79871e339c6a63981d Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 31 Jan 2018 11:46:03 +0100
Subject: [PATCH 098/163] Link to connect.doodle3d.com

#37
---
 src/interface/Settings.js | 123 +++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 68 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index ad0dc62..50f749c 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -19,6 +19,7 @@ import qualitySettings from '../settings/quality.yml';
 import infillSettings from '../settings/infill.yml';
 import update from 'react-addons-update';
 import SettingsIcon from 'material-ui-icons/Settings';
+import ExitToAppIcon from 'material-ui-icons/ExitToApp';
 import validateIp from 'validate-ip';
 import { Doodle3DManager } from 'doodle3d-api';
 
@@ -26,6 +27,8 @@ const DOODLE_3D_MANAGER = new Doodle3DManager();
 DOODLE_3D_MANAGER.checkNonServerBoxes = false;
 DOODLE_3D_MANAGER.setAutoUpdate(true, 5000);
 
+const CONNECT_URL = 'http://connect.doodle3d.com/';
+
 const styles = {
   textFieldRow: {
     display: 'flex',
@@ -455,77 +458,61 @@ class Settings extends React.Component {
             </div>
           </Tab>
         </Tabs>
-        <Dialog
-          title="Add Printer"
-          open={addPrinter.open}
-          onRequestClose={this.closeAddPrinterDialog}
-          contentStyle={{ maxWidth: '400px' }}
-          autoScrollBodyContent
-          actions={[
-            <FlatButton
-              label="Cancel"
-              onTouchTap={this.closeAddPrinterDialog}
-            />,
-            <RaisedButton
-              label="Add"
-              primary
-              onTouchTap={this.addPrinter}
-            />
-          ]}
-        >
-          <SelectField name="addPrinter.printer" floatingLabelText="Printer" fullWidth>
-            {Object.entries(printerSettings).map(([value, { title }]) => (
-              <MenuItem key={value} value={value} primaryText={title} />
-            ))}
-          </SelectField>
-          <TextField name="addPrinter.name" floatingLabelText="Name" fullWidth />
-          {(addPrinter.printer === 'doodle3d_printer') ?
-            <TextField name="addPrinter.ip" floatingLabelText="IP Adress" fullWidth /> :
-            <SelectField name="addPrinter.ip" floatingLabelText="Doodle3D WiFi-Box" fullWidth>
-              {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
-            </SelectField>
-          }
-          {addPrinter.error && <p className={classes.error}>{addPrinter.error}</p>}
-        </Dialog>
-        <Dialog
-          title="Manage Printer"
-          open={managePrinter.open}
-          onRequestClose={this.closeManagePrinterDialog}
-          contentStyle={{ maxWidth: '400px' }}
-          autoScrollBodyContent
-          actions={[
-            <FlatButton
-              label="Cancel"
-              onTouchTap={this.closeManagePrinterDialog}
-            />,
-            <FlatButton
-              label="Remove Printer"
-              onTouchTap={this.removeActivePrinter}
-            />,
-            <RaisedButton
-              label="Save"
-              primary
-              onTouchTap={this.editPrinter}
-            />
-          ]}
-        >
-          <SelectField name="managePrinter.printer" floatingLabelText="Printer" fullWidth>
-            {Object.entries(printerSettings).map(([value, { title }]) => (
-              <MenuItem key={value} value={value} primaryText={title} />
-            ))}
-          </SelectField>
-          <TextField name="managePrinter.name" floatingLabelText="Name" fullWidth />
-          {(managePrinter.printer === 'doodle3d_printer') ?
-            <TextField name="managePrinter.ip" floatingLabelText="IP Adress" fullWidth /> :
-            <SelectField name="managePrinter.ip" floatingLabelText="Doodle3D WiFi-Box" fullWidth>
-              {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
-            </SelectField>
-          }
-          {managePrinter.error && <p className={classes.error}>{managePrinter.error}</p>}
-        </Dialog>
+        {printDialog(this.props, this.state, 'Add Printer', 'addPrinter', 'Add', addPrinter, this.closeAddPrinterDialog, null, this.addPrinter)}
+        {printDialog(this.props, this.state, 'Manage Printer', 'managePrinter', 'Save', managePrinter, this.closeManagePrinterDialog, this.removeActivePrinter, this.editPrinter)}
       </div>
     );
   }
 }
 
+function printDialog(props, state, title, form, submitText, data, closeDialog, removeActivePrinter, save) {
+  const { classes } = props;
+  const { wifiBoxes } = state;
+
+  return (
+    <Dialog
+      title={title}
+      open={data.open}
+      onRequestClose={closeDialog}
+      contentStyle={{ maxWidth: '400px' }}
+      autoScrollBodyContent
+      actions={[
+        <FlatButton
+          label="Cancel"
+          onTouchTap={closeDialog}
+        />,
+        removeActivePrinter && <FlatButton
+          label="Remove Printer"
+          onTouchTap={removeActivePrinter}
+        />,
+        <RaisedButton
+          label={submitText}
+          primary
+          onTouchTap={save}
+        />
+      ]}
+    >
+      <SelectField name={`${form}.printer`} floatingLabelText="Printer" fullWidth>
+        {Object.entries(printerSettings).map(([value, { title }]) => (
+          <MenuItem key={value} value={value} primaryText={title} />
+        ))}
+      </SelectField>
+      <TextField name={`${form}.name`} floatingLabelText="Name" fullWidth />
+      {(data.printer === 'doodle3d_printer') ?
+        <TextField name={`${form}.ip`} floatingLabelText="IP Adress" fullWidth /> :
+        <div className={classes.textFieldRow}>
+          <SelectField name={`${form}.ip`} floatingLabelText="Doodle3D WiFi-Box" fullWidth>
+            {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
+          </SelectField>
+          {data.ip && <ExitToAppIcon
+            onTouchTap={() => window.open(`${CONNECT_URL}#box?localip=${data.ip}`, '_blank')}
+            style={{ fill: grey800, marginLeft: '10px', cursor: 'pointer' }}
+          />}
+        </div>
+      }
+      {data.error && <p className={classes.error}>{data.error}</p>}
+    </Dialog>
+  );
+}
+
 export default injectSheet(styles)(Settings);

From 4cea3b3086b9026f367f51e1fcce5c6970714da6 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 31 Jan 2018 13:32:16 +0100
Subject: [PATCH 099/163] use blob instead of file so it can be used on ios9

---
 src/interface/utils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 5d8c071..094586a 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -156,7 +156,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       if (settings.printer === 'doodle3d_printer') {
         const { state } = await getMalyanStatus(settings.ip);
         if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
-        
+
       } else {
         wifiBox = new Doodle3DBox(settings.ip);
         if (!await wifiBox.checkAlive()) throw { message: `can't connect to printer`, code: 4 }
@@ -231,14 +231,14 @@ export async function slice(target, name, mesh, settings, updateProgress) {
           body.append(key, fields[key]);
         }
 
-        const file = new File([`;${JSON.stringify({
+        const file = new Blob([`;${JSON.stringify({
           ...settings,
           name: `${name}.gcode`,
           printer: { type: settings.printers, title: printerSettings[settings.printer].title },
           material: { type: settings.material, title: materialSettings[settings.material].title },
           quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
-        }).trim()}\n${gcode}`], 'doodle.gcode');
-        body.append('file', file);
+        }).trim()}\n${gcode}`]);
+        body.append('file', file, 'doodle.gcode');
 
         await fetchProgress(url, { method: 'POST', body }, progress => {
           updateProgress({

From 3b99a3c4943a1675f8b4e7e2414d7759b2aa73db Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 31 Jan 2018 14:04:08 +0100
Subject: [PATCH 100/163] update doodle3d api

---
 package-lock.json | 22 ++++++++++++++--------
 package.json      |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 79f7ee1..680bf92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,16 +23,17 @@
       "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
     },
     "@doodle3d/doodle3d-api": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.4.tgz",
-      "integrity": "sha512-B1gynKrtBzcmvYbTCFZ9KBS8JbtdwktzfxhHdCmLw7jm/Az0IOASFk++uCXXvDenSpQnwCnu21iP4hBVOU1u1g==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@doodle3d/doodle3d-api/-/doodle3d-api-1.0.5.tgz",
+      "integrity": "sha512-D64VhS6hSv1gM0jU+vPSoVHodyF+YNfolokPyAxeBDYtBiQZFtpvGnY49ukZ3gv7XtXlFhhRTXMex69LoCuT0Q==",
       "requires": {
         "eventdispatcher.js": "0.0.2",
+        "url-search-params-polyfill": "2.0.2",
         "whatwg-fetch": "2.0.3"
       }
     },
     "@doodle3d/doodle3d-core": {
-      "version": "github:doodle3d/doodle3d-core#ad944024006ae63f6b7da49d663bd1ba8dacfac4",
+      "version": "github:doodle3d/doodle3d-core#4080f0151c2b90c012a8faf53ccd336d01ac20da",
       "requires": {
         "@doodle3d/cal": "0.0.8",
         "@doodle3d/clipper-js": "1.0.10",
@@ -6522,7 +6523,7 @@
         "npmlog": "4.1.2",
         "os-homedir": "1.0.2",
         "pump": "1.0.3",
-        "rc": "1.2.4",
+        "rc": "1.2.5",
         "simple-get": "1.4.3",
         "tar-fs": "1.16.0",
         "tunnel-agent": "0.6.0",
@@ -6776,9 +6777,9 @@
       "dev": true
     },
     "rc": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz",
-      "integrity": "sha1-oPYGyq4qO4YrvQ74VILAElsxX6M=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz",
+      "integrity": "sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=",
       "requires": {
         "deep-extend": "0.4.2",
         "ini": "1.3.5",
@@ -8165,6 +8166,11 @@
         }
       }
     },
+    "url-search-params-polyfill": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-2.0.2.tgz",
+      "integrity": "sha512-zFN1r66KeSpxM2qrbHPf4u6nbIIGLOCNdO3JXdV5mEqeoBPev7VwuCv5goL69TQmfAQdVyTHI8lmzCIRPEW4Bg=="
+    },
     "user-home": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
diff --git a/package.json b/package.json
index 789b4f2..a86ad8d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@doodle3d/clipper-js": "^1.0.10",
-    "@doodle3d/doodle3d-api": "^1.0.4",
+    "@doodle3d/doodle3d-api": "^1.0.5",
     "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",

From 491067b07060cec65813702e68c755a190842930 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 31 Jan 2018 14:17:21 +0100
Subject: [PATCH 101/163] use blob instead of file

for iOS 9
---
 src/interface/utils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 094586a..f52acd6 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -188,16 +188,16 @@ export async function slice(target, name, mesh, settings, updateProgress) {
 
   switch (target) {
     case 'DOWNLOAD': {
-      const blob = new File([gcode], `${name}.gcode`, { type: 'text/plain' });
-      fileSaver.saveAs(blob);
+      const file = new Blob([gcode], { type: 'text/plain' });
+      fileSaver.saveAs(file, `${name}.gcode`);
       break;
     }
 
     case 'WIFI': {
       if (settings.printer === 'doodle3d_printer') {
         const body = new FormData();
-        const file = new File([gcode], 'doodle.gcode', { type: 'plain/text' });
-        body.append('file', file);
+        const file = new Blob([gcode], { type: 'plain/text' });
+        body.append('file', file, 'doodle.gcode');
 
         // because fetch has no way of retrieving progress we fake progress
         let loaded = 0;

From 64d28affe66f1bf01aad37d12a101dedb4f846b6 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 12:11:57 +0100
Subject: [PATCH 102/163] improve intersections to shapes step

#36
---
 src/sliceActions/intersectionsToShapes.js | 61 +++++++++++++++++------
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 0993d1e..29e1f33 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -14,31 +14,60 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
 
     const shapes = {};
 
+    const startConnects = {};
+    const endConnects = {};
+
     for (let i = 0; i < faceIndexes.length; i ++) {
-      const { lineIndexes, objectIndex, flatNormal } = faces[faceIndexes[i]];
+      const faceIndex = faceIndexes[i];
+      const { lineIndexes, flatNormal, objectIndex } = faces[faceIndex];
 
-      const a = points[lineIndexes[0]];
-      const b = points[lineIndexes[1]];
-      const c = points[lineIndexes[2]];
+      const a = lineIndexes[0];
+      const b = lineIndexes[1];
+      const c = lineIndexes[2];
 
-      const lineSegment = [];
-      if (a && b) {
-        lineSegment.push(a, b);
-      } else if (b && c) {
-        lineSegment.push(b, c);
-      } else if (c && a) {
-        lineSegment.push(c, a);
+      let pointA;
+      let pointB;
+      if (points[a] && points[b]) {
+        pointA = a;
+        pointB = b;
+      } else if (points[b] && points[c]) {
+        pointA = b;
+        pointB = c;
+      } else if (points[c] && points[a]) {
+        pointA = c;
+        pointB = a;
       } else {
+        // should never happen
         continue;
       }
 
-      const segmentNormal = normalize(normal(subtract(lineSegment[1], lineSegment[0])));
-      if (dot(segmentNormal, flatNormal) < 0) lineSegment.reverse();
+      const segmentNormal = normalize(normal(subtract(points[pointA], points[pointB])));
+      if (dot(segmentNormal, flatNormal) < 0) {
+        const temp = pointB;
+        pointB = pointA;
+        pointA = temp;
+      }
 
-      if (!shapes[objectIndex]) shapes[objectIndex] = { lineSegments: [] };
-      const shape = shapes[objectIndex];
+      if (endConnects[pointA]) {
+        const lineSegment = endConnects[pointA];
+        lineSegment.push(points[pointB]);
+        delete endConnects[pointA];
+        endConnects[pointB] = lineSegment;
+      } else if (startConnects[pointB]) {
+        const lineSegment = startConnects[pointB];
+        lineSegment.unshift(points[pointA]);
+        delete startConnects[pointB];
+        startConnects[pointA] = lineSegment;
+      } else {
+        const lineSegment = [points[pointA], points[pointB]];
+        startConnects[pointA] = lineSegment;
+        endConnects[pointB] = lineSegment;
 
-      shape.lineSegments.push(lineSegment)
+        if (!shapes[objectIndex]) shapes[objectIndex] = { lineSegments: [] };
+        const shape = shapes[objectIndex];
+
+        shape.lineSegments.push(lineSegment)
+      }
     }
 
     for (const objectIndex in shapes) {

From 8f475195b8faf70fa6d3cb913094522b57c4225b Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 12:23:34 +0100
Subject: [PATCH 103/163] clean up create lines

---
 src/sliceActions/createLines.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index e9f9fd2..b0c23ca 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -10,24 +10,27 @@ function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
     lineLookup[`${a}_${b}`] = index;
 
     const line = new THREE.Line3(geometry.vertices[a], geometry.vertices[b]);
-    lines.push({ line, faces: [] });
+    const faces = [];
+    lines.push({ line, faces });
   }
-
-  const { faces } = lines[index];
-  faces.push(faceIndex);
+  lines[index].faces.push(faceIndex);
 
   return index;
 }
 
 export default function createLines(geometry, settings) {
+  const faces = [];
   const lines = [];
   const lineLookup = {};
 
-  const faces = geometry.faces.map((face, i) => {
+  for (let i = 0; i < geometry.faces.length; i ++) {
     const { normal, materialIndex: objectIndex, a, b, c } = geometry.faces[i];
 
     // skip faces that point up or down
-    if (normal.y > .999 || normal.y < -.999) return;
+    if (normal.y > .999 || normal.y < -.999) {
+      faces.push(null);
+      continue;
+    }
 
     const indexA = addLine(geometry, lineLookup, lines, a, b, i);
     const indexB = addLine(geometry, lineLookup, lines, b, c, i);
@@ -35,8 +38,9 @@ export default function createLines(geometry, settings) {
 
     const flatNormal = normalize({ x: normal.z, y: normal.x });
     const lineIndexes = [indexA, indexB, indexC];
-    return { lineIndexes, flatNormal, objectIndex };
-  });
+
+    faces.push({ lineIndexes, flatNormal, objectIndex });
+  }
 
   return { lines, faces };
 }

From aad4c1564c190371f42a51f45f6e679548527e73 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 14:39:14 +0100
Subject: [PATCH 104/163] can connect to both start and end in one cycle

---
 src/sliceActions/intersectionsToShapes.js | 54 ++++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 29e1f33..233dbc3 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -50,33 +50,45 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
 
       if (endConnects[pointA]) {
         const lineSegment = endConnects[pointA];
-        lineSegment.push(points[pointB]);
         delete endConnects[pointA];
-        endConnects[pointB] = lineSegment;
+        if (startConnects[pointB]) {
+          if (startConnects[pointB] === lineSegment) {
+            delete startConnects[pointB];
+          } else {
+            lineSegment.push(...startConnects[pointB]);
+            endConnects[lineSegment[lineSegment.length - 1]] = lineSegment;
+          }
+        } else {
+          lineSegment.push(pointB);
+          endConnects[pointB] = lineSegment;
+        }
       } else if (startConnects[pointB]) {
         const lineSegment = startConnects[pointB];
-        lineSegment.unshift(points[pointA]);
         delete startConnects[pointB];
-        startConnects[pointA] = lineSegment;
+        if (endConnects[pointA]) {
+          lineSegment.unshift(...endConnects[pointA]);
+          startConnects[lineSegment[0]] = lineSegment;
+        } else {
+          lineSegment.unshift(pointA);
+          startConnects[pointA] = lineSegment;
+        }
       } else {
-        const lineSegment = [points[pointA], points[pointB]];
+        const lineSegment = [pointA, pointB];
         startConnects[pointA] = lineSegment;
         endConnects[pointB] = lineSegment;
 
-        if (!shapes[objectIndex]) shapes[objectIndex] = { lineSegments: [] };
-        const shape = shapes[objectIndex];
-
-        shape.lineSegments.push(lineSegment)
+        if (!shapes[objectIndex]) shapes[objectIndex] = [];
+        const shape = shapes[objectIndex].push(lineSegment);
       }
     }
 
     for (const objectIndex in shapes) {
-      const shape = shapes[objectIndex];
+      const shape = shapes[objectIndex].map(lineSegment => lineSegment.map(pointIndex => points[pointIndex]));
       const openShape = openObjectIndexes[objectIndex];
 
-      const lines = [shape.lineSegments.pop()];
+      const lines = [shape.pop()];
 
-      loop: while (shape.lineSegments.length !== 0) {
+      loop: while (shape.length !== 0) {
         for (let i = 0; i < lines.length; i ++) {
           const line = lines[i];
 
@@ -85,8 +97,8 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           let closestSegmentEnd;
           let endHit = false;
           const distanceEnd = new WeakMap();
-          for (let i = 0; i < shape.lineSegments.length; i ++) {
-            const lineSegment = shape.lineSegments[i];
+          for (let i = 0; i < shape.length; i ++) {
+            const lineSegment = shape[i];
             if (lastPoint === lineSegment[0]) {
               closestSegmentEnd = lineSegment;
               endHit = true;
@@ -97,7 +109,7 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           }
 
           if (!endHit) {
-            closestSegmentEnd = shape.lineSegments.sort((a, b) => {
+            closestSegmentEnd = shape.sort((a, b) => {
               const distanceA = distanceEnd.get(a);
               const distanceB = distanceEnd.get(b);
               if (distanceA === distanceB) return distanceTo(a[0], a[1]) - distanceTo(b[0], b[1]);
@@ -108,7 +120,7 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           }
 
           if (endHit) {
-            shape.lineSegments.splice(shape.lineSegments.indexOf(closestSegmentEnd), 1);
+            shape.splice(shape.indexOf(closestSegmentEnd), 1);
             line.splice(line.length, 0, closestSegmentEnd[1]);
             continue loop;
           }
@@ -118,8 +130,8 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           let closestSegmentStart;
           let hitStart = false;
           const distanceStart = new WeakMap();
-          for (let i = 0; i < shape.lineSegments.length; i ++) {
-            const lineSegment = shape.lineSegments[i];
+          for (let i = 0; i < shape.length; i ++) {
+            const lineSegment = shape[i];
             if (firstPoint === lineSegment[1]) {
               closestSegmentStart = lineSegment;
               hitStart = true;
@@ -130,7 +142,7 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           }
 
           if (!hitStart) {
-            closestSegmentStart = shape.lineSegments.sort((a, b) => {
+            closestSegmentStart = shape.sort((a, b) => {
               const distanceA = distanceStart.get(a);
               const distanceB = distanceStart.get(b);
               if (distanceA === distanceB) return distanceTo(a[0], a[1]) - distanceTo(b[0], b[1]);
@@ -141,12 +153,12 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
           }
 
           if (hitStart) {
-            shape.lineSegments.splice(shape.lineSegments.indexOf(closestSegmentStart), 1);
+            shape.splice(shape.indexOf(closestSegmentStart), 1);
             line.splice(0, 0, closestSegmentStart[0]);
             continue loop;
           }
         }
-        lines.push(shape.lineSegments.pop());
+        lines.push(shape.pop());
       }
 
       if (openShape) {

From 4fc34d027278b05be82f5c56bc315c9513652522 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 14:40:26 +0100
Subject: [PATCH 105/163] updated startcode

@companje
---
 src/settings/printer.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 43e7c8e..68c93bc 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -4,6 +4,8 @@ doodle3d_printer:
     M104 S{temperature}
     G28
     M109 S{temperature}
+    M190 S{bedTemperature}
+    G90
     M82
     G1 Z10.0 F6000
     G92 E0

From 0ef85cc91824aa5d4a47ab3b5ac3ce42ba9531ce Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 16:13:04 +0100
Subject: [PATCH 106/163] fix intersecties to shapes code

---
 src/sliceActions/helpers/VectorUtils.js   |   2 +
 src/sliceActions/intersectionsToShapes.js | 114 ++++++++--------------
 2 files changed, 45 insertions(+), 71 deletions(-)

diff --git a/src/sliceActions/helpers/VectorUtils.js b/src/sliceActions/helpers/VectorUtils.js
index 83d33f0..1df015c 100644
--- a/src/sliceActions/helpers/VectorUtils.js
+++ b/src/sliceActions/helpers/VectorUtils.js
@@ -18,6 +18,8 @@ export const normal = (a) => ({
   x: -a.y,
   y: a.x
 });
+export const equals = (a, b) => a.x === b.x && a.y === b.y;
+export const almostEquals = (a, b) => Math.abs(a.x - b.x) < 0.001 && Math.abs(a.y - b.y) < 0.001;
 export const dot = (a, b) => a.x * b.x + a.y * b.y;
 export const length = (v) => Math.sqrt(v.x * v.x + v.y * v.y);
 export const distanceTo = (a, b) => length(subtract(a, b));
diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 233dbc3..1d0f736 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -1,4 +1,4 @@
-import { subtract, normal, normalize, dot, distanceTo, clone } from './helpers/VectorUtils.js';
+import { subtract, normal, normalize, dot, almostEquals } from './helpers/VectorUtils.js';
 
 export default function intersectionsToShapes(intersectionLayers, faces, openObjectIndexes, settings) {
   const layers = [];
@@ -86,84 +86,56 @@ export default function intersectionsToShapes(intersectionLayers, faces, openObj
       const shape = shapes[objectIndex].map(lineSegment => lineSegment.map(pointIndex => points[pointIndex]));
       const openShape = openObjectIndexes[objectIndex];
 
-      const lines = [shape.pop()];
+      const lines = [];
 
-      loop: while (shape.length !== 0) {
-        for (let i = 0; i < lines.length; i ++) {
-          const line = lines[i];
+      const connectPoints = [];
+      for (let pathIndex = 0; pathIndex < shape.length; pathIndex ++) {
+        const path = shape[pathIndex];
 
-          const lastPoint = line[line.length - 1];
-
-          let closestSegmentEnd;
-          let endHit = false;
-          const distanceEnd = new WeakMap();
-          for (let i = 0; i < shape.length; i ++) {
-            const lineSegment = shape[i];
-            if (lastPoint === lineSegment[0]) {
-              closestSegmentEnd = lineSegment;
-              endHit = true;
-              break;
-            }
-            const distance = distanceTo(lastPoint, lineSegment[0]);
-            distanceEnd.set(lineSegment, distance);
-          }
-
-          if (!endHit) {
-            closestSegmentEnd = shape.sort((a, b) => {
-              const distanceA = distanceEnd.get(a);
-              const distanceB = distanceEnd.get(b);
-              if (distanceA === distanceB) return distanceTo(a[0], a[1]) - distanceTo(b[0], b[1]);
-              return distanceA - distanceB;
-            })[0];
-
-            if (distanceTo(closestSegmentEnd[0], lastPoint) < .001) endHit = true;
-          }
-
-          if (endHit) {
-            shape.splice(shape.indexOf(closestSegmentEnd), 1);
-            line.splice(line.length, 0, closestSegmentEnd[1]);
-            continue loop;
-          }
-
-          const firstPoint = line[0];
-
-          let closestSegmentStart;
-          let hitStart = false;
-          const distanceStart = new WeakMap();
-          for (let i = 0; i < shape.length; i ++) {
-            const lineSegment = shape[i];
-            if (firstPoint === lineSegment[1]) {
-              closestSegmentStart = lineSegment;
-              hitStart = true;
-              break;
-            }
-            const distance = distanceTo(firstPoint, lineSegment[1]);
-            distanceStart.set(lineSegment, distance);
-          }
-
-          if (!hitStart) {
-            closestSegmentStart = shape.sort((a, b) => {
-              const distanceA = distanceStart.get(a);
-              const distanceB = distanceStart.get(b);
-              if (distanceA === distanceB) return distanceTo(a[0], a[1]) - distanceTo(b[0], b[1]);
-              return distanceA - distanceB;
-            })[0];
-
-            if (distanceTo(closestSegmentStart[1], firstPoint) < .001) hitStart = true;
-          }
-
-          if (hitStart) {
-            shape.splice(shape.indexOf(closestSegmentStart), 1);
-            line.splice(0, 0, closestSegmentStart[0]);
-            continue loop;
+        let shapeStartPoint = path[0];
+        for (const point of connectPoints) {
+          if (almostEquals(point.point, shapeStartPoint)) {
+            point.start = pathIndex;
+            shapeStartPoint = null;
+            break;
           }
         }
-        lines.push(shape.pop());
+        if (shapeStartPoint) connectPoints.push({ point: shapeStartPoint, start: pathIndex, end: null });
+
+        let shapeEndPoint = path[path.length - 1];
+        for (const point of connectPoints) {
+          if (almostEquals(point.point, shapeEndPoint)) {
+            point.end = pathIndex;
+            shapeEndPoint = null;
+            break;
+          }
+        }
+        if (shapeEndPoint) connectPoints.push({ point: shapeEndPoint, start: null, end: pathIndex });
+      }
+
+      while (connectPoints.length !== 0) {
+        let { start, end } = connectPoints.pop();
+
+        const line = [];
+        if (start !== null) line.push(...shape[start]);
+
+        let newPoint;
+        while (end !== null && (newPoint = connectPoints.find(point => point.start === end))) {
+          line.push(...shape[newPoint.start]);
+          connectPoints.splice(connectPoints.indexOf(newPoint), 1);
+
+          if (newPoint.end === start) break;
+
+          end = newPoint.end;
+          start = newPoint.start;
+        }
+
+        lines.push(line);
       }
 
       if (openShape) {
         for (const line of lines) {
-          const closed = distanceTo(line[0], line[line.length - 1]) < .001;
+          const closed = almostEquals(line[0], line[line.length - 1]);
           if (closed) {
             lineShapesClosed.push(line);
           } else {

From c927c7bec13469fff540d202d6004c6c65ebc444 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 16:59:35 +0100
Subject: [PATCH 107/163] typo

---
 src/sliceActions/applyPrecision.js      | 4 ++--
 src/sliceActions/helpers/VectorUtils.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sliceActions/applyPrecision.js b/src/sliceActions/applyPrecision.js
index 0f23b23..b1cbad2 100644
--- a/src/sliceActions/applyPrecision.js
+++ b/src/sliceActions/applyPrecision.js
@@ -1,4 +1,4 @@
-import { devide } from './helpers/VectorUtils.js';
+import { divide } from './helpers/VectorUtils.js';
 import { PRECISION } from '../constants.js'
 
 export default function applyPrecision(layers) {
@@ -16,7 +16,7 @@ function scaleUpShape(shape) {
     const path = shape[i];
 
     for (let i = 0; i < path.length; i ++) {
-      path[i] = devide(path[i], PRECISION);
+      path[i] = divide(path[i], PRECISION);
     }
   }
 }
diff --git a/src/sliceActions/helpers/VectorUtils.js b/src/sliceActions/helpers/VectorUtils.js
index 1df015c..da7e197 100644
--- a/src/sliceActions/helpers/VectorUtils.js
+++ b/src/sliceActions/helpers/VectorUtils.js
@@ -10,7 +10,7 @@ export const scale = (a, factor) => ({
   x: a.x * factor,
   y: a.y * factor
 });
-export const devide = (a, factor) => ({
+export const divide = (a, factor) => ({
   x: a.x / factor,
   y: a.y / factor
 });

From 6a63077b55facc02c8400275d1bfe7005ee5bbcb Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 17:57:20 +0100
Subject: [PATCH 108/163] don't use three.js in worker

---
 src/sliceActions/createLines.js   |  3 +--
 src/sliceActions/helpers/GCode.js | 16 ++++++-------
 src/sliceActions/optimizePaths.js | 38 ++++++++++++-------------------
 src/sliceActions/slicesToGCode.js |  3 ++-
 4 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index b0c23ca..3ccc624 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,4 +1,3 @@
-import * as THREE from 'three';
 import { normalize } from './helpers/VectorUtils.js';
 
 function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
@@ -9,7 +8,7 @@ function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
     index = lines.length;
     lineLookup[`${a}_${b}`] = index;
 
-    const line = new THREE.Line3(geometry.vertices[a], geometry.vertices[b]);
+    const line = { start: geometry.vertices[a], end: geometry.vertices[b] };
     const faces = [];
     lines.push({ line, faces });
   }
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index b04d25c..bb3fd2a 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+import { divide, distanceTo } from './VectorUtils.js';
 import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
@@ -20,7 +20,7 @@ export default class {
     this._nozzleToFilamentRatio = 1;
     this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
     this._currentValues = {};
-    this._nozzlePosition = new THREE.Vector2(0, 0);
+    this._nozzlePosition = { x: 0, y: 0 };
     this._extruder = 0.0;
     this._duration = 0.0;
     this._isRetracted = false;
@@ -57,8 +57,8 @@ export default class {
   }
 
   moveTo(x, y, z, { speed }) {
-    const newNozzlePosition = new THREE.Vector2(x, y).multiplyScalar(PRECISION);
-    const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
+    const newNozzlePosition = divide({ x, y }, PRECISION_INVERSE);
+    const lineLength = distanceTo(this._nozzlePosition, newNozzlePosition);
 
     this._duration += lineLength / speed;
 
@@ -70,14 +70,14 @@ export default class {
       [SPEED]: toFixedTrimmed(speed * 60)
     });
 
-    this._nozzlePosition.copy(newNozzlePosition);
+    this._nozzlePosition = newNozzlePosition;
 
     return this;
   }
 
   lineTo(x, y, z, { speed, flowRate }) {
-    const newNozzlePosition = new THREE.Vector2(x, y).multiplyScalar(PRECISION);
-    const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
+    const newNozzlePosition = divide({ x, y }, PRECISION_INVERSE);
+    const lineLength = distanceTo(this._nozzlePosition, newNozzlePosition);
 
     this._extruder += this._nozzleToFilamentRatio * lineLength * flowRate;
     this._duration += lineLength / speed;
@@ -91,7 +91,7 @@ export default class {
       [EXTRUDER]: toFixedTrimmed(this._extruder)
     });
 
-    this._nozzlePosition.copy(newNozzlePosition);
+    this._nozzlePosition = newNozzlePosition;
 
     return this;
   }
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index cde3fb3..1392311 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -1,15 +1,15 @@
-import * as THREE from 'three';
+import { length, distanceTo } from './helpers/VectorUtils.js';
 import Shape from 'clipper-js';
 
 export default function optimizePaths(slices, settings) {
-  const start = new THREE.Vector2(0, 0);
+  let start = { x: 0, y: 0 };
 
   for (let layer = 0; layer < slices.length; layer ++) {
     const slice = slices[layer];
 
     if (typeof slice.brim !== 'undefined' && slice.brim.paths.length > 0) {
       slice.brim = optimizeShape(slice.brim, start);
-      start.copy(slice.brim.lastPoint(true));
+      start = slice.brim.lastPoint(true);
     }
 
     const parts = [];
@@ -54,21 +54,21 @@ export default function optimizePaths(slices, settings) {
           if (shell.paths.length === 0) continue;
 
           part.shell[i] = optimizeShape(shell, start);
-          start.copy(part.shell[i].lastPoint(true));
+          start = part.shell[i].lastPoint(true);
         }
 
         if (part.outerFill.paths.length > 0) {
           part.outerFill = optimizeShape(part.outerFill, start);
-          start.copy(part.outerFill.lastPoint(true));
+          start = part.outerFill.lastPoint(true);
         }
 
         if (part.innerFill.paths.length > 0) {
           part.innerFill = optimizeShape(part.innerFill, start);
-          start.copy(part.innerFill.lastPoint(true));
+          start = part.innerFill.lastPoint(true);
         }
       } else {
         part.shape = optimizeShape(part.shape, start);
-        start.copy(part.shape.lastPoint(true));
+        start = part.shape.lastPoint(true);
       }
     }
 
@@ -76,14 +76,12 @@ export default function optimizePaths(slices, settings) {
 
     if (typeof slice.support !== 'undefined' && slice.support.paths.length > 0) {
       slice.support = optimizeShape(slice.support, start);
-      start.copy(slice.support.lastPoint(true));
+      start = slice.support.lastPoint(true);
     }
   }
 }
 
 function optimizeShape(shape, start) {
-  start = start.clone();
-
   const inputPaths = shape.mapToLower();
   const optimizedPaths = [];
   const donePaths = [];
@@ -102,8 +100,7 @@ function optimizeShape(shape, start) {
 
       if (shape.closed) {
         for (let j = 0; j < path.length; j += 1) {
-          const point = new THREE.Vector2().copy(path[j]);
-          const length = point.sub(start).length();
+          const length = distanceTo(path[j], start);
           if (minLength === false || length < minLength) {
             minPath = path;
             minLength = length;
@@ -112,8 +109,7 @@ function optimizeShape(shape, start) {
           }
         }
       } else {
-        const startPoint = new THREE.Vector2().copy(path[0]);
-        const lengthToStart = startPoint.sub(start).length();
+        const lengthToStart = distanceTo(path[0], start);
         if (minLength === false || lengthToStart < minLength) {
           minPath = path;
           minLength = lengthToStart;
@@ -121,8 +117,7 @@ function optimizeShape(shape, start) {
           pathIndex = i;
         }
 
-        const endPoint = new THREE.Vector2().copy(path[path.length - 1]);
-        const lengthToEnd = endPoint.sub(start).length();
+        const lengthToEnd = distanceTo(path[path.length - 1], start);
         if (lengthToEnd < minLength) {
           minPath = path;
           minLength = lengthToEnd;
@@ -132,20 +127,15 @@ function optimizeShape(shape, start) {
       }
     }
 
-    let point;
     if (shape.closed) {
       minPath = minPath.concat(minPath.splice(0, offset));
-      point = minPath[0];
+      start = minPath[0];
     } else {
-      if (reverse) {
-        minPath.reverse();
-      }
-      point = minPath[minPath.length - 1];
+      if (reverse) minPath.reverse();
+      start = minPath[minPath.length - 1];
     }
 
     donePaths.push(pathIndex);
-    start.copy(point);
-
     optimizedPaths.push(minPath);
   }
 
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 1b7aa98..58a3ea8 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -1,5 +1,6 @@
 import GCode from './helpers/GCode.js';
 import comb from './helpers/comb.js';
+import { divide } from './helpers/VectorUtils.js';
 import { PRECISION, Z_OFFSET } from '../constants.js';
 
 const PROFILE_TYPES = ['support', 'innerShell', 'outerShell', 'innerInfill', 'outerInfill', 'brim'];
@@ -94,7 +95,7 @@ function pathToGCode(outline, combing, gcode, shape, retract, unRetract, z, { li
 
       if (i === 0) {
         if (combing) {
-          const combPath = comb(outline, gcode._nozzlePosition.divideScalar(PRECISION), point);
+          const combPath = comb(outline, divide(gcode._nozzlePosition, PRECISION), point);
           for (let i = 0; i < combPath.length; i ++) {
             const combPoint = combPath[i];
             gcode.moveTo(combPoint.x, combPoint.y, z, travelProfile);

From bc06f703ac194cbbee052c9695a24d1e5a1e20f4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 18:13:55 +0100
Subject: [PATCH 109/163] move casting to string in slice.js

---
 src/sliceActions/helpers/GCode.js | 29 +++++++++++++----------------
 src/sliceActions/slice.js         |  8 +++++++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index bb3fd2a..4cc6bf5 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -11,9 +11,6 @@ export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
 const PRECISION_INVERSE = 1 / PRECISION;
-function toFixedTrimmed(value) {
-  return (Math.round(value * PRECISION_INVERSE) / PRECISION_INVERSE).toString();
-}
 
 export default class {
   constructor(layerHeight) {
@@ -64,10 +61,10 @@ export default class {
 
     this._addGCode({
       [MOVE]: 0,
-      [POSITION_X]: toFixedTrimmed(newNozzlePosition.x),
-      [POSITION_Y]: toFixedTrimmed(newNozzlePosition.y),
-      [POSITION_Z]: toFixedTrimmed(z),
-      [SPEED]: toFixedTrimmed(speed * 60)
+      [POSITION_X]: newNozzlePosition.x,
+      [POSITION_Y]: newNozzlePosition.y,
+      [POSITION_Z]: z,
+      [SPEED]: speed * 60
     });
 
     this._nozzlePosition = newNozzlePosition;
@@ -84,11 +81,11 @@ export default class {
 
     this._addGCode({
       [MOVE]: 1,
-      [POSITION_X]: toFixedTrimmed(newNozzlePosition.x),
-      [POSITION_Y]: toFixedTrimmed(newNozzlePosition.y),
-      [POSITION_Z]: toFixedTrimmed(z),
-      [SPEED]: toFixedTrimmed(speed * 60),
-      [EXTRUDER]: toFixedTrimmed(this._extruder)
+      [POSITION_X]: newNozzlePosition.x,
+      [POSITION_Y]: newNozzlePosition.y,
+      [POSITION_Z]: z,
+      [SPEED]: speed * 60,
+      [EXTRUDER]: this._extruder
     });
 
     this._nozzlePosition = newNozzlePosition;
@@ -105,8 +102,8 @@ export default class {
 
         this._addGCode({
           [MOVE]: 0,
-          [EXTRUDER]: toFixedTrimmed(this._extruder),
-          [SPEED]: toFixedTrimmed(speed * 60)
+          [EXTRUDER]: this._extruder,
+          [SPEED]: speed * 60
         });
       }
     }
@@ -123,8 +120,8 @@ export default class {
 
         this._addGCode({
           [MOVE]: 0,
-          [EXTRUDER]: toFixedTrimmed(this._extruder - amount),
-          [SPEED]: toFixedTrimmed(speed * 60)
+          [EXTRUDER]: this._extruder - amount,
+          [SPEED]: speed * 60
         });
       }
     }
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index fcd13fc..b3eff9e 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -11,6 +11,7 @@ import optimizePaths from './optimizePaths.js';
 import shapesToSlices from './shapesToSlices.js';
 import slicesToGCode from './slicesToGCode.js';
 import applyPrecision from './applyPrecision.js';
+import { PRECISION } from '../constants.js';
 // // import removePrecision from './removePrecision.js';
 
 export default function(settings, geometry, openObjectIndexes, constructLinePreview, onProgress) {
@@ -68,6 +69,11 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
   return gcode;
 }
 
+const PRECISION_INVERSE = 1 / PRECISION;
+function toFixedTrimmed(value) {
+  return (Math.round(value * PRECISION_INVERSE) / PRECISION_INVERSE).toString();
+}
+
 function gcodeToString(gcode) {
   const currentValues = {};
   return gcode.reduce((string, command) => {
@@ -76,7 +82,7 @@ function gcodeToString(gcode) {
     } else {
       let first = true;
       for (const action in command) {
-        const value = command[action];
+        const value = toFixedTrimmed(command[action]);
         const currentValue = currentValues[action];
         if (first) {
           string += `${action}${value}`;

From 0b6a4a1588a74b9ccc92f1b9f81e047d03624bb7 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 18:19:45 +0100
Subject: [PATCH 110/163] don't use inverse

---
 src/sliceActions/helpers/GCode.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 4cc6bf5..0004843 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,4 +1,4 @@
-import { divide, distanceTo } from './VectorUtils.js';
+import { scale, distanceTo } from './VectorUtils.js';
 import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
@@ -10,8 +10,6 @@ export const POSITION_X = 'X';
 export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
-const PRECISION_INVERSE = 1 / PRECISION;
-
 export default class {
   constructor(layerHeight) {
     this._nozzleToFilamentRatio = 1;
@@ -54,7 +52,7 @@ export default class {
   }
 
   moveTo(x, y, z, { speed }) {
-    const newNozzlePosition = divide({ x, y }, PRECISION_INVERSE);
+    const newNozzlePosition = scale({ x, y }, PRECISION);
     const lineLength = distanceTo(this._nozzlePosition, newNozzlePosition);
 
     this._duration += lineLength / speed;
@@ -73,7 +71,7 @@ export default class {
   }
 
   lineTo(x, y, z, { speed, flowRate }) {
-    const newNozzlePosition = divide({ x, y }, PRECISION_INVERSE);
+    const newNozzlePosition = scale({ x, y }, PRECISION);
     const lineLength = distanceTo(this._nozzlePosition, newNozzlePosition);
 
     this._extruder += this._nozzleToFilamentRatio * lineLength * flowRate;

From 89d4a659db61e388ab0fbf19e24eb629f5735fdc Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 1 Feb 2018 18:29:20 +0100
Subject: [PATCH 111/163] reduce tolerance of min combing distance to 1mm

---
 src/sliceActions/helpers/comb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js
index 67a0ea5..7828e9f 100644
--- a/src/sliceActions/helpers/comb.js
+++ b/src/sliceActions/helpers/comb.js
@@ -2,7 +2,7 @@ import Shape from 'clipper-js';
 import { subtract, add, scale, normalize, dot, length, distanceTo } from './VectorUtils.js';
 import { PRECISION } from '../../constants.js';
 
-const TOLERANCE = 5 / PRECISION;
+const TOLERANCE = 1 / PRECISION;
 
 export default function comb(outline, start, end) {
   if (distanceTo(start, end) < TOLERANCE) {

From a08223f243777e024ba5096fe334fe334ecf405a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 5 Feb 2018 14:38:43 +0100
Subject: [PATCH 112/163] print can now parse urls with credentials

---
 src/interface/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 1045406..99a451a 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -150,7 +150,11 @@ class Interface extends React.Component {
   }
 
   loadFile = (fileUrl) => {
-    fetch(fileUrl)
+    const { origin, pathname, password, username, port } = new URL(fileUrl);
+    const headers = {};
+    if (password && username) headers.Authorization = `Basic ${btoa(`${username}:${password}`)}`;
+
+    fetch(`${origin}${port}${pathname}`, { headers })
       .then(resonse => resonse.json())
       .then(json => JSONToSketchData(json))
       .then(file => createSceneData(file))

From 78764383e1dcf97d1153fd6955b1c72d5126cd8b Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 6 Feb 2018 11:16:41 +0100
Subject: [PATCH 113/163] allow for empty ip in add doodle printer

---
 src/interface/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 50f749c..185d064 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -267,7 +267,7 @@ class Settings extends React.Component {
       this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a name and printer' } } }));
       return;
     }
-    if (printer === 'doodle3d_printer' && !validateIp(ip)) {
+    if (printer === 'doodle3d_printer' && !validateIp(ip) && ip !== '') {
       this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a valid IP adress' } } }));
       return;
     }

From 34147a918e16a1c281baacf6f39b5f76c26d8e1d Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 6 Feb 2018 11:21:40 +0100
Subject: [PATCH 114/163] Unable to close add printer popup when no printer is
 added

---
 src/interface/Settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 185d064..c29ce68 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -458,7 +458,7 @@ class Settings extends React.Component {
             </div>
           </Tab>
         </Tabs>
-        {printDialog(this.props, this.state, 'Add Printer', 'addPrinter', 'Add', addPrinter, this.closeAddPrinterDialog, null, this.addPrinter)}
+        {printDialog(this.props, this.state, 'Add Printer', 'addPrinter', 'Add', addPrinter, localStorage.active && this.closeAddPrinterDialog, null, this.addPrinter)}
         {printDialog(this.props, this.state, 'Manage Printer', 'managePrinter', 'Save', managePrinter, this.closeManagePrinterDialog, this.removeActivePrinter, this.editPrinter)}
       </div>
     );
@@ -473,11 +473,11 @@ function printDialog(props, state, title, form, submitText, data, closeDialog, r
     <Dialog
       title={title}
       open={data.open}
-      onRequestClose={closeDialog}
+      onRequestClose={closeDialog ? closeDialog : null}
       contentStyle={{ maxWidth: '400px' }}
       autoScrollBodyContent
       actions={[
-        <FlatButton
+        closeDialog && <FlatButton
           label="Cancel"
           onTouchTap={closeDialog}
         />,

From 4bf14d3a1d4a82da2132ac04bfb9ee519199568f Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 6 Feb 2018 17:21:39 +0100
Subject: [PATCH 115/163] rename cancel close

---
 src/interface/Settings.js | 2 +-
 src/interface/index.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index c29ce68..b17011b 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -478,7 +478,7 @@ function printDialog(props, state, title, form, submitText, data, closeDialog, r
       autoScrollBodyContent
       actions={[
         closeDialog && <FlatButton
-          label="Cancel"
+          label="Close"
           onTouchTap={closeDialog}
         />,
         removeActivePrinter && <FlatButton
diff --git a/src/interface/index.js b/src/interface/index.js
index 99a451a..3f85d5d 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -350,7 +350,7 @@ class Interface extends React.Component {
           </div>
           <div className={classes.sliceButtons}>
             {onCancel && <RaisedButton
-              label="Cancel"
+              label="Close"
               className={`${classes.button}`}
               onTouchTap={onCancel}
             />}

From 774289895ec728f398414f0f4f2fbb7ed78225b1 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 6 Feb 2018 17:28:25 +0100
Subject: [PATCH 116/163] update doodle box url

---
 src/interface/Settings.js | 2 +-
 src/interface/utils.js    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index b17011b..1830718 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -505,7 +505,7 @@ function printDialog(props, state, title, form, submitText, data, closeDialog, r
             {wifiBoxes.map(({ localip, id, wifiboxid }) => (<MenuItem key={id} value={localip} primaryText={wifiboxid} />))}
           </SelectField>
           {data.ip && <ExitToAppIcon
-            onTouchTap={() => window.open(`${CONNECT_URL}#box?localip=${data.ip}`, '_blank')}
+            onTouchTap={() => window.open(`${CONNECT_URL}/?uuid=0#control?localip=${data.ip}`, '_blank')}
             style={{ fill: grey800, marginLeft: '10px', cursor: 'pointer' }}
           />}
         </div>
diff --git a/src/interface/utils.js b/src/interface/utils.js
index f52acd6..51a99b1 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -142,7 +142,6 @@ export function sleep(time) {
 }
 
 const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
-const CONNECT_URL = 'http://connect.doodle3d.com/';
 
 export async function slice(target, name, mesh, settings, updateProgress) {
   let steps;

From 5944153de7677f391086262665898c2d095f6dd1 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Sun, 11 Feb 2018 23:28:25 +0100
Subject: [PATCH 117/163] disable line priview

---
 src/sliceActions/slice.js | 80 +++++++++++++++++++--------------------
 src/slicer.js             | 24 ++++++------
 src/slicer.worker.js      | 12 +++---
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index b3eff9e..8a36539 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -1,4 +1,4 @@
-import * as THREE from 'three';
+// import * as THREE from 'three';
 import calculateLayersIntersections from './calculateLayersIntersections.js';
 import createLines from './createLines.js';
 import generateInfills from './generateInfills.js';
@@ -64,9 +64,9 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
 
   updateProgress('Finished');
 
-  if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
-  gcode.gcode = gcodeToString(gcode.gcode);
-  return gcode;
+  // if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
+  // gcode.gcode = gcodeToString(gcode.gcode);
+  // return gcode;
 }
 
 const PRECISION_INVERSE = 1 / PRECISION;
@@ -98,39 +98,39 @@ function gcodeToString(gcode) {
   }, '');
 }
 
-const MAX_SPEED = 100 * 60;
-const COLOR = new THREE.Color();
-function createGcodeGeometry(gcode) {
-  const positions = [];
-  const colors = [];
-
-  let lastPoint = [0, 0, 0];
-  for (let i = 0; i < gcode.length; i ++) {
-    const command = gcode[i];
-    if (typeof command === 'string') continue;
-
-    const { G, F, X, Y, Z } = command;
-
-    if (X || Y || Z) {
-      if (G === 1) {
-        positions.push(lastPoint.Y, lastPoint.Z, lastPoint.X);
-        positions.push(Y, Z, X);
-
-        const color = (G === 0) ? COLOR.setHex(0x00ff00) : COLOR.setHSL(F / MAX_SPEED, 0.5, 0.5);
-        colors.push(color.r, color.g, color.b);
-        colors.push(color.r, color.g, color.b);
-      }
-      lastPoint = { X, Y, Z };
-    }
-  }
-
-  const geometry = new THREE.BufferGeometry();
-
-  geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(positions), 3));
-  geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(colors), 3));
-
-  const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
-  const linePreview = new THREE.LineSegments(geometry, material);
-
-  return linePreview;
-}
+// const MAX_SPEED = 100 * 60;
+// const COLOR = new THREE.Color();
+// function createGcodeGeometry(gcode) {
+//   const positions = [];
+//   const colors = [];
+//
+//   let lastPoint = [0, 0, 0];
+//   for (let i = 0; i < gcode.length; i ++) {
+//     const command = gcode[i];
+//     if (typeof command === 'string') continue;
+//
+//     const { G, F, X, Y, Z } = command;
+//
+//     if (X || Y || Z) {
+//       if (G === 1) {
+//         positions.push(lastPoint.Y, lastPoint.Z, lastPoint.X);
+//         positions.push(Y, Z, X);
+//
+//         const color = (G === 0) ? COLOR.setHex(0x00ff00) : COLOR.setHSL(F / MAX_SPEED, 0.5, 0.5);
+//         colors.push(color.r, color.g, color.b);
+//         colors.push(color.r, color.g, color.b);
+//       }
+//       lastPoint = { X, Y, Z };
+//     }
+//   }
+//
+//   const geometry = new THREE.BufferGeometry();
+//
+//   geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(positions), 3));
+//   geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(colors), 3));
+//
+//   const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+//   const linePreview = new THREE.LineSegments(geometry, material);
+//
+//   return linePreview;
+// }
diff --git a/src/slicer.js b/src/slicer.js
index c49ec2e..7ee9723 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -70,18 +70,18 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
         case 'SLICE': {
           slicerWorker.terminate();
 
-          if (data.gcode.linePreview) {
-            const geometry = new THREE.BufferGeometry();
-
-            const { position, color } = data.gcode.linePreview;
-            geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(position), 3));
-            geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(color), 3));
-
-            const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
-            const linePreview = new THREE.LineSegments(geometry, material);
-
-            data.gcode.linePreview = linePreview;
-          }
+          // if (data.gcode.linePreview) {
+          //   const geometry = new THREE.BufferGeometry();
+          //
+          //   const { position, color } = data.gcode.linePreview;
+          //   geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(position), 3));
+          //   geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(color), 3));
+          //
+          //   const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+          //   const linePreview = new THREE.LineSegments(geometry, material);
+          //
+          //   data.gcode.linePreview = linePreview;
+          // }
 
           resolve(data.gcode);
           break;
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index f06ce93..c43f88a 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -21,12 +21,12 @@ self.addEventListener('message', (event) => {
       const gcode = slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
 
       const buffers = [];
-      if (gcode.linePreview) {
-        const position = gcode.linePreview.geometry.getAttribute('position').array;
-        const color = gcode.linePreview.geometry.getAttribute('color').array;
-        buffers.push(position.buffer, color.buffer);
-        gcode.linePreview = { position, color };
-      }
+      // if (gcode.linePreview) {
+      //   const position = gcode.linePreview.geometry.getAttribute('position').array;
+      //   const color = gcode.linePreview.geometry.getAttribute('color').array;
+      //   buffers.push(position.buffer, color.buffer);
+      //   gcode.linePreview = { position, color };
+      // }
 
       self.postMessage({
         message: 'SLICE',

From 03f95b75705e9ff52b9fe5a564158dcbeff31ab1 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Sun, 11 Feb 2018 23:50:57 +0100
Subject: [PATCH 118/163] rename vectorutils

---
 src/sliceActions/applyPrecision.js                       | 2 +-
 src/sliceActions/createLines.js                          | 2 +-
 src/sliceActions/helpers/GCode.js                        | 2 +-
 src/sliceActions/helpers/comb.js                         | 2 +-
 src/sliceActions/helpers/{VectorUtils.js => vector2D.js} | 3 +--
 src/sliceActions/intersectionsToShapes.js                | 2 +-
 src/sliceActions/optimizePaths.js                        | 2 +-
 src/sliceActions/slicesToGCode.js                        | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename src/sliceActions/helpers/{VectorUtils.js => vector2D.js} (93%)

diff --git a/src/sliceActions/applyPrecision.js b/src/sliceActions/applyPrecision.js
index b1cbad2..a234eee 100644
--- a/src/sliceActions/applyPrecision.js
+++ b/src/sliceActions/applyPrecision.js
@@ -1,4 +1,4 @@
-import { divide } from './helpers/VectorUtils.js';
+import { divide } from './helpers/vector2D.js';
 import { PRECISION } from '../constants.js'
 
 export default function applyPrecision(layers) {
diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index 3ccc624..0c8cf20 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,4 +1,4 @@
-import { normalize } from './helpers/VectorUtils.js';
+import { normalize } from './helpers/vector2D.js';
 
 function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
   let index;
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 0004843..65e36a5 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,4 +1,4 @@
-import { scale, distanceTo } from './VectorUtils.js';
+import { scale, distanceTo } from './vector2D.js';
 import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js
index 7828e9f..5561bb1 100644
--- a/src/sliceActions/helpers/comb.js
+++ b/src/sliceActions/helpers/comb.js
@@ -1,5 +1,5 @@
 import Shape from 'clipper-js';
-import { subtract, add, scale, normalize, dot, length, distanceTo } from './VectorUtils.js';
+import { subtract, add, scale, normalize, dot, length, distanceTo } from './vector2D.js';
 import { PRECISION } from '../../constants.js';
 
 const TOLERANCE = 1 / PRECISION;
diff --git a/src/sliceActions/helpers/VectorUtils.js b/src/sliceActions/helpers/vector2D.js
similarity index 93%
rename from src/sliceActions/helpers/VectorUtils.js
rename to src/sliceActions/helpers/vector2D.js
index da7e197..a6aac06 100644
--- a/src/sliceActions/helpers/VectorUtils.js
+++ b/src/sliceActions/helpers/vector2D.js
@@ -30,5 +30,4 @@ export const normalize = (v) => {
     x: v.x / l,
     y: v.y / l
   };
-}
-export const clone = (v) => ({ x: v.x, y: v.y });
+};
diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 1d0f736..3328ebd 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -1,4 +1,4 @@
-import { subtract, normal, normalize, dot, almostEquals } from './helpers/VectorUtils.js';
+import { subtract, normal, normalize, dot, almostEquals } from './helpers/vector2D.js';
 
 export default function intersectionsToShapes(intersectionLayers, faces, openObjectIndexes, settings) {
   const layers = [];
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 1392311..7f249d9 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -1,4 +1,4 @@
-import { length, distanceTo } from './helpers/VectorUtils.js';
+import { length, distanceTo } from './helpers/vector2D.js';
 import Shape from 'clipper-js';
 
 export default function optimizePaths(slices, settings) {
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 58a3ea8..cc379ad 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -1,6 +1,6 @@
 import GCode from './helpers/GCode.js';
 import comb from './helpers/comb.js';
-import { divide } from './helpers/VectorUtils.js';
+import { divide } from './helpers/vector2D.js';
 import { PRECISION, Z_OFFSET } from '../constants.js';
 
 const PROFILE_TYPES = ['support', 'innerShell', 'outerShell', 'innerInfill', 'outerInfill', 'brim'];

From 4b17325c3fb8f06707b69f02ba66cbfbbe22550b Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 00:10:44 +0100
Subject: [PATCH 119/163] don't send instance of geometry to slicer

making importing three obsolete, reducing te worker from 700kb to 200kb
---
 src/sliceActions/createLines.js | 26 +++++++++++++------
 src/sliceActions/slice.js       |  5 ++--
 src/slicer.js                   | 44 ++++++++++++++++++++++++++-------
 src/slicer.worker.js            |  6 +----
 4 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index 0c8cf20..7dcb51b 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,6 +1,6 @@
 import { normalize } from './helpers/vector2D.js';
 
-function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
+function addLine(vertices, lineLookup, lines, a, b, faceIndex) {
   let index;
   if (typeof lineLookup[`${b}_${a}`] !== 'undefined') {
     index = lineLookup[`${b}_${a}`];
@@ -8,7 +8,10 @@ function addLine(geometry, lineLookup, lines, a, b, faceIndex) {
     index = lines.length;
     lineLookup[`${a}_${b}`] = index;
 
-    const line = { start: geometry.vertices[a], end: geometry.vertices[b] };
+    const start = { x: vertices[a * 3], y: vertices[a * 3 + 1], z: vertices[a * 3 + 2] };
+    const end = { x: vertices[b * 3], y: vertices[b * 3 + 1], z: vertices[b * 3 + 2] };
+
+    const line = { start, end };
     const faces = [];
     lines.push({ line, faces });
   }
@@ -22,8 +25,17 @@ export default function createLines(geometry, settings) {
   const lines = [];
   const lineLookup = {};
 
-  for (let i = 0; i < geometry.faces.length; i ++) {
-    const { normal, materialIndex: objectIndex, a, b, c } = geometry.faces[i];
+  for (let i = 0; i < geometry.objectIndexes.length; i ++) {
+    const i3 = i * 3;
+    const objectIndex = geometry.objectIndexes[i];
+    const normal = {
+      x: geometry.faceNormals[i3],
+      y: geometry.faceNormals[i3 + 1],
+      z: geometry.faceNormals[i3 + 2]
+    };
+    const a = geometry.faces[i3];
+    const b = geometry.faces[i3 + 1];
+    const c = geometry.faces[i3 + 2];
 
     // skip faces that point up or down
     if (normal.y > .999 || normal.y < -.999) {
@@ -31,9 +43,9 @@ export default function createLines(geometry, settings) {
       continue;
     }
 
-    const indexA = addLine(geometry, lineLookup, lines, a, b, i);
-    const indexB = addLine(geometry, lineLookup, lines, b, c, i);
-    const indexC = addLine(geometry, lineLookup, lines, c, a, i);
+    const indexA = addLine(geometry.vertices, lineLookup, lines, a, b, i);
+    const indexB = addLine(geometry.vertices, lineLookup, lines, b, c, i);
+    const indexC = addLine(geometry.vertices, lineLookup, lines, c, a, i);
 
     const flatNormal = normalize({ x: normal.z, y: normal.x });
     const lineIndexes = [indexA, indexB, indexC];
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 8a36539..516864b 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -65,8 +65,9 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
   updateProgress('Finished');
 
   // if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
-  // gcode.gcode = gcodeToString(gcode.gcode);
-  // return gcode;
+
+  gcode.gcode = gcodeToString(gcode.gcode);
+  return gcode;
 }
 
 const PRECISION_INVERSE = 1 / PRECISION;
diff --git a/src/slicer.js b/src/slicer.js
index 7ee9723..79590cb 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -23,13 +23,38 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
     throw new Error('Geometry is not an instance of BufferGeometry or Geometry');
   }
 
-  if (geometry.faces.length === 0) {
-    throw new Error('Geometry does not contain any data');
-  }
+  if (matrix && matrix.isMatrix4) geometry.applyMatrix(matrix);
+  geometry.computeFaceNormals();
 
-  if (matrix && matrix.isMatrix4) {
-    geometry.applyMatrix(matrix);
-  }
+  const vertices = geometry.vertices.reduce((array, { x, y, z }, i) => {
+    const i3 = i * 3;
+    array[i3] = x;
+    array[i3 + 1] = y;
+    array[i3 + 2] = z;
+    return array;
+  }, new Float32Array(geometry.vertices.length * 3));
+  const faces = geometry.faces.reduce((array, { a, b, c }, i) => {
+    const i3 = i * 3;
+    array[i3] = a;
+    array[i3 + 1] = b;
+    array[i3 + 2] = c;
+    return array;
+  }, new Uint32Array(geometry.faces.length * 3));
+  const faceNormals = geometry.faces.reduce((array, { normal: { x, y, z } }, i) => {
+    const i3 = i * 3;
+    array[i3] = x;
+    array[i3 + 1] = y;
+    array[i3 + 2] = z;
+    return array;
+  }, new Float32Array(geometry.faces.length * 3));
+  const objectIndexes = geometry.faces.reduce((array, { materialIndex }, i) => {
+    array[i] = materialIndex;
+    return array;
+  }, new Uint8Array(geometry.faces.length));
+
+  if (faces.length === 0) throw new Error('Geometry does not contain any data');
+
+  geometry = { vertices, faces, objectIndexes, faceNormals };
 
   const openObjectIndexes = materials instanceof Array ? materials.map(({ side }) => {
     switch (side) {
@@ -95,11 +120,12 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
       }
     });
 
-    // send geometry and settings to worker to start the slicing progress
-    geometry = geometry.toJSON();
+    const { vertices, faces, objectIndexes, faceNormals } = geometry;
+    const buffers = [vertices.buffer, faces.buffer, objectIndexes.buffer, faceNormals.buffer];
+
     slicerWorker.postMessage({
       message: 'SLICE',
       data: { settings, geometry, openObjectIndexes, constructLinePreview }
-    });
+    }, buffers);
   });
 }
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index c43f88a..4ebcb50 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -1,6 +1,5 @@
 import 'core-js'; // polyfills
 import slice from './sliceActions/slice.js';
-import * as THREE from 'three';
 
 const onProgress = progress => {
   self.postMessage({
@@ -9,14 +8,11 @@ const onProgress = progress => {
   });
 }
 
-const loader = new THREE.JSONLoader();
-
 self.addEventListener('message', (event) => {
   const { message, data } = event.data;
   switch (message) {
     case 'SLICE': {
-      const { settings, geometry: JSONGeometry, constructLinePreview, openObjectIndexes } = data;
-      const { geometry } = loader.parse(JSONGeometry.data);
+      const { settings, geometry, constructLinePreview, openObjectIndexes } = data;
 
       const gcode = slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
 

From 4352293e95d081a87ae1d6774de6f693538246ce Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 00:36:05 +0100
Subject: [PATCH 120/163] don't combine layerpoints and layer face indexes into
 objects

---
 .../calculateLayersIntersections.js            | 18 +++++++-----------
 src/sliceActions/intersectionsToShapes.js      |  7 ++++---
 src/sliceActions/slice.js                      |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/sliceActions/calculateLayersIntersections.js b/src/sliceActions/calculateLayersIntersections.js
index a9c2ddd..7dc2a45 100644
--- a/src/sliceActions/calculateLayersIntersections.js
+++ b/src/sliceActions/calculateLayersIntersections.js
@@ -8,10 +8,8 @@ export default function calculateLayersIntersections(lines, settings) {
 
   const numLayers = Math.floor((dimensionsZ - Z_OFFSET) / layerHeight);
 
-  const layers = Array.from(Array(numLayers)).map(() => ({
-    points: {},
-    faceIndexes: []
-  }));
+  const layerPoints = Array.from(Array(numLayers)).map(() => []);
+  const layerFaceIndexes = Array.from(Array(numLayers)).map(() => []);
 
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex ++) {
     const { line, faces } = lines[lineIndex];
@@ -34,20 +32,18 @@ export default function calculateLayersIntersections(lines, settings) {
           z = line.end.z * alpha + line.start.z * alpha1;
         }
 
-        layers[layerIndex].points[lineIndex] = { x: z, y: x };
-        layers[layerIndex].faceIndexes.push(...faces);
+        layerPoints[layerIndex][lineIndex] = { x: z, y: x };
+        layerFaceIndexes[layerIndex].push(...faces);
       }
     }
   }
 
-  for (let i = 0; i < layers.length; i ++) {
-    const layer = layers[i];
-
-    layer.faceIndexes = layer.faceIndexes.reduce((result, faceIndex) => {
+  for (let i = 0; i < layerFaceIndexes.length; i ++) {
+    layerFaceIndexes[i] = layerFaceIndexes[i].reduce((result, faceIndex) => {
       if (!result.includes(faceIndex)) result.push(faceIndex);
       return result;
     }, []);
   }
 
-  return layers;
+  return { layerPoints, layerFaceIndexes };
 }
diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 3328ebd..8630004 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -1,14 +1,15 @@
 import { subtract, normal, normalize, dot, almostEquals } from './helpers/vector2D.js';
 
-export default function intersectionsToShapes(intersectionLayers, faces, openObjectIndexes, settings) {
+export default function intersectionsToShapes(layerPoints, layerFaceIndexes, faces, openObjectIndexes, settings) {
   const layers = [];
 
-  for (let layer = 0; layer < intersectionLayers.length; layer ++) {
+  for (let layer = 0; layer < layerPoints.length; layer ++) {
     const fillShapes = [];
     const lineShapesOpen = [];
     const lineShapesClosed = [];
 
-    const { points, faceIndexes } = intersectionLayers[layer];
+    const points = layerPoints[layer];
+    const faceIndexes = layerFaceIndexes[layer];
 
     if (faceIndexes.length === 0) continue;
 
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 516864b..0f8cd02 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -34,10 +34,10 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
   const { lines, faces } = createLines(geometry, settings);
 
   updateProgress('Calculating layer intersections');
-  const layers = calculateLayersIntersections(lines, settings);
+  const { layerPoints, layerFaceIndexes } = calculateLayersIntersections(lines, settings);
 
   updateProgress('Constructing shapes from intersections');
-  const shapes = intersectionsToShapes(layers, faces, openObjectIndexes, settings);
+  const shapes = intersectionsToShapes(layerPoints, layerFaceIndexes, faces, openObjectIndexes, settings);
 
   applyPrecision(shapes);
 

From 45b0f541b136328d153838b8afcb964a9fb36cdc Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 10:28:42 +0100
Subject: [PATCH 121/163] send typed array instead of string across worker

---
 src/sliceActions/helpers/binary.js | 15 +++++++++++++++
 src/slicer.js                      |  6 +++++-
 src/slicer.worker.js               |  5 ++++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/sliceActions/helpers/binary.js

diff --git a/src/sliceActions/helpers/binary.js b/src/sliceActions/helpers/binary.js
new file mode 100644
index 0000000..7e6b33a
--- /dev/null
+++ b/src/sliceActions/helpers/binary.js
@@ -0,0 +1,15 @@
+export function stringToTypedArray(string) {
+  const array = new Uint8Array(string.length);
+  for (let i = 0; i < string.length; i ++) {
+    array[i] = string.charCodeAt(i);
+  }
+  return array;
+}
+
+export function typedArrayToString(array) {
+  let string = '';
+  for (let i = 0; i < array.length; i ++) {
+    string += String.fromCharCode(array[i]);
+  }
+  return string;
+}
diff --git a/src/slicer.js b/src/slicer.js
index 79590cb..2ebba5c 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import slice from './sliceActions/slice.js';
 import SlicerWorker from './slicer.worker.js';
+import { typedArrayToString } from './sliceActions/helpers/binary.js';
 
 export function sliceMesh(settings, mesh, sync = false, constructLinePreview = false, onProgress) {
   if (!mesh || !mesh.isMesh) {
@@ -95,6 +96,9 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
         case 'SLICE': {
           slicerWorker.terminate();
 
+          const { gcode } = data;
+          gcode.gcode = typedArrayToString(gcode.gcode);
+
           // if (data.gcode.linePreview) {
           //   const geometry = new THREE.BufferGeometry();
           //
@@ -108,7 +112,7 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
           //   data.gcode.linePreview = linePreview;
           // }
 
-          resolve(data.gcode);
+          resolve(gcode);
           break;
         }
         case 'PROGRESS': {
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index 4ebcb50..e55f9e9 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -1,5 +1,6 @@
 import 'core-js'; // polyfills
 import slice from './sliceActions/slice.js';
+import { stringToTypedArray } from './sliceActions/helpers/binary.js';
 
 const onProgress = progress => {
   self.postMessage({
@@ -15,8 +16,10 @@ self.addEventListener('message', (event) => {
       const { settings, geometry, constructLinePreview, openObjectIndexes } = data;
 
       const gcode = slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
+      gcode.gcode = stringToTypedArray(gcode.gcode);
+
+      const buffers = [gcode.gcode.buffer];
 
-      const buffers = [];
       // if (gcode.linePreview) {
       //   const position = gcode.linePreview.geometry.getAttribute('position').array;
       //   const color = gcode.linePreview.geometry.getAttribute('color').array;

From dbc01167e5a4348b760b5c3aaae92937477e4247 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 11:07:06 +0100
Subject: [PATCH 122/163] fix line preview

---
 src/sliceActions/helpers/color.js | 24 +++++++++++
 src/sliceActions/slice.js         | 69 ++++++++++++++-----------------
 src/slicer.js                     | 29 ++++++-------
 src/slicer.worker.js              | 11 ++---
 4 files changed, 74 insertions(+), 59 deletions(-)
 create mode 100644 src/sliceActions/helpers/color.js

diff --git a/src/sliceActions/helpers/color.js b/src/sliceActions/helpers/color.js
new file mode 100644
index 0000000..c6f6f33
--- /dev/null
+++ b/src/sliceActions/helpers/color.js
@@ -0,0 +1,24 @@
+export function hslToRgb(h, s, l){
+  let r, g, b;
+
+  if (s === 0) {
+    r = g = b = lightness;
+  } else {
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+    const p = 2 * l - q;
+    r = hueToRgb(p, q, h + 1 / 3);
+    g = hueToRgb(p, q, h);
+    b = hueToRgb(p, q, h - 1 / 3);
+  }
+
+  return [r, g, b];
+}
+
+function hueToRgb(p, q, t){
+  if (t < 0) t += 1;
+  if (t > 1) t -= 1;
+  if (t < 1 / 6) return p + (q - p) * 6 * t;
+  if (t < 1 / 2) return q;
+  if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+  return p;
+}
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 0f8cd02..5b80dd6 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -1,4 +1,3 @@
-// import * as THREE from 'three';
 import calculateLayersIntersections from './calculateLayersIntersections.js';
 import createLines from './createLines.js';
 import generateInfills from './generateInfills.js';
@@ -12,6 +11,7 @@ import shapesToSlices from './shapesToSlices.js';
 import slicesToGCode from './slicesToGCode.js';
 import applyPrecision from './applyPrecision.js';
 import { PRECISION } from '../constants.js';
+import { hslToRgb } from './helpers/color.js';
 // // import removePrecision from './removePrecision.js';
 
 export default function(settings, geometry, openObjectIndexes, constructLinePreview, onProgress) {
@@ -64,7 +64,7 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
 
   updateProgress('Finished');
 
-  // if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
+  if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
 
   gcode.gcode = gcodeToString(gcode.gcode);
   return gcode;
@@ -99,39 +99,32 @@ function gcodeToString(gcode) {
   }, '');
 }
 
-// const MAX_SPEED = 100 * 60;
-// const COLOR = new THREE.Color();
-// function createGcodeGeometry(gcode) {
-//   const positions = [];
-//   const colors = [];
-//
-//   let lastPoint = [0, 0, 0];
-//   for (let i = 0; i < gcode.length; i ++) {
-//     const command = gcode[i];
-//     if (typeof command === 'string') continue;
-//
-//     const { G, F, X, Y, Z } = command;
-//
-//     if (X || Y || Z) {
-//       if (G === 1) {
-//         positions.push(lastPoint.Y, lastPoint.Z, lastPoint.X);
-//         positions.push(Y, Z, X);
-//
-//         const color = (G === 0) ? COLOR.setHex(0x00ff00) : COLOR.setHSL(F / MAX_SPEED, 0.5, 0.5);
-//         colors.push(color.r, color.g, color.b);
-//         colors.push(color.r, color.g, color.b);
-//       }
-//       lastPoint = { X, Y, Z };
-//     }
-//   }
-//
-//   const geometry = new THREE.BufferGeometry();
-//
-//   geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(positions), 3));
-//   geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(colors), 3));
-//
-//   const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
-//   const linePreview = new THREE.LineSegments(geometry, material);
-//
-//   return linePreview;
-// }
+const MAX_SPEED = 100 * 60;
+function createGcodeGeometry(gcode) {
+  const positions = [];
+  const colors = [];
+
+  let lastPoint = [0, 0, 0];
+  for (let i = 0; i < gcode.length; i ++) {
+    const command = gcode[i];
+    if (typeof command === 'string') continue;
+
+    const { G, F, X, Y, Z } = command;
+
+    if (X || Y || Z) {
+      if (G === 1) {
+        positions.push(lastPoint.Y, lastPoint.Z, lastPoint.X);
+        positions.push(Y, Z, X);
+
+        const color = (G === 0) ? [0, 1, 0] : hslToRgb(F / MAX_SPEED, 0.5, 0.5);
+        colors.push(...color, ...color);
+      }
+      lastPoint = { X, Y, Z };
+    }
+  }
+
+  return {
+    positions: new Float32Array(positions),
+    colors: new Float32Array(colors)
+  };
+}
diff --git a/src/slicer.js b/src/slicer.js
index 2ebba5c..a44a447 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -76,7 +76,9 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
 }
 
 function sliceSync(settings, geometry, openObjectIndexes, constructLinePreview, onProgress) {
-  return slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
+  const gcode = slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
+  if (gcode.linePreview) gcode.linePreview = constructLineGeometry(gcode.linePreview);
+  return gcode;
 }
 
 function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview, onProgress) {
@@ -98,19 +100,7 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
 
           const { gcode } = data;
           gcode.gcode = typedArrayToString(gcode.gcode);
-
-          // if (data.gcode.linePreview) {
-          //   const geometry = new THREE.BufferGeometry();
-          //
-          //   const { position, color } = data.gcode.linePreview;
-          //   geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(position), 3));
-          //   geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(color), 3));
-          //
-          //   const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
-          //   const linePreview = new THREE.LineSegments(geometry, material);
-          //
-          //   data.gcode.linePreview = linePreview;
-          // }
+          if (gcode.linePreview) gcode.linePreview = constructLineGeometry(gcode.linePreview);
 
           resolve(gcode);
           break;
@@ -133,3 +123,14 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
     }, buffers);
   });
 }
+
+function constructLineGeometry(linePreview) {
+  const geometry = new THREE.BufferGeometry();
+
+  geometry.addAttribute('position', new THREE.BufferAttribute(new Float32Array(linePreview.positions), 3));
+  geometry.addAttribute('color', new THREE.BufferAttribute(new Float32Array(linePreview.colors), 3));
+
+  const material = new THREE.LineBasicMaterial({ vertexColors: THREE.VertexColors });
+  const mesh = new THREE.LineSegments(geometry, material);
+  return mesh;
+}
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index e55f9e9..d1a6338 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -19,13 +19,10 @@ self.addEventListener('message', (event) => {
       gcode.gcode = stringToTypedArray(gcode.gcode);
 
       const buffers = [gcode.gcode.buffer];
-
-      // if (gcode.linePreview) {
-      //   const position = gcode.linePreview.geometry.getAttribute('position').array;
-      //   const color = gcode.linePreview.geometry.getAttribute('color').array;
-      //   buffers.push(position.buffer, color.buffer);
-      //   gcode.linePreview = { position, color };
-      // }
+      if (gcode.linePreview) {
+        buffers.push(gcode.linePreview.positions.buffer);
+        buffers.push(gcode.linePreview.colors.buffer);
+      }
 
       self.postMessage({
         message: 'SLICE',

From ca886afa25f87d0da444c8e4bbf722c1792ec6e8 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 11:13:50 +0100
Subject: [PATCH 123/163] rename file

---
 src/sliceActions/applyPrecision.js             |  2 +-
 src/sliceActions/createLines.js                |  2 +-
 src/sliceActions/helpers/GCode.js              |  2 +-
 src/sliceActions/helpers/comb.js               |  2 +-
 .../helpers/{vector2D.js => vector2.js}        | 18 +++++++++---------
 src/sliceActions/intersectionsToShapes.js      |  2 +-
 src/sliceActions/optimizePaths.js              |  2 +-
 src/sliceActions/slicesToGCode.js              |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename src/sliceActions/helpers/{vector2D.js => vector2.js} (74%)

diff --git a/src/sliceActions/applyPrecision.js b/src/sliceActions/applyPrecision.js
index a234eee..6f20854 100644
--- a/src/sliceActions/applyPrecision.js
+++ b/src/sliceActions/applyPrecision.js
@@ -1,4 +1,4 @@
-import { divide } from './helpers/vector2D.js';
+import { divide } from './helpers/vector2.js';
 import { PRECISION } from '../constants.js'
 
 export default function applyPrecision(layers) {
diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index 7dcb51b..2147290 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,4 +1,4 @@
-import { normalize } from './helpers/vector2D.js';
+import { normalize } from './helpers/vector2.js';
 
 function addLine(vertices, lineLookup, lines, a, b, faceIndex) {
   let index;
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 65e36a5..18dfa96 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -1,4 +1,4 @@
-import { scale, distanceTo } from './vector2D.js';
+import { scale, distanceTo } from './vector2.js';
 import { PRECISION, VERSION } from '../../constants.js';
 
 export const MOVE = 'G';
diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js
index 5561bb1..538cda9 100644
--- a/src/sliceActions/helpers/comb.js
+++ b/src/sliceActions/helpers/comb.js
@@ -1,5 +1,5 @@
 import Shape from 'clipper-js';
-import { subtract, add, scale, normalize, dot, length, distanceTo } from './vector2D.js';
+import { subtract, add, scale, normalize, dot, length, distanceTo } from './vector2.js';
 import { PRECISION } from '../../constants.js';
 
 const TOLERANCE = 1 / PRECISION;
diff --git a/src/sliceActions/helpers/vector2D.js b/src/sliceActions/helpers/vector2.js
similarity index 74%
rename from src/sliceActions/helpers/vector2D.js
rename to src/sliceActions/helpers/vector2.js
index a6aac06..bf10575 100644
--- a/src/sliceActions/helpers/vector2D.js
+++ b/src/sliceActions/helpers/vector2.js
@@ -6,17 +6,17 @@ export const add = (a, b) => ({
   x: a.x + b.x,
   y: a.y + b.y
 });
-export const scale = (a, factor) => ({
-  x: a.x * factor,
-  y: a.y * factor
+export const scale = (v, factor) => ({
+  x: v.x * factor,
+  y: v.y * factor
 });
-export const divide = (a, factor) => ({
-  x: a.x / factor,
-  y: a.y / factor
+export const divide = (v, factor) => ({
+  x: v.x / factor,
+  y: v.y / factor
 });
-export const normal = (a) => ({
-  x: -a.y,
-  y: a.x
+export const normal = (v) => ({
+  x: -v.y,
+  y: v.x
 });
 export const equals = (a, b) => a.x === b.x && a.y === b.y;
 export const almostEquals = (a, b) => Math.abs(a.x - b.x) < 0.001 && Math.abs(a.y - b.y) < 0.001;
diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 8630004..5d5646b 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -1,4 +1,4 @@
-import { subtract, normal, normalize, dot, almostEquals } from './helpers/vector2D.js';
+import { subtract, normal, normalize, dot, almostEquals } from './helpers/vector2.js';
 
 export default function intersectionsToShapes(layerPoints, layerFaceIndexes, faces, openObjectIndexes, settings) {
   const layers = [];
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 7f249d9..bdafffe 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -1,4 +1,4 @@
-import { length, distanceTo } from './helpers/vector2D.js';
+import { length, distanceTo } from './helpers/vector2.js';
 import Shape from 'clipper-js';
 
 export default function optimizePaths(slices, settings) {
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index cc379ad..2708f75 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -1,6 +1,6 @@
 import GCode from './helpers/GCode.js';
 import comb from './helpers/comb.js';
-import { divide } from './helpers/vector2D.js';
+import { divide } from './helpers/vector2.js';
 import { PRECISION, Z_OFFSET } from '../constants.js';
 
 const PROFILE_TYPES = ['support', 'innerShell', 'outerShell', 'innerInfill', 'outerInfill', 'brim'];

From caf5e655dafa886199548e828671b0e8956daece Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 11:41:51 +0100
Subject: [PATCH 124/163] calculate face normals in slice process

---
 src/sliceActions/createLines.js     | 77 +++++++++++++++++------------
 src/sliceActions/helpers/vector3.js | 38 ++++++++++++++
 src/slicer.js                       | 14 ++----
 3 files changed, 87 insertions(+), 42 deletions(-)
 create mode 100644 src/sliceActions/helpers/vector3.js

diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index 2147290..f0deb8a 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -1,24 +1,5 @@
-import { normalize } from './helpers/vector2.js';
-
-function addLine(vertices, lineLookup, lines, a, b, faceIndex) {
-  let index;
-  if (typeof lineLookup[`${b}_${a}`] !== 'undefined') {
-    index = lineLookup[`${b}_${a}`];
-  } else {
-    index = lines.length;
-    lineLookup[`${a}_${b}`] = index;
-
-    const start = { x: vertices[a * 3], y: vertices[a * 3 + 1], z: vertices[a * 3 + 2] };
-    const end = { x: vertices[b * 3], y: vertices[b * 3 + 1], z: vertices[b * 3 + 2] };
-
-    const line = { start, end };
-    const faces = [];
-    lines.push({ line, faces });
-  }
-  lines[index].faces.push(faceIndex);
-
-  return index;
-}
+import * as vector2 from './helpers/vector2.js';
+import * as vector3 from './helpers/vector3.js';
 
 export default function createLines(geometry, settings) {
   const faces = [];
@@ -26,16 +7,9 @@ export default function createLines(geometry, settings) {
   const lineLookup = {};
 
   for (let i = 0; i < geometry.objectIndexes.length; i ++) {
-    const i3 = i * 3;
     const objectIndex = geometry.objectIndexes[i];
-    const normal = {
-      x: geometry.faceNormals[i3],
-      y: geometry.faceNormals[i3 + 1],
-      z: geometry.faceNormals[i3 + 2]
-    };
-    const a = geometry.faces[i3];
-    const b = geometry.faces[i3 + 1];
-    const c = geometry.faces[i3 + 2];
+    const { x: a, y: b, z: c } = getVertex(geometry.faces, i);
+    const normal = calculateNormal(geometry.vertices, a, b, c);
 
     // skip faces that point up or down
     if (normal.y > .999 || normal.y < -.999) {
@@ -47,7 +21,7 @@ export default function createLines(geometry, settings) {
     const indexB = addLine(geometry.vertices, lineLookup, lines, b, c, i);
     const indexC = addLine(geometry.vertices, lineLookup, lines, c, a, i);
 
-    const flatNormal = normalize({ x: normal.z, y: normal.x });
+    const flatNormal = vector2.normalize({ x: normal.z, y: normal.x });
     const lineIndexes = [indexA, indexB, indexC];
 
     faces.push({ lineIndexes, flatNormal, objectIndex });
@@ -55,3 +29,44 @@ export default function createLines(geometry, settings) {
 
   return { lines, faces };
 }
+
+function addLine(vertices, lineLookup, lines, a, b, faceIndex) {
+  let index;
+  if (typeof lineLookup[`${b}_${a}`] !== 'undefined') {
+    index = lineLookup[`${b}_${a}`];
+  } else {
+    index = lines.length;
+    lineLookup[`${a}_${b}`] = index;
+
+    const start = getVertex(vertices, a);
+    const end = getVertex(vertices, b);
+
+    const line = { start, end };
+    const faces = [];
+    lines.push({ line, faces });
+  }
+  lines[index].faces.push(faceIndex);
+
+  return index;
+}
+
+function calculateNormal(vertices, a, b, c) {
+  a = getVertex(vertices, a);
+  b = getVertex(vertices, b);
+  c = getVertex(vertices, c);
+
+  const cb = vector3.subtract(c, b);
+  const ab = vector3.subtract(a, b);
+  const normal = vector3.normalize(vector3.cross(cb, ab));
+
+  return normal;
+}
+
+function getVertex(vertices, i) {
+  const i3 = i * 3;
+  return {
+    x: vertices[i3],
+    y: vertices[i3 + 1],
+    z: vertices[i3 + 2]
+  };
+}
diff --git a/src/sliceActions/helpers/vector3.js b/src/sliceActions/helpers/vector3.js
new file mode 100644
index 0000000..7f227de
--- /dev/null
+++ b/src/sliceActions/helpers/vector3.js
@@ -0,0 +1,38 @@
+export const subtract = (a, b) => ({
+  x: a.x - b.x,
+  y: a.y - b.y,
+  z: a.z - b.z
+});
+export const add = (a, b) => ({
+  x: a.x + b.x,
+  y: a.y + b.y,
+  z: a.z + b.z
+});
+export const scale = (v, factor) => ({
+  x: v.x * factor,
+  y: v.y * factor,
+  z: v.z * factor,
+});
+export const divide = (v, factor) => ({
+  x: v.x / factor,
+  y: v.y / factor,
+  z: v.z / factor
+});
+export const cross = (a, b) => ({
+  x: a.y * b.z - a.z * b.y,
+  y: a.z * b.x - a.x * b.z,
+  z: a.x * b.y - a.y * b.x
+});
+export const equals = (a, b) => a.x === b.x && a.y === b.y && a.z === b.z;
+export const almostEquals = (a, b) => Math.abs(a.x - b.x) < 0.001 && Math.abs(a.y - b.y) < 0.001 && Math.abs(a.z - b.z) < 0.001;
+export const length = (v) => Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
+export const distanceTo = (a, b) => length(subtract(a, b));
+export const normalize = (v) => {
+  const l = length(v);
+
+  return {
+    x: v.x / l,
+    y: v.y / l,
+    z: v.z / l
+  };
+};
diff --git a/src/slicer.js b/src/slicer.js
index a44a447..5c28fc8 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -25,7 +25,6 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
   }
 
   if (matrix && matrix.isMatrix4) geometry.applyMatrix(matrix);
-  geometry.computeFaceNormals();
 
   const vertices = geometry.vertices.reduce((array, { x, y, z }, i) => {
     const i3 = i * 3;
@@ -41,13 +40,6 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
     array[i3 + 2] = c;
     return array;
   }, new Uint32Array(geometry.faces.length * 3));
-  const faceNormals = geometry.faces.reduce((array, { normal: { x, y, z } }, i) => {
-    const i3 = i * 3;
-    array[i3] = x;
-    array[i3 + 1] = y;
-    array[i3 + 2] = z;
-    return array;
-  }, new Float32Array(geometry.faces.length * 3));
   const objectIndexes = geometry.faces.reduce((array, { materialIndex }, i) => {
     array[i] = materialIndex;
     return array;
@@ -55,7 +47,7 @@ export function sliceGeometry(settings, geometry, materials, matrix, sync = fals
 
   if (faces.length === 0) throw new Error('Geometry does not contain any data');
 
-  geometry = { vertices, faces, objectIndexes, faceNormals };
+  geometry = { vertices, faces, objectIndexes };
 
   const openObjectIndexes = materials instanceof Array ? materials.map(({ side }) => {
     switch (side) {
@@ -114,8 +106,8 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
       }
     });
 
-    const { vertices, faces, objectIndexes, faceNormals } = geometry;
-    const buffers = [vertices.buffer, faces.buffer, objectIndexes.buffer, faceNormals.buffer];
+    const { vertices, faces, objectIndexes } = geometry;
+    const buffers = [vertices.buffer, faces.buffer, objectIndexes.buffer];
 
     slicerWorker.postMessage({
       message: 'SLICE',

From c835ea12b2138efa5d28675cc19c289ee12321c4 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 14:20:50 +0100
Subject: [PATCH 125/163] don't export internal checkbox

---
 src/interface/FormComponents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index 8cc4185..a4adba4 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -78,7 +78,7 @@ _NumberField.contextTypes = contextTypes;
 _NumberField.propTypes = propTypes;
 export const NumberField = muiThemeable()(_NumberField);
 
-export const _Checkbox = ({ name, muiTheme: { palette }, ...props }, context) => (
+const _Checkbox = ({ name, muiTheme: { palette }, ...props }, context) => (
   <span style={{ display: 'flex', position: 'relative' }}>
     <MaterialUICheckbox
       {...props}

From 2b4941eefb56cb7af0f609de26c56fc8eebafee3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 15:34:46 +0100
Subject: [PATCH 126/163] allow adding doodle3d printer without ip

---
 src/interface/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 1830718..7105f45 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -267,7 +267,7 @@ class Settings extends React.Component {
       this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a name and printer' } } }));
       return;
     }
-    if (printer === 'doodle3d_printer' && !validateIp(ip) && ip !== '') {
+    if (printer === 'doodle3d_printer' && ip !== '' && !validateIp(ip)) {
       this.setState(update(this.state, { addPrinter: { error: { $set: 'Please enter a valid IP adress' } } }));
       return;
     }

From e087fadd80d0e27d7cb9ed29cacc41154b6ec0af Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 17:36:07 +0100
Subject: [PATCH 127/163] cleanup

---
 src/interface/index.js                          |  3 ++-
 src/interface/utils.js                          |  2 +-
 src/sliceActions/addBrim.js                     |  6 +++---
 .../calculateLayersIntersections.js             | 14 +++++---------
 src/sliceActions/createLines.js                 |  8 +++-----
 src/sliceActions/generateInnerLines.js          |  6 +++---
 src/sliceActions/helpers/GCode.js               |  2 +-
 src/sliceActions/helpers/Slice.js               |  2 +-
 src/sliceActions/helpers/comb.js                |  4 ++--
 src/sliceActions/intersectionsToShapes.js       |  5 ++---
 src/sliceActions/shapesToSlices.js              | 17 ++++-------------
 11 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 3f85d5d..feac50a 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -63,7 +63,8 @@ const styles = {
   sliceInfo: {
     margin: '10px 0',
     '& p': {
-      marginBottom: '5px'
+      marginBottom: '5px',
+      fontSize: '11px'
     }
   },
   sliceButtons: {
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 51a99b1..2543225 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -175,7 +175,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
   const centerY = dimensions.y / 2;
 
   const matrix = new THREE.Matrix4().makeTranslation(centerY, 0, centerX).multiply(mesh.matrix);
-  const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
+  const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, true, false, ({ progress }) => {
     updateProgress({
       action: progress.action,
       percentage: (currentStep + progress.done / progress.total) / steps
diff --git a/src/sliceActions/addBrim.js b/src/sliceActions/addBrim.js
index f3e7627..201d0fc 100644
--- a/src/sliceActions/addBrim.js
+++ b/src/sliceActions/addBrim.js
@@ -1,7 +1,7 @@
 import Shape from 'clipper-js';
 import { PRECISION } from '../constants.js';
 
-const offsetOptions = {
+const OFFSET_OPTIONS = {
   jointType: 'jtRound',
   miterLimit: 2.0,
   roundPrecision: 0.25,
@@ -22,7 +22,7 @@ export default function addBrim(slices, settings) {
 
   const brim = firstLayer.parts.reduce((brim, { shape }) => (
     brim.join(shape.offset(nozzleRadius, {
-      ...offsetOptions,
+      ...OFFSET_OPTIONS,
       endType: shape.closed ? 'etClosedPolygon' : 'etOpenRound'
     }))
   ), new Shape([], true)).simplify('pftNonZero');
@@ -30,7 +30,7 @@ export default function addBrim(slices, settings) {
   firstLayer.brim = new Shape([], true);
 
   for (let offset = 0; offset < brimSize; offset += nozzleDiameter) {
-    const brimPart = brim.offset(offset, offsetOptions);
+    const brimPart = brim.offset(offset, OFFSET_OPTIONS);
     firstLayer.brim = firstLayer.brim.join(brimPart);
   }
 }
diff --git a/src/sliceActions/calculateLayersIntersections.js b/src/sliceActions/calculateLayersIntersections.js
index 7dc2a45..1f9622a 100644
--- a/src/sliceActions/calculateLayersIntersections.js
+++ b/src/sliceActions/calculateLayersIntersections.js
@@ -8,7 +8,7 @@ export default function calculateLayersIntersections(lines, settings) {
 
   const numLayers = Math.floor((dimensionsZ - Z_OFFSET) / layerHeight);
 
-  const layerPoints = Array.from(Array(numLayers)).map(() => []);
+  const layerPoints = Array.from(Array(numLayers)).map(() => {});
   const layerFaceIndexes = Array.from(Array(numLayers)).map(() => []);
 
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex ++) {
@@ -33,17 +33,13 @@ export default function calculateLayersIntersections(lines, settings) {
         }
 
         layerPoints[layerIndex][lineIndex] = { x: z, y: x };
-        layerFaceIndexes[layerIndex].push(...faces);
+        for (const faceIndex of faces) {
+          const layerFaceIndex = layerFaceIndexes[layerIndex];
+          if (!layerFaceIndex.includes(faceIndex)) layerFaceIndex.push(faceIndex);
+        }
       }
     }
   }
 
-  for (let i = 0; i < layerFaceIndexes.length; i ++) {
-    layerFaceIndexes[i] = layerFaceIndexes[i].reduce((result, faceIndex) => {
-      if (!result.includes(faceIndex)) result.push(faceIndex);
-      return result;
-    }, []);
-  }
-
   return { layerPoints, layerFaceIndexes };
 }
diff --git a/src/sliceActions/createLines.js b/src/sliceActions/createLines.js
index f0deb8a..9fff900 100644
--- a/src/sliceActions/createLines.js
+++ b/src/sliceActions/createLines.js
@@ -35,18 +35,16 @@ function addLine(vertices, lineLookup, lines, a, b, faceIndex) {
   if (typeof lineLookup[`${b}_${a}`] !== 'undefined') {
     index = lineLookup[`${b}_${a}`];
   } else {
-    index = lines.length;
-    lineLookup[`${a}_${b}`] = index;
-
     const start = getVertex(vertices, a);
     const end = getVertex(vertices, b);
-
     const line = { start, end };
     const faces = [];
+
+    index = lines.length;
+    lineLookup[`${a}_${b}`] = index;
     lines.push({ line, faces });
   }
   lines[index].faces.push(faceIndex);
-
   return index;
 }
 
diff --git a/src/sliceActions/generateInnerLines.js b/src/sliceActions/generateInnerLines.js
index 04e981f..2d7e751 100644
--- a/src/sliceActions/generateInnerLines.js
+++ b/src/sliceActions/generateInnerLines.js
@@ -1,6 +1,6 @@
 import { PRECISION } from '../constants.js'
 
-const offsetOptions = {
+const OFFSET_OPTIONS = {
   jointType: 'jtSquare',
   endType: 'etClosedPolygon',
   miterLimit: 2.0,
@@ -29,7 +29,7 @@ export default function generateInnerLines(slices, settings) {
 
       if (!part.closed) continue;
 
-      const outerLine = part.shape.offset(-nozzleRadius, offsetOptions);
+      const outerLine = part.shape.offset(-nozzleRadius, OFFSET_OPTIONS);
 
       if (outerLine.paths.length === 0) continue;
 
@@ -39,7 +39,7 @@ export default function generateInnerLines(slices, settings) {
       for (let inset = 1; inset < numShells; inset += 1) {
         const offset = inset * nozzleDiameter;
 
-        const shell = outerLine.offset(-offset, offsetOptions);
+        const shell = outerLine.offset(-offset, OFFSET_OPTIONS);
 
         if (shell.paths.length === 0) {
           break;
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 18dfa96..0288cc3 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -10,7 +10,7 @@ export const POSITION_X = 'X';
 export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
-export default class {
+export default class GCode {
   constructor(layerHeight) {
     this._nozzleToFilamentRatio = 1;
     this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
diff --git a/src/sliceActions/helpers/Slice.js b/src/sliceActions/helpers/Slice.js
index 10b22fe..2f5c085 100644
--- a/src/sliceActions/helpers/Slice.js
+++ b/src/sliceActions/helpers/Slice.js
@@ -1,6 +1,6 @@
 import Shape from 'clipper-js';
 
-export default class {
+export default class Slice {
   constructor() {
     this.parts = [];
   }
diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js
index 538cda9..671e8fa 100644
--- a/src/sliceActions/helpers/comb.js
+++ b/src/sliceActions/helpers/comb.js
@@ -45,9 +45,9 @@ export default function comb(outline, start, end) {
 
     if (snappedCombPaths.length === 0) {
       snappedCombPaths.push([start], [end]);
-    } else if (distanceTo(firstPath[0], start) > 1.0) {
+    } else if (distanceTo(firstPath[0], start) > 1.) {
       snappedCombPaths.unshift([start]);
-    } else if (distanceTo(lastPath[lastPath.length - 1], end) > 1.0) {
+    } else if (distanceTo(lastPath[lastPath.length - 1], end) > 1.) {
       snappedCombPaths.push([end]);
     }
 
diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 5d5646b..f7a5c39 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -79,7 +79,7 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         endConnects[pointB] = lineSegment;
 
         if (!shapes[objectIndex]) shapes[objectIndex] = [];
-        const shape = shapes[objectIndex].push(lineSegment);
+        shapes[objectIndex].push(lineSegment);
       }
     }
 
@@ -87,8 +87,6 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
       const shape = shapes[objectIndex].map(lineSegment => lineSegment.map(pointIndex => points[pointIndex]));
       const openShape = openObjectIndexes[objectIndex];
 
-      const lines = [];
-
       const connectPoints = [];
       for (let pathIndex = 0; pathIndex < shape.length; pathIndex ++) {
         const path = shape[pathIndex];
@@ -114,6 +112,7 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         if (shapeEndPoint) connectPoints.push({ point: shapeEndPoint, start: null, end: pathIndex });
       }
 
+      const lines = [];
       while (connectPoints.length !== 0) {
         let { start, end } = connectPoints.pop();
 
diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
index b681a72..9e439cc 100644
--- a/src/sliceActions/shapesToSlices.js
+++ b/src/sliceActions/shapesToSlices.js
@@ -32,21 +32,12 @@ export default function shapesToSlices(shapes, settings) {
 
       slice.add(fillShape, true);
 
-      if (lineShapesClosed.paths.length > 0) {
-        lineShapesClosed = lineShapesClosed.difference(fillShape);
-      }
-      if (lineShapesOpen.paths.length > 0) {
-        lineShapesOpen = lineShapesOpen.difference(fillShape);
-      }
+      if (lineShapesClosed.paths.length > 0) lineShapesClosed = lineShapesClosed.difference(fillShape);
+      if (lineShapesOpen.paths.length > 0) lineShapesOpen = lineShapesOpen.difference(fillShape);
     }
 
-    if (lineShapesClosed.paths.length > 0) {
-      slice.add(lineShapesClosed, false);
-    }
-
-    if (lineShapesOpen.paths.length > 0) {
-      slice.add(lineShapesOpen, false);
-    }
+    if (lineShapesClosed.paths.length > 0) slice.add(lineShapesClosed, false);
+    if (lineShapesOpen.paths.length > 0) slice.add(lineShapesOpen, false);
 
     sliceLayers.push(slice);
   }

From 831398234281c06660c81bfeed80aee3a902f372 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Mon, 12 Feb 2018 23:58:12 +0100
Subject: [PATCH 128/163] slice in worker

---
 src/interface/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 2543225..51a99b1 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -175,7 +175,7 @@ export async function slice(target, name, mesh, settings, updateProgress) {
   const centerY = dimensions.y / 2;
 
   const matrix = new THREE.Matrix4().makeTranslation(centerY, 0, centerX).multiply(mesh.matrix);
-  const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, true, false, ({ progress }) => {
+  const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
     updateProgress({
       action: progress.action,
       percentage: (currentStep + progress.done / progress.total) / steps

From 1434006f9570c037057924f896d51acafbd7de3a Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 13 Feb 2018 00:01:41 +0100
Subject: [PATCH 129/163] fix mapping to object

---
 src/sliceActions/calculateLayersIntersections.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sliceActions/calculateLayersIntersections.js b/src/sliceActions/calculateLayersIntersections.js
index 1f9622a..1d91f51 100644
--- a/src/sliceActions/calculateLayersIntersections.js
+++ b/src/sliceActions/calculateLayersIntersections.js
@@ -8,7 +8,7 @@ export default function calculateLayersIntersections(lines, settings) {
 
   const numLayers = Math.floor((dimensionsZ - Z_OFFSET) / layerHeight);
 
-  const layerPoints = Array.from(Array(numLayers)).map(() => {});
+  const layerPoints = Array.from(Array(numLayers)).map(() => ({}));
   const layerFaceIndexes = Array.from(Array(numLayers)).map(() => []);
 
   for (let lineIndex = 0; lineIndex < lines.length; lineIndex ++) {

From 120b49dfb7fbb709d7485eeeedd28ec990314870 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 13 Feb 2018 16:37:50 +0100
Subject: [PATCH 130/163] fix some edge cases in intersections to shapes

---
 src/sliceActions/intersectionsToShapes.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index f7a5c39..60b841f 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -91,6 +91,8 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
       for (let pathIndex = 0; pathIndex < shape.length; pathIndex ++) {
         const path = shape[pathIndex];
 
+        if (path.length === 2 && almostEquals(path[0], path[1])) continue;
+
         let shapeStartPoint = path[0];
         for (const point of connectPoints) {
           if (almostEquals(point.point, shapeStartPoint)) {

From 793f8100fb982016a8a3d29bda56647c424192f7 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 19 Feb 2018 13:48:55 +0100
Subject: [PATCH 131/163] change order of axis in dimensions preview

---
 src/interface/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index feac50a..4a5f967 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -311,7 +311,7 @@ class Interface extends React.Component {
   calculateDimensions = () => {
     const { scene: { mesh } } = this.state;
     const { x, y, z } = new THREE.Box3().setFromObject(mesh).getSize();
-    this.setState({ objectDimensions: `${Math.round(x)}x${Math.round(y)}x${Math.round(z)}mm` });
+    this.setState({ objectDimensions: `${Math.round(y)}x${Math.round(z)}x${Math.round(x)}mm` });
   };
 
   onDrop = (event) => {

From 3d308e2533bad746f1cd57f8635f5aae0476ef50 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 19 Feb 2018 13:53:18 +0100
Subject: [PATCH 132/163] fix intersections to shapes step

---
 src/sliceActions/intersectionsToShapes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 60b841f..2aaac92 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -91,7 +91,7 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
       for (let pathIndex = 0; pathIndex < shape.length; pathIndex ++) {
         const path = shape[pathIndex];
 
-        if (path.length === 2 && almostEquals(path[0], path[1])) continue;
+        if (almostEquals(path[0], path[path.length - 1])) continue;
 
         let shapeStartPoint = path[0];
         for (const point of connectPoints) {

From 11073532909156790547fd84183e874cf31f1f12 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 19 Feb 2018 13:53:44 +0100
Subject: [PATCH 133/163] lock doodle3d core version

---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 680bf92..e37aa04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
       }
     },
     "@doodle3d/doodle3d-core": {
-      "version": "github:doodle3d/doodle3d-core#4080f0151c2b90c012a8faf53ccd336d01ac20da",
+      "version": "github:doodle3d/doodle3d-core#b9ed59c8d936a205ac3660fe6f23af66228d92bb",
       "requires": {
         "@doodle3d/cal": "0.0.8",
         "@doodle3d/clipper-js": "1.0.10",
@@ -49,7 +49,7 @@
         "fit-curve": "0.1.6",
         "google-fonts-webpack-plugin": "0.4.4",
         "imports-loader": "0.7.1",
-        "jss": "9.6.0",
+        "jss": "9.8.0",
         "keycode": "2.1.9",
         "lodash": "4.17.4",
         "memoizee": "0.3.10",
@@ -76,9 +76,9 @@
       },
       "dependencies": {
         "jss": {
-          "version": "9.6.0",
-          "resolved": "https://registry.npmjs.org/jss/-/jss-9.6.0.tgz",
-          "integrity": "sha512-fnj0UV//VdgxwH0h9pOZljAwFlJMZTAeaDD6u9G0VFMSDwTgdRYxV7+/RZohZYMEVITkgXedHiQHW5ETRVAXkA==",
+          "version": "9.8.0",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.0.tgz",
+          "integrity": "sha512-1E9pn6k1Qd1BxKz845supoedukHuwMeBiqybCQV9l60v8JE7owkZSvVJfjw3wm50SjG1C/ABPtQ8PrGfhfrzLw==",
           "requires": {
             "is-in-browser": "1.1.3",
             "symbol-observable": "1.2.0",
@@ -89,6 +89,9 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
           "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+        },
+        "three-js-csg": {
+          "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
         }
       }
     },
@@ -7800,9 +7803,6 @@
       "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
       "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
     },
-    "three-js-csg": {
-      "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"
-    },
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
diff --git a/package.json b/package.json
index a86ad8d..d20bdf4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@doodle3d/clipper-js": "^1.0.10",
     "@doodle3d/doodle3d-api": "^1.0.5",
-    "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core",
+    "@doodle3d/doodle3d-core": "github:doodle3d/doodle3d-core#0.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "file-saver": "^1.3.3",
     "lodash": "^4.17.4",

From f032d8c267eccc78d8c65d1e011cb0583707ef1d Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 19 Feb 2018 16:26:13 +0100
Subject: [PATCH 134/163] Fix support

#39
---
 src/sliceActions/generateSupport.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 2c8393b..f04ffa7 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -22,16 +22,14 @@ export default function generateSupport(slices, settings) {
 
   let supportArea = new Shape([], true);
 
-  for (let layer = slices.length - 1 - supportDistanceLayers; layer >= supportDistanceLayers; layer --) {
+  for (let layer = slices.length - 1 - supportDistanceLayers; layer >= 0; layer --) {
     const currentLayer = slices[layer + supportDistanceLayers - 1];
     const upSkin = slices[layer + supportDistanceLayers];
     const downSkin = slices[layer - supportDistanceLayers];
 
     const neededSupportArea = upSkin.outline.difference(currentLayer.outline.offset(margin));
 
-    if (neededSupportArea.totalArea() * PRECISION_SQUARED > minArea) {
-      supportArea = supportArea.union(neededSupportArea);
-    }
+    if (neededSupportArea.totalArea() * PRECISION_SQUARED > minArea) supportArea = supportArea.union(neededSupportArea);
     if (downSkin) supportArea = supportArea.difference(downSkin.outline.offset(margin));
 
     const bounds = supportArea.shapeBounds();

From 34a2b6cafc474e6c4d9f96126c541207795603cd Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 19 Feb 2018 18:02:57 +0100
Subject: [PATCH 135/163] remove comma

---
 DOCS.md                             | 80 +++++++++++++++++++++++++++++
 src/sliceActions/helpers/vector3.js |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 DOCS.md

diff --git a/DOCS.md b/DOCS.md
new file mode 100644
index 0000000..4d274a8
--- /dev/null
+++ b/DOCS.md
@@ -0,0 +1,80 @@
+# Doodle3D Slicer
+This document explains how the slice process works.
+
+In this slicer Z is the "up" vector.
+
+Requisites
+ - 2D Vector math
+ - 3D Vector math
+ - 2D Boolean operations (union, difference)
+ - 2D Path offsetting
+
+### Step 0: Preparation
+The first step is to prepare the data for slicing.
+```
+Vertices: Float32Array
+Faces: Uint32Array
+ObjectIndexes: UInt8Array
+OpenObjectIndexes: [...Int]
+Settings:
+  startCode: String
+  endcode: String
+  dimensions:
+    x: Number
+    y: Number
+    z: Number
+  heatedBed: Bool
+  nozzleDiameter: Number
+  filamentThickness: Number
+  temperature: Number
+  bedTemperature: Number
+  layerHeight: Number
+  combing: Bool
+  thickness:
+    top: Number
+    bottom: Number
+    shell: Number
+  retraction:
+    enabled: Bool
+    amount: Number
+    speed: Number
+    minDistance: Number
+  travel:
+    speed: Number
+  support:
+    enabled: Bool
+    minArea: Number
+    distanceY: Number
+    density: Number
+    margin: Number
+    flowRate: Number
+    speed: Number
+  innerShell:
+    flowRate: Number
+    speed: Number
+  outerShell:
+    flowRate: Number
+    speed: Number
+  innerInfill:
+    flowRate: Number
+    speed: Number
+    density: Number
+  outerInfill:
+    flowRate: Number
+    speed: Number
+  brim:
+    size: Number
+    flowRate: Number
+    speed: Number
+  firstLayer:
+    flowRate: Number
+    speed: Number
+```
+ - Vertices: List of points in 3d
+ - Faces: Indexes refering to points in the vertices list that make a triangular surface
+ - ObjectIndexes: Describes of what object each face is part of (important for the generating of 2d shapes)
+ - OpenObjectIndexes: Determines weather a object is open or closed (important for the generating of 2d shapes)
+ - Settings: object containing all the settings for slicing. We go in depth in this object when it's needed
+
+### Step 1: Creating lines
+In this we take the 3d model and look at each surface to extract all individual lines. Note some lines are part of multiple surfaces. In addition we also add some additional data to each line, like the surfaces it is part of we'll also store the 2d normal
diff --git a/src/sliceActions/helpers/vector3.js b/src/sliceActions/helpers/vector3.js
index 7f227de..7d5493e 100644
--- a/src/sliceActions/helpers/vector3.js
+++ b/src/sliceActions/helpers/vector3.js
@@ -11,7 +11,7 @@ export const add = (a, b) => ({
 export const scale = (v, factor) => ({
   x: v.x * factor,
   y: v.y * factor,
-  z: v.z * factor,
+  z: v.z * factor
 });
 export const divide = (v, factor) => ({
   x: v.x / factor,

From c4d8d1136af9494256fe4b5a871fb0bb5b89fcc1 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 12:25:49 +0100
Subject: [PATCH 136/163] use flat shading

---
 src/interface/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 51a99b1..7064a6c 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -42,7 +42,7 @@ export function createScene({ pixelRatio, muiTheme }) {
   const light = new THREE.AmbientLight(0x656565);
   scene.add(light);
 
-  const material = new THREE.MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: THREE.DoubleSide, specular: 0xc5c5c5, shininess: 5 });
+  const material = new THREE.MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: THREE.DoubleSide, specular: 0xc5c5c5, shininess: 5, flatShading: true });
   const mesh = new THREE.Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 

From 16e6e11e2fbf2d238fb4a3afac3a80b57685f42f Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 12:41:00 +0100
Subject: [PATCH 137/163] Fix ignored last line

---
 src/sliceActions/intersectionsToShapes.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 2aaac92..f978918 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -55,6 +55,7 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         if (startConnects[pointB]) {
           if (startConnects[pointB] === lineSegment) {
             delete startConnects[pointB];
+            lineSegment.push(pointB);
           } else {
             lineSegment.push(...startConnects[pointB]);
             endConnects[lineSegment[lineSegment.length - 1]] = lineSegment;
@@ -91,7 +92,10 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
       for (let pathIndex = 0; pathIndex < shape.length; pathIndex ++) {
         const path = shape[pathIndex];
 
-        if (almostEquals(path[0], path[path.length - 1])) continue;
+        if (almostEquals(path[0], path[path.length - 1])) {
+          if (path.some(point => !almostEquals(point, path[0]))) lineShapesClosed.push(path);
+          continue;
+        }
 
         let shapeStartPoint = path[0];
         for (const point of connectPoints) {
@@ -114,7 +118,6 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         if (shapeEndPoint) connectPoints.push({ point: shapeEndPoint, start: null, end: pathIndex });
       }
 
-      const lines = [];
       while (connectPoints.length !== 0) {
         let { start, end } = connectPoints.pop();
 
@@ -126,26 +129,21 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
           line.push(...shape[newPoint.start]);
           connectPoints.splice(connectPoints.indexOf(newPoint), 1);
 
-          if (newPoint.end === start) break;
+          if (newPoint.end !== null && newPoint.end === start) break;
 
           end = newPoint.end;
           start = newPoint.start;
         }
 
-        lines.push(line);
-      }
-
-      if (openShape) {
-        for (const line of lines) {
-          const closed = almostEquals(line[0], line[line.length - 1]);
-          if (closed) {
+        if (openShape) {
+          if (almostEquals(line[0], line[line.length - 1])) {
             lineShapesClosed.push(line);
           } else {
             lineShapesOpen.push(line);
           }
+        } else {
+          fillShapes.push(line);
         }
-      } else {
-        fillShapes.push(...lines);
       }
     }
 

From 8bb97527f484f2540271e006bfe8f8781860290e Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:01:52 +0100
Subject: [PATCH 138/163] Fix incorrect order of points

#41
---
 src/sliceActions/intersectionsToShapes.js | 55 ++++++++++++-----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index f978918..52e6fd4 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -85,7 +85,9 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
     }
 
     for (const objectIndex in shapes) {
-      const shape = shapes[objectIndex].map(lineSegment => lineSegment.map(pointIndex => points[pointIndex]));
+      const shape = shapes[objectIndex]
+        .map(lineSegment => lineSegment.map(pointIndex => points[pointIndex]))
+        .filter(lineSegment => lineSegment.some(i => !almostEquals(lineSegment[0], lineSegment[1])));
       const openShape = openObjectIndexes[objectIndex];
 
       const connectPoints = [];
@@ -93,46 +95,49 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         const path = shape[pathIndex];
 
         if (almostEquals(path[0], path[path.length - 1])) {
-          if (path.some(point => !almostEquals(point, path[0]))) lineShapesClosed.push(path);
+          lineShapesClosed.push(path);
           continue;
         }
 
         let shapeStartPoint = path[0];
-        for (const point of connectPoints) {
-          if (almostEquals(point.point, shapeStartPoint)) {
-            point.start = pathIndex;
-            shapeStartPoint = null;
-            break;
-          }
+        const connectStart = connectPoints.find(({ point }) => almostEquals(point, shapeStartPoint));
+        if (connectStart) {
+          connectStart.start = pathIndex;
+        } else {
+          connectPoints.push({ point: shapeStartPoint, start: pathIndex, end: -1 });
         }
-        if (shapeStartPoint) connectPoints.push({ point: shapeStartPoint, start: pathIndex, end: null });
 
         let shapeEndPoint = path[path.length - 1];
-        for (const point of connectPoints) {
-          if (almostEquals(point.point, shapeEndPoint)) {
-            point.end = pathIndex;
-            shapeEndPoint = null;
-            break;
-          }
+        const connectEnd = connectPoints.find(({ point }) => almostEquals(point, shapeEndPoint));
+        if (connectEnd) {
+          connectEnd.end = pathIndex;
+        } else {
+          connectPoints.push({ point: shapeEndPoint, start: -1, end: pathIndex });
         }
-        if (shapeEndPoint) connectPoints.push({ point: shapeEndPoint, start: null, end: pathIndex });
       }
 
+      connectPoints.sort(({ start }) => start);
+
       while (connectPoints.length !== 0) {
-        let { start, end } = connectPoints.pop();
+        const { start, end } = connectPoints.pop();
 
         const line = [];
-        if (start !== null) line.push(...shape[start]);
+        if (end !== -1) line.push(...shape[end]);
 
-        let newPoint;
-        while (end !== null && (newPoint = connectPoints.find(point => point.start === end))) {
-          line.push(...shape[newPoint.start]);
-          connectPoints.splice(connectPoints.indexOf(newPoint), 1);
+        let next = start;
+        while (true) {
+          const pointIndex = connectPoints.findIndex(point => point.end === next);
+          if (pointIndex === -1) break;
 
-          if (newPoint.end !== null && newPoint.end === start) break;
+          const point = connectPoints[pointIndex];
+          line.push(...shape[point.end]);
 
-          end = newPoint.end;
-          start = newPoint.start;
+          connectPoints.splice(pointIndex, 1);
+
+          if (point.start === -1) break;
+          if (point.start === end) break;
+
+          next = point.start;
         }
 
         if (openShape) {

From b29198edd4a8336240b84ee047c4cd605288e9ab Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:16:33 +0100
Subject: [PATCH 139/163] fix rounding errors

#38
---
 src/sliceActions/slice.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 5b80dd6..611934f 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -10,7 +10,6 @@ import optimizePaths from './optimizePaths.js';
 import shapesToSlices from './shapesToSlices.js';
 import slicesToGCode from './slicesToGCode.js';
 import applyPrecision from './applyPrecision.js';
-import { PRECISION } from '../constants.js';
 import { hslToRgb } from './helpers/color.js';
 // // import removePrecision from './removePrecision.js';
 
@@ -70,7 +69,7 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
   return gcode;
 }
 
-const PRECISION_INVERSE = 1 / PRECISION;
+const PRECISION_INVERSE = 1000;
 function toFixedTrimmed(value) {
   return (Math.round(value * PRECISION_INVERSE) / PRECISION_INVERSE).toString();
 }

From 9a8f96a84465538c35211c3bbc4b54aa23cc4b29 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:17:05 +0100
Subject: [PATCH 140/163] update web pack config

---
 webpack.config.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 8fb2532..157a8d2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -53,7 +53,13 @@ module.exports = {
         use: 'yml-loader'
       }, {
         test: /\.worker\.js$/,
-        use: ['worker-loader', babelLoader]
+        use: [{
+          loader: 'worker-loader',
+          options: {
+            inline: false,
+            name: '[name].js'
+          }
+        }, babelLoader],
       }, {
         test: /\.(png|jpg|gif)$/,
         use: ['url-loader?name=images/[name].[ext]']

From e056b37677cc21fb0987d1984d089a1e7fce5064 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:26:32 +0100
Subject: [PATCH 141/163] rename vars

---
 src/sliceActions/intersectionsToShapes.js | 33 +++++++++++------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 52e6fd4..95d617e 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -100,44 +100,43 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         }
 
         let shapeStartPoint = path[0];
-        const connectStart = connectPoints.find(({ point }) => almostEquals(point, shapeStartPoint));
-        if (connectStart) {
-          connectStart.start = pathIndex;
+        const connectNext = connectPoints.find(({ point }) => almostEquals(point, shapeStartPoint));
+        if (connectNext) {
+          connectNext.next = pathIndex;
         } else {
-          connectPoints.push({ point: shapeStartPoint, start: pathIndex, end: -1 });
+          connectPoints.push({ point: shapeStartPoint, next: pathIndex, previous: -1 });
         }
 
         let shapeEndPoint = path[path.length - 1];
-        const connectEnd = connectPoints.find(({ point }) => almostEquals(point, shapeEndPoint));
-        if (connectEnd) {
-          connectEnd.end = pathIndex;
+        const connectPrevious = connectPoints.find(({ point }) => almostEquals(point, shapeEndPoint));
+        if (connectPrevious) {
+          connectPrevious.previous = pathIndex;
         } else {
-          connectPoints.push({ point: shapeEndPoint, start: -1, end: pathIndex });
+          connectPoints.push({ point: shapeEndPoint, next: -1, previous: pathIndex });
         }
       }
 
-      connectPoints.sort(({ start }) => start);
+      connectPoints.sort(({ previous }) => previous);
 
       while (connectPoints.length !== 0) {
-        const { start, end } = connectPoints.pop();
+        let { next, previous } = connectPoints.pop();
 
         const line = [];
-        if (end !== -1) line.push(...shape[end]);
+        if (previous !== -1) line.push(...shape[previous]);
 
-        let next = start;
         while (true) {
-          const pointIndex = connectPoints.findIndex(point => point.end === next);
+          const pointIndex = connectPoints.findIndex(point => point.previous === next);
           if (pointIndex === -1) break;
 
           const point = connectPoints[pointIndex];
-          line.push(...shape[point.end]);
+          line.push(...shape[point.previous]);
 
           connectPoints.splice(pointIndex, 1);
 
-          if (point.start === -1) break;
-          if (point.start === end) break;
+          if (point.next === -1) break;
+          if (point.next === previous) break;
 
-          next = point.start;
+          next = point.next;
         }
 
         if (openShape) {

From cd8687d148cbc41139c6a70588be19d7456265f3 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:35:03 +0100
Subject: [PATCH 142/163] fix filled shapes

---
 src/sliceActions/intersectionsToShapes.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 95d617e..20049e0 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -95,7 +95,11 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         const path = shape[pathIndex];
 
         if (almostEquals(path[0], path[path.length - 1])) {
-          lineShapesClosed.push(path);
+          if (openShape) {
+            lineShapesClosed.push(path);
+          } else {
+            fillShapes.push(path);
+          }
           continue;
         }
 

From a3f5c398da8367285fba9137c9b6a73de5c4e2eb Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:44:01 +0100
Subject: [PATCH 143/163] fix ordering connect points

---
 src/sliceActions/intersectionsToShapes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sliceActions/intersectionsToShapes.js b/src/sliceActions/intersectionsToShapes.js
index 20049e0..25ba3e2 100644
--- a/src/sliceActions/intersectionsToShapes.js
+++ b/src/sliceActions/intersectionsToShapes.js
@@ -120,7 +120,7 @@ export default function intersectionsToShapes(layerPoints, layerFaceIndexes, fac
         }
       }
 
-      connectPoints.sort(({ previous }) => previous);
+      connectPoints.sort(({ previous }) => -previous);
 
       while (connectPoints.length !== 0) {
         let { next, previous } = connectPoints.pop();

From 229929e4e86f3827876d5e2733706947c1677ef5 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 6 Mar 2018 17:49:39 +0100
Subject: [PATCH 144/163] update docs

---
 DOCS.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/DOCS.md b/DOCS.md
index 4d274a8..39ecb2b 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -10,7 +10,7 @@ Requisites
  - 2D Path offsetting
 
 ### Step 0: Preparation
-The first step is to prepare the data for slicing.
+The first step is to prepare the data for slicing. Most of the model data is mapped into `typed arrays`. This way they can be send to the worker very efficiently (due to the transferable nature of typed arrays).
 ```
 Vertices: Float32Array
 Faces: Uint32Array
@@ -77,4 +77,60 @@ Settings:
  - Settings: object containing all the settings for slicing. We go in depth in this object when it's needed
 
 ### Step 1: Creating lines
-In this we take the 3d model and look at each surface to extract all individual lines. Note some lines are part of multiple surfaces. In addition we also add some additional data to each line, like the surfaces it is part of we'll also store the 2d normal
+In this we take the 3d model and look at each surface to extract all individual lines. Note some lines are part of multiple surfaces. In addition we also add some additional data to each line, like the surfaces it is part of we'll also store the 2d normal.
+
+```
+function calculateNormal(vertices, a, b, c) {
+  a = getVertex(vertices, a);
+  b = getVertex(vertices, b);
+  c = getVertex(vertices, c);
+
+  const cb = vector3.subtract(c, b);
+  const ab = vector3.subtract(a, b);
+  const normal = vector3.normalize(vector3.cross(cb, ab));
+
+  return normal;
+}
+```
+
+In order to extract all unique lines from the model we'll loop through each face of the model.
+
+### Step 2: Calculate Layers Intersections
+This is a fairly straight forward step. We take the lines and calculate on what layers that line will be intersecting. Additinally we calculate the coordinates where the line intersects each layer.
+
+### Step 3: Intersections To Shapes
+### Step 4: Shapes To Slices
+### Step 5: Generate Inner Lines
+### Step 6: Generate Outlines
+### Step 7: Generate Infills
+### Step 8: Generate Support
+### Step 9: AddBrim
+
+```
+let {
+  brim: { size: brimSize },
+  nozzleDiameter
+} = settings;
+
+nozzleDiameter /= PRECISION;
+brimSize /= PRECISION;
+const nozzleRadius = nozzleDiameter / 2;
+
+const [firstLayer] = slices;
+
+const brim = firstLayer.parts.reduce((brim, { shape }) => (
+  brim.join(shape.offset(nozzleRadius, {
+    endType: shape.closed ? 'etClosedPolygon' : 'etOpenRound'
+  }))
+), new Shape([], true)).simplify('pftNonZero');
+
+firstLayer.brim = new Shape([], true);
+
+for (let offset = 0; offset < brimSize; offset += nozzleDiameter) {
+  const brimPart = brim.offset(offset, OFFSET_OPTIONS);
+  firstLayer.brim = firstLayer.brim.join(brimPart);
+}
+```
+
+### Step 10: Optimize Paths
+### Step 11: Slices To GCode

From bc67cab75f9fa9f8e14fe236b4ea593c628c70de Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 11:14:02 +0100
Subject: [PATCH 145/163] Add selected printer query param

@companje
---
 index.js                  |  4 ++--
 src/interface/Settings.js | 46 ++++++++++++++++++++++++++++-----------
 src/interface/index.js    |  4 +++-
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/index.js b/index.js
index 5e02721..7fd587a 100644
--- a/index.js
+++ b/index.js
@@ -32,10 +32,10 @@ jss.createStyleSheet({
   }
 }).attach();
 
-const { file } = queryString.parse(location.search);
+const { file, selectedPrinter } = queryString.parse(location.search);
 
 render((
   <MuiThemeProvider muiTheme={muiTheme}>
-    <Interface fileUrl={file} name="doodle"/>
+    <Interface fileUrl={file} selectedPrinter={selectedPrinter} name="doodle"/>
   </MuiThemeProvider>
 ), document.getElementById('app'));
diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index 7105f45..a5f2f7d 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -72,6 +72,7 @@ const updateLocalStorage = (localStorage) => {
 
 class Settings extends React.Component {
   static propTypes = {
+    selectedPrinter: PropTypes.string,
     classes: PropTypes.objectOf(PropTypes.string),
     onChange: PropTypes.func,
     disabled: PropTypes.bool.isRequired
@@ -89,20 +90,39 @@ class Settings extends React.Component {
     advancedFields: PropTypes.array.isRequired
   };
 
-  state = {
-    localStorage: getLocalStorage(),
-    wifiBoxes: [],
-    addPrinter: {
-      open: false,
-      name: '',
-      printer: '',
-      ip: '',
-      error: null
-    },
-    managePrinter: {
-      open: false
+  constructor(props) {
+    super(props);
+
+    const { selectedPrinter } = this.props;
+
+    const localStorage = getLocalStorage();
+
+    if (selectedPrinter) {
+      const active = Object.entries(localStorage.printers)
+        .map(([key, value]) => ({ key, value }))
+        .find(({ key, value: { ip } }) => ip === selectedPrinter);
+
+      if (active) {
+        localStorage.active = active.key;
+        updateLocalStorage(localStorage);
+      }
     }
-  };
+    this.state = {
+      localStorage,
+      wifiBoxes: [],
+      addPrinter: {
+        open: false,
+        name: '',
+        printer: '',
+        ip: '',
+        error: null
+      },
+      managePrinter: {
+        open: false
+      }
+    };
+  }
+
 
   componentDidMount() {
     const { onChange } = this.props;
diff --git a/src/interface/index.js b/src/interface/index.js
index 4a5f967..0903562 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -106,6 +106,7 @@ const styles = {
 class Interface extends React.Component {
   static propTypes = {
     fileUrl: PropTypes.string,
+    selectedPrinter: PropTypes.string,
     mesh: PropTypes.shape({ isMesh: PropTypes.oneOf([true]) }),
     classes: PropTypes.objectOf(PropTypes.string),
     pixelRatio: PropTypes.number.isRequired,
@@ -332,7 +333,7 @@ class Interface extends React.Component {
   }
 
   render() {
-    const { classes, onCancel } = this.props;
+    const { classes, onCancel, selectedPrinter } = this.props;
     const { isSlicing, progress, showFullScreen, error, objectDimensions, settings } = this.state;
 
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -340,6 +341,7 @@ class Interface extends React.Component {
     const settingsPanel = (
       <div className={classes.settingsBar} style={style}>
         <Settings
+          selectedPrinter={selectedPrinter}
           disabled={isSlicing}
           onChange={this.onChangeSettings}
         />

From e1c4e2c1d40e8e68a79b2734b24f0e38ec4d6a82 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 11:46:50 +0100
Subject: [PATCH 146/163] open printer popup with ip if printer is unknown

---
 src/interface/Settings.js | 78 +++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/interface/Settings.js b/src/interface/Settings.js
index a5f2f7d..f203012 100644
--- a/src/interface/Settings.js
+++ b/src/interface/Settings.js
@@ -90,46 +90,41 @@ class Settings extends React.Component {
     advancedFields: PropTypes.array.isRequired
   };
 
-  constructor(props) {
-    super(props);
+  state = {
+    localStorage: getLocalStorage(),
+    wifiBoxes: [],
+    addPrinter: {
+      open: false,
+      name: '',
+      printer: '',
+      ip: '',
+      error: null
+    },
+    managePrinter: {
+      open: false
+    }
+  };
 
-    const { selectedPrinter } = this.props;
+  componentDidMount() {
+    const { onChange, selectedPrinter } = this.props;
+    const { localStorage } = this.state;
 
-    const localStorage = getLocalStorage();
-
-    if (selectedPrinter) {
-      const active = Object.entries(localStorage.printers)
+    if (selectedPrinter && localStorage.active) {
+      const activePrinter = selectedPrinter && Object.entries(localStorage.printers)
         .map(([key, value]) => ({ key, value }))
         .find(({ key, value: { ip } }) => ip === selectedPrinter);
 
-      if (active) {
-        localStorage.active = active.key;
-        updateLocalStorage(localStorage);
+      if (activePrinter) {
+        const state = this.changeSettings('activePrinter', activePrinter.key);
+        if (onChange) onChange(this.constructSettings(state.localStorage));
+      } else {
+        this.openAddPrinterDialog({ ip: selectedPrinter });
       }
-    }
-    this.state = {
-      localStorage,
-      wifiBoxes: [],
-      addPrinter: {
-        open: false,
-        name: '',
-        printer: '',
-        ip: '',
-        error: null
-      },
-      managePrinter: {
-        open: false
-      }
-    };
-  }
-
-
-  componentDidMount() {
-    const { onChange } = this.props;
-    const { localStorage } = this.state;
-    if (localStorage.active) {
+    } else if (!selectedPrinter && localStorage.active) {
       if (onChange) onChange(this.constructSettings(localStorage));
-    } else {
+    } else if (selectedPrinter && !localStorage.active) {
+      this.openAddPrinterDialog({ ip: selectedPrinter });
+    } else if (!selectedPrinter && !localStorage.active) {
       this.openAddPrinterDialog();
     }
 
@@ -238,6 +233,8 @@ class Settings extends React.Component {
       if (onChange) onChange(this.constructSettings(state.localStorage));
       updateLocalStorage(state.localStorage);
     }
+
+    return state;
   }
 
   getChildContext() {
@@ -357,9 +354,18 @@ class Settings extends React.Component {
     if (onChange) onChange(this.constructSettings(localStorage));
   };
 
-  closeAddPrinterDialog = () => this.setAddPrinterDialog(false);
-  openAddPrinterDialog = () => this.setAddPrinterDialog(true);
-  setAddPrinterDialog = (open) => this.setState({ addPrinter: { ip: '', name: '', printer: '', error: null, open } });
+  closeAddPrinterDialog = (override) => this.setAddPrinterDialog(false, override);
+  openAddPrinterDialog = (override) => this.setAddPrinterDialog(true, override);
+  setAddPrinterDialog = (open, override = {}) => this.setState({
+    addPrinter: {
+      ip: '',
+      name: '',
+      printer: '',
+      error: null,
+      open,
+      ...override
+    }
+  });
 
   closeManagePrinterDialog = () => this.setManagePrinterDialog(false);
   openManagePrinterDialog = () => this.setManagePrinterDialog(true);

From d341cc28c958d86ac66d56ce4b850a5fe89e8134 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 11:52:42 +0100
Subject: [PATCH 147/163] use flat shading

---
 src/interface/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 7064a6c..1db8e1c 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -42,7 +42,7 @@ export function createScene({ pixelRatio, muiTheme }) {
   const light = new THREE.AmbientLight(0x656565);
   scene.add(light);
 
-  const material = new THREE.MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: THREE.DoubleSide, specular: 0xc5c5c5, shininess: 5, flatShading: true });
+  const material = new THREE.MeshPhongMaterial({ color: muiTheme.palette.primary2Color, side: THREE.DoubleSide, specular: 0xc5c5c5, shininess: 5, flatShading: false });
   const mesh = new THREE.Mesh(new THREE.Geometry(), material);
   scene.add(mesh);
 

From c1496674099a7c7949255518e0bb26d332b4f570 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 14:41:42 +0100
Subject: [PATCH 148/163] Only change value of form onblur

---
 src/interface/FormComponents.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js
index a4adba4..1ec24bf 100644
--- a/src/interface/FormComponents.js
+++ b/src/interface/FormComponents.js
@@ -68,10 +68,15 @@ const _NumberField = ({ name, min, max, muiTheme: { palette }, ...props }, conte
     value={_.get(context, name.toString())}
     onChange={(event, value) => {
       value = parseFloat(value);
-      if (typeof min === 'number') value = Math.max(value, min);
-      if (typeof max === 'number') value = Math.min(value, max);
       context.onChange(name, value);
     }}
+    onBlur={() => {
+      const value = _.get(context, name.toString());
+      let newValue = value;
+      if (typeof min === 'number') newValue = Math.max(newValue, min);
+      if (typeof max === 'number') newValue = Math.min(newValue, max);
+      if (newValue !== value) context.onChange(name, newValue);
+    }}
   />
 );
 _NumberField.contextTypes = contextTypes;

From df6e084503ec19d59faad1da9df02d9647eacc70 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Wed, 7 Mar 2018 16:53:45 +0100
Subject: [PATCH 149/163] Update default.yml

---
 src/settings/default.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index 3d46f9e..7aaa6b7 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -1,6 +1,6 @@
 startCode: |-
-  M109 S{printingTemp} ;set target temperature
-  {if heatedBed}M190 S{printingBedTemp} ;set target bed temperature
+  M109 S{temperature} ;set target temperature
+  {if heatedBed}M190 S{bedTemperature} ;set target bed temperature
   G21 ;metric values
   M107 ;start with the fan off
   G28 X0 Y0 ;move X/Y to min endstops

From 38ab39f7de84718a9166e0a0862b099578dcd307 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 18:21:41 +0100
Subject: [PATCH 150/163] add custom actions

---
 index.js               |  5 +--
 src/interface/index.js | 71 +++++++++++++++++++++++++++---------------
 src/interface/utils.js | 32 ++++++++++++++++---
 3 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/index.js b/index.js
index 7fd587a..922f2d2 100644
--- a/index.js
+++ b/index.js
@@ -32,10 +32,11 @@ jss.createStyleSheet({
   }
 }).attach();
 
-const { file, selectedPrinter } = queryString.parse(location.search);
+let { file, selectedPrinter, actions } = queryString.parse(location.search);
+if (actions) actions = JSON.parse(actions);
 
 render((
   <MuiThemeProvider muiTheme={muiTheme}>
-    <Interface fileUrl={file} selectedPrinter={selectedPrinter} name="doodle"/>
+    <Interface actions={actions} fileUrl={file} selectedPrinter={selectedPrinter} name="doodle"/>
   </MuiThemeProvider>
 ), document.getElementById('app'));
diff --git a/src/interface/index.js b/src/interface/index.js
index 0903562..4b2edee 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -113,10 +113,18 @@ class Interface extends React.Component {
     onCancel: PropTypes.func,
     name: PropTypes.string.isRequired,
     muiTheme: PropTypes.object.isRequired,
-    allowDragDrop: PropTypes.bool.isRequired
+    allowDragDrop: PropTypes.bool.isRequired,
+    actions: PropTypes.arrayOf(PropTypes.shape({ type: PropTypes.string }))
   };
 
   static defaultProps = {
+    actions: [{
+      type: 'WIFI_PRINT',
+      title: 'Print over WiFi'
+    }, {
+      type: 'DOWNLOAD',
+      title: 'Download GCode'
+    }],
     pixelRatio: 1,
     name: 'Doodle3D',
     allowDragDrop: true
@@ -223,7 +231,7 @@ class Interface extends React.Component {
     }
   };
 
-  slice = async (target) => {
+  slice = async (action) => {
     const { isSlicing, settings, mesh, scene: { material, mesh: { matrix } } } = this.state;
     const { name } = this.props;
 
@@ -232,7 +240,7 @@ class Interface extends React.Component {
       this.setState({ error: 'please select a printer first' });
       return;
     }
-    if (target === 'WIFI' && !settings.ip) {
+    if (action.target === 'WIFI_PRINT' && !settings.ip) {
       this.setState({ error: 'please connect to a WiFi enabled printer' });
       return;
     }
@@ -249,7 +257,7 @@ class Interface extends React.Component {
 
     try {
       const updateProgres = progress => this.setState({ progress: { ...this.state.progress, ...progress } });
-      await slice(target, name, exportMesh, settings, updateProgres);
+      await slice(action, name, exportMesh, settings, updateProgres);
     } catch (error) {
       this.setState({ error: error.message });
       throw error;
@@ -333,7 +341,7 @@ class Interface extends React.Component {
   }
 
   render() {
-    const { classes, onCancel, selectedPrinter } = this.props;
+    const { classes, onCancel, selectedPrinter, actions } = this.props;
     const { isSlicing, progress, showFullScreen, error, objectDimensions, settings } = this.state;
 
     const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -361,26 +369,39 @@ class Interface extends React.Component {
               <MalyanControl ip={settings.ip} /> :
               <WifiBoxControl ip={settings.ip} />
             ) */}
-            <RaisedButton
-              label="Print"
-              ref="button"
-              primary
-              className={`${classes.button}`}
-              onTouchTap={this.openPopover}
-              disabled={isSlicing}
-            />
-            <Popover
-              open={this.state.popover.open}
-              anchorEl={this.state.popover.element}
-              anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
-              targetOrigin={{horizontal: 'left', vertical: 'bottom'}}
-              onRequestClose={this.closePopover}
-            >
-            <Menu>
-              <MenuItem disabled={!Boolean(settings && settings.ip)} primaryText="Send over WiFi" onTouchTap={() => this.slice('WIFI')} />
-              <MenuItem primaryText="Download GCode" onTouchTap={() => this.slice('DOWNLOAD')} />
-            </Menu>
-            </Popover>
+            {actions.length === 1 ? (
+              <RaisedButton
+                primary
+                label={actions[0].title}
+                onTouchTap={() => this.slice(actions[0])}
+                className={`${classes.button}`}
+                disabled={isSlicing}
+              />
+            ) : (
+              <span>
+                <RaisedButton
+                  label="Print"
+                  ref="button"
+                  primary
+                  className={`${classes.button}`}
+                  onTouchTap={this.openPopover}
+                  disabled={isSlicing}
+                />
+                <Popover
+                  open={this.state.popover.open}
+                  anchorEl={this.state.popover.element}
+                  anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
+                  targetOrigin={{horizontal: 'left', vertical: 'bottom'}}
+                  onRequestClose={this.closePopover}
+                >
+                  <Menu>
+                    {actions.map((action) => (
+                      <MenuItem key={action.type} primaryText={action.title} onTouchTap={() => this.slice(action)} />
+                    ))}
+                  </Menu>
+                </Popover>
+              </span>
+            )}
           </div>
         </div>
       </div>
diff --git a/src/interface/utils.js b/src/interface/utils.js
index 1db8e1c..f527280 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -143,15 +143,15 @@ export function sleep(time) {
 
 const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
 
-export async function slice(target, name, mesh, settings, updateProgress) {
+export async function slice(action, name, mesh, settings, updateProgress) {
   let steps;
   let currentStep = 0;
   let wifiBox;
-  switch (target) {
+  switch (action.target) {
     case 'DOWNLOAD':
       steps = 1;
       break;
-    case 'WIFI':
+    case 'WIFI_PRINT':
       if (settings.printer === 'doodle3d_printer') {
         const { state } = await getMalyanStatus(settings.ip);
         if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
@@ -165,6 +165,9 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       }
       steps = 2;
       break;
+    case 'CUSTOM_UPLOAD':
+      steps = 2;
+      break;
     default:
       throw { message: 'unknown target', code: 1 };
       break;
@@ -185,14 +188,14 @@ export async function slice(target, name, mesh, settings, updateProgress) {
   });
   currentStep ++;
 
-  switch (target) {
+  switch (action.target) {
     case 'DOWNLOAD': {
       const file = new Blob([gcode], { type: 'text/plain' });
       fileSaver.saveAs(file, `${name}.gcode`);
       break;
     }
 
-    case 'WIFI': {
+    case 'WIFI_PRINT': {
       if (settings.printer === 'doodle3d_printer') {
         const body = new FormData();
         const file = new Blob([gcode], { type: 'plain/text' });
@@ -251,6 +254,25 @@ export async function slice(target, name, mesh, settings, updateProgress) {
       }
       break;
     }
+    case 'CUSTOM_UPLOAD': {
+      const body = new FormData();
+      const file = new Blob([`;${JSON.stringify({
+        ...settings,
+        name: `${name}.gcode`,
+        printer: { type: settings.printers, title: printerSettings[settings.printer].title },
+        material: { type: settings.material, title: materialSettings[settings.material].title },
+        quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
+      }).trim()}\n${gcode}`]);
+      body.append('file', file, 'doodle.gcode');
+
+      await fetchProgress(action.url, { method: 'POST', body }, progress => {
+        updateProgress({
+          action: 'Uploading',
+          percentage: (currentStep + progress.loaded / progress.total) / steps
+        });
+      });
+      currentStep ++;
+    }
 
     default:
       throw { message: 'unknown target', code: 1 };

From 5e88cd8c179b1d8d0eef7533671b6c179d805a22 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 19:13:05 +0100
Subject: [PATCH 151/163] fix unknown target

---
 src/interface/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index 4b2edee..fc8e96d 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -114,15 +114,15 @@ class Interface extends React.Component {
     name: PropTypes.string.isRequired,
     muiTheme: PropTypes.object.isRequired,
     allowDragDrop: PropTypes.bool.isRequired,
-    actions: PropTypes.arrayOf(PropTypes.shape({ type: PropTypes.string }))
+    actions: PropTypes.arrayOf(PropTypes.shape({ target: PropTypes.string }))
   };
 
   static defaultProps = {
     actions: [{
-      type: 'WIFI_PRINT',
+      target: 'WIFI_PRINT',
       title: 'Print over WiFi'
     }, {
-      type: 'DOWNLOAD',
+      target: 'DOWNLOAD',
       title: 'Download GCode'
     }],
     pixelRatio: 1,

From 991586dc4c8902e53fe4b121b0b3fdef8ba8bb0e Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Wed, 7 Mar 2018 21:25:15 +0100
Subject: [PATCH 152/163] add missing break

---
 src/interface/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index f527280..4492f5e 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -272,6 +272,7 @@ export async function slice(action, name, mesh, settings, updateProgress) {
         });
       });
       currentStep ++;
+      break;
     }
 
     default:

From f65ab470bbcfab3d736af2c418f2a0343c3a0eeb Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Thu, 15 Mar 2018 14:25:53 +0100
Subject: [PATCH 153/163] fix heatedBed

@companje
---
 src/sliceActions/helpers/GCode.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 0288cc3..2e789d1 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -127,11 +127,11 @@ export default class GCode {
     return this;
   }
 
-  addGCode(gcode, { temperature, bedTemperature, heatedbed }) {
+  addGCode(gcode, { temperature, bedTemperature, heatedBed }) {
     gcode = gcode
       .replace(/{temperature}/gi, temperature)
       .replace(/{bedTemperature}/gi, bedTemperature)
-      .replace(/{if heatedBed}/gi, heatedbed ? '' : ';');
+      .replace(/{if heatedBed}/gi, heatedBed ? '' : ';');
 
     this._addGCode(gcode);
   }

From 5b2c3bb80abf53e7304fde67fadf7179271b5631 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Thu, 15 Mar 2018 14:26:04 +0100
Subject: [PATCH 154/163] fix key property of map function

---
 src/interface/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/interface/index.js b/src/interface/index.js
index fc8e96d..c89de2f 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -396,7 +396,7 @@ class Interface extends React.Component {
                 >
                   <Menu>
                     {actions.map((action) => (
-                      <MenuItem key={action.type} primaryText={action.title} onTouchTap={() => this.slice(action)} />
+                      <MenuItem key={action.target} primaryText={action.title} onTouchTap={() => this.slice(action)} />
                     ))}
                   </Menu>
                 </Popover>

From 763c6e08e8259ddac07b8919881fe6705308ed81 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 19 Mar 2018 16:50:01 +0100
Subject: [PATCH 155/163] Update printer.yml

---
 src/settings/printer.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index 68c93bc..c9f2a68 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -1,10 +1,10 @@
 doodle3d_printer:
   startCode: |-
     M140 S{bedTemperature}
-    M104 S{temperature}
+    {if heatedBed}M104 S{temperature}
     G28
     M109 S{temperature}
-    M190 S{bedTemperature}
+    {if heatedBed}M190 S{bedTemperature}
     G90
     M82
     G1 Z10.0 F6000

From 5a6468baef0c806f3121bd61706a8c354c1dbbc9 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Mon, 26 Mar 2018 10:28:43 +0200
Subject: [PATCH 156/163] fix orientation of printed doodles

#43
---
 src/interface/utils.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 4492f5e..bedfaa8 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -177,7 +177,10 @@ export async function slice(action, name, mesh, settings, updateProgress) {
   const centerX = dimensions.x / 2;
   const centerY = dimensions.y / 2;
 
-  const matrix = new THREE.Matrix4().makeTranslation(centerY, 0, centerX).multiply(mesh.matrix);
+  const matrix = new THREE.Matrix4().makeRotationY(-Math.PI / 2.0)
+    .multiply(new THREE.Matrix4().makeTranslation(centerY, 0, centerX))
+    .multiply(mesh.matrix);
+
   const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
     updateProgress({
       action: progress.action,

From 14c33c02256dfa8079220b043a02676df860b088 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Wed, 28 Mar 2018 09:02:56 +0200
Subject: [PATCH 157/163] Update infill.yml

---
 src/settings/infill.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/settings/infill.yml b/src/settings/infill.yml
index 9bb3055..14cabb6 100644
--- a/src/settings/infill.yml
+++ b/src/settings/infill.yml
@@ -2,6 +2,10 @@
   title: Hollow (0%)
   innerInfill:
     density: 0.0
+10pct:
+  title: Light (10%)
+  innerInfill:
+    density: 10.0
 20pct:
   title: Normal (20%)
   innerInfill:

From 5a51ddf0f69915923b801a36f7c3f8d1190ba349 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Wed, 28 Mar 2018 09:11:04 +0200
Subject: [PATCH 158/163] Update default.yml

---
 src/settings/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/default.yml b/src/settings/default.yml
index 7aaa6b7..8167357 100644
--- a/src/settings/default.yml
+++ b/src/settings/default.yml
@@ -14,7 +14,7 @@ startCode: |-
   G1 F9000
   G90 ;absolute positioning
   M117 Printing Doodle...
-endcode: |-
+endCode: |-
   M107 ;fan off
   G91 ;relative positioning
   G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure

From 5302857b5e7b74d552c2625b6938040beaa45c01 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Wed, 28 Mar 2018 09:14:57 +0200
Subject: [PATCH 159/163] Update printer.yml

---
 src/settings/printer.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index c9f2a68..bd623b7 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -297,6 +297,14 @@ ultimaker2_plus:
   title: Ultimaker 2+
   heatedBed: true
   filamentThickness: 2.85
+  dimensions:
+    x: 223
+    y: 223
+    z: 223
+ultimaker2_plus_extended:
+  title: Ultimaker 2+ Extended
+  heatedBed: true
+  filamentThickness: 2.85
   dimensions:
     x: 223
     y: 223

From ef7ceb7849afe79939c5caa5a7c96d686fe9835a Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Wed, 28 Mar 2018 09:15:42 +0200
Subject: [PATCH 160/163] Update printer.yml

---
 src/settings/printer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/printer.yml b/src/settings/printer.yml
index bd623b7..efd5b61 100644
--- a/src/settings/printer.yml
+++ b/src/settings/printer.yml
@@ -300,7 +300,7 @@ ultimaker2_plus:
   dimensions:
     x: 223
     y: 223
-    z: 223
+    z: 205
 ultimaker2_plus_extended:
   title: Ultimaker 2+ Extended
   heatedBed: true

From 61722a698512c296c3d158b8d0ba4e2a54ecd70a Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Thu, 29 Mar 2018 15:37:29 +0200
Subject: [PATCH 161/163] change order of multiplying matrix

---
 src/interface/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/interface/utils.js b/src/interface/utils.js
index bedfaa8..31fc3dc 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -177,8 +177,8 @@ export async function slice(action, name, mesh, settings, updateProgress) {
   const centerX = dimensions.x / 2;
   const centerY = dimensions.y / 2;
 
-  const matrix = new THREE.Matrix4().makeRotationY(-Math.PI / 2.0)
-    .multiply(new THREE.Matrix4().makeTranslation(centerY, 0, centerX))
+  const matrix = new THREE.Matrix4().makeTranslation(centerY, 0, centerX)
+    .multiply(new THREE.Matrix4().makeRotationY(-Math.PI / 2.0))
     .multiply(mesh.matrix);
 
   const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {

From 701d736cc03114d84462f158894125f3085224fd Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 3 Apr 2018 11:38:40 +0200
Subject: [PATCH 162/163] store gcode as blob instead of string

Less prone to crashing
---
 src/interface/utils.js             | 32 ++++++++++--------------------
 src/sliceActions/helpers/GCode.js  |  7 +++++--
 src/sliceActions/helpers/binary.js | 15 --------------
 src/sliceActions/slice.js          |  3 ++-
 src/sliceActions/slicesToGCode.js  |  2 +-
 src/slicer.js                      |  2 --
 src/slicer.worker.js               |  4 +---
 7 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100644 src/sliceActions/helpers/binary.js

diff --git a/src/interface/utils.js b/src/interface/utils.js
index 31fc3dc..38cea15 100644
--- a/src/interface/utils.js
+++ b/src/interface/utils.js
@@ -181,7 +181,13 @@ export async function slice(action, name, mesh, settings, updateProgress) {
     .multiply(new THREE.Matrix4().makeRotationY(-Math.PI / 2.0))
     .multiply(mesh.matrix);
 
-  const { gcode } = await sliceGeometry(settings, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
+  const { gcode } = await sliceGeometry({
+    ...settings,
+    name: `${name}.gcode`,
+    printer: { type: settings.printers, title: printerSettings[settings.printer].title },
+    material: { type: settings.material, title: materialSettings[settings.material].title },
+    quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
+  }, mesh.geometry, mesh.material, matrix, false, false, ({ progress }) => {
     updateProgress({
       action: progress.action,
       percentage: (currentStep + progress.done / progress.total) / steps
@@ -193,16 +199,14 @@ export async function slice(action, name, mesh, settings, updateProgress) {
 
   switch (action.target) {
     case 'DOWNLOAD': {
-      const file = new Blob([gcode], { type: 'text/plain' });
-      fileSaver.saveAs(file, `${name}.gcode`);
+      fileSaver.saveAs(gcode, `${name}.gcode`);
       break;
     }
 
     case 'WIFI_PRINT': {
       if (settings.printer === 'doodle3d_printer') {
         const body = new FormData();
-        const file = new Blob([gcode], { type: 'plain/text' });
-        body.append('file', file, 'doodle.gcode');
+        body.append('file', gcode, 'doodle.gcode');
 
         // because fetch has no way of retrieving progress we fake progress
         let loaded = 0;
@@ -236,14 +240,7 @@ export async function slice(action, name, mesh, settings, updateProgress) {
           body.append(key, fields[key]);
         }
 
-        const file = new Blob([`;${JSON.stringify({
-          ...settings,
-          name: `${name}.gcode`,
-          printer: { type: settings.printers, title: printerSettings[settings.printer].title },
-          material: { type: settings.material, title: materialSettings[settings.material].title },
-          quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
-        }).trim()}\n${gcode}`]);
-        body.append('file', file, 'doodle.gcode');
+        body.append('file', gcode, 'doodle.gcode');
 
         await fetchProgress(url, { method: 'POST', body }, progress => {
           updateProgress({
@@ -259,14 +256,7 @@ export async function slice(action, name, mesh, settings, updateProgress) {
     }
     case 'CUSTOM_UPLOAD': {
       const body = new FormData();
-      const file = new Blob([`;${JSON.stringify({
-        ...settings,
-        name: `${name}.gcode`,
-        printer: { type: settings.printers, title: printerSettings[settings.printer].title },
-        material: { type: settings.material, title: materialSettings[settings.material].title },
-        quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
-      }).trim()}\n${gcode}`]);
-      body.append('file', file, 'doodle.gcode');
+      body.append('file', gcode, 'doodle.gcode');
 
       await fetchProgress(action.url, { method: 'POST', body }, progress => {
         updateProgress({
diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index 2e789d1..f41e3b5 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -11,9 +11,12 @@ export const POSITION_Y = 'Y';
 export const POSITION_Z = 'Z';
 
 export default class GCode {
-  constructor(layerHeight) {
+  constructor(settings) {
     this._nozzleToFilamentRatio = 1;
-    this._gcode = [`; Generated with Doodle3D Slicer V${VERSION}`];
+    this._gcode = [
+      `; ${JSON.stringify(settings).trim()}`,
+      `; Generated with Doodle3D Slicer V${VERSION}`
+    ];
     this._currentValues = {};
     this._nozzlePosition = { x: 0, y: 0 };
     this._extruder = 0.0;
diff --git a/src/sliceActions/helpers/binary.js b/src/sliceActions/helpers/binary.js
deleted file mode 100644
index 7e6b33a..0000000
--- a/src/sliceActions/helpers/binary.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export function stringToTypedArray(string) {
-  const array = new Uint8Array(string.length);
-  for (let i = 0; i < string.length; i ++) {
-    array[i] = string.charCodeAt(i);
-  }
-  return array;
-}
-
-export function typedArrayToString(array) {
-  let string = '';
-  for (let i = 0; i < array.length; i ++) {
-    string += String.fromCharCode(array[i]);
-  }
-  return string;
-}
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index 611934f..c51582f 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -65,7 +65,8 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
 
   if (constructLinePreview) gcode.linePreview = createGcodeGeometry(gcode.gcode);
 
-  gcode.gcode = gcodeToString(gcode.gcode);
+  gcode.gcode = new Blob([gcodeToString(gcode.gcode)], { type: 'text/plain' });
+
   return gcode;
 }
 
diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
index 2708f75..7a06918 100644
--- a/src/sliceActions/slicesToGCode.js
+++ b/src/sliceActions/slicesToGCode.js
@@ -16,7 +16,7 @@ export default function slicesToGCode(slices, settings) {
     combing
   } = settings;
 
-  const gcode = new GCode();
+  const gcode = new GCode(settings);
   gcode.updateLayerHeight(Z_OFFSET, nozzleDiameter, filamentThickness)
 
   if (settings.startCode) gcode.addGCode(settings.startCode, settings);
diff --git a/src/slicer.js b/src/slicer.js
index 5c28fc8..b651aec 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import slice from './sliceActions/slice.js';
 import SlicerWorker from './slicer.worker.js';
-import { typedArrayToString } from './sliceActions/helpers/binary.js';
 
 export function sliceMesh(settings, mesh, sync = false, constructLinePreview = false, onProgress) {
   if (!mesh || !mesh.isMesh) {
@@ -91,7 +90,6 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
           slicerWorker.terminate();
 
           const { gcode } = data;
-          gcode.gcode = typedArrayToString(gcode.gcode);
           if (gcode.linePreview) gcode.linePreview = constructLineGeometry(gcode.linePreview);
 
           resolve(gcode);
diff --git a/src/slicer.worker.js b/src/slicer.worker.js
index d1a6338..a2fdcbc 100644
--- a/src/slicer.worker.js
+++ b/src/slicer.worker.js
@@ -1,6 +1,5 @@
 import 'core-js'; // polyfills
 import slice from './sliceActions/slice.js';
-import { stringToTypedArray } from './sliceActions/helpers/binary.js';
 
 const onProgress = progress => {
   self.postMessage({
@@ -16,9 +15,8 @@ self.addEventListener('message', (event) => {
       const { settings, geometry, constructLinePreview, openObjectIndexes } = data;
 
       const gcode = slice(settings, geometry, openObjectIndexes, constructLinePreview, onProgress);
-      gcode.gcode = stringToTypedArray(gcode.gcode);
 
-      const buffers = [gcode.gcode.buffer];
+      const buffers = [];
       if (gcode.linePreview) {
         buffers.push(gcode.linePreview.positions.buffer);
         buffers.push(gcode.linePreview.colors.buffer);

From 6be129192341ce07ad8ba36a3b49a0024de3b125 Mon Sep 17 00:00:00 2001
From: Casper Lamboo <casperlamboo@gmail.com>
Date: Tue, 3 Apr 2018 11:38:49 +0200
Subject: [PATCH 163/163] cleanup

---
 src/sliceActions/helpers/GCode.js |  2 +-
 src/sliceActions/slice.js         | 22 +++++++---------------
 src/slicer.js                     |  4 +---
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/sliceActions/helpers/GCode.js b/src/sliceActions/helpers/GCode.js
index f41e3b5..aa7a04f 100644
--- a/src/sliceActions/helpers/GCode.js
+++ b/src/sliceActions/helpers/GCode.js
@@ -38,7 +38,7 @@ export default class GCode {
   turnFanOn(fanSpeed) {
     this._isFanOn = true;
 
-    const gcode = { [M_COMMAND]: 106 }
+    const gcode = { [M_COMMAND]: 106 };
     if (typeof fanSpeed !== 'undefined') gcode[FAN_SPEED] = fanSpeed;
 
     this._addGCode(gcode);
diff --git a/src/sliceActions/slice.js b/src/sliceActions/slice.js
index c51582f..e56b678 100644
--- a/src/sliceActions/slice.js
+++ b/src/sliceActions/slice.js
@@ -14,19 +14,11 @@ import { hslToRgb } from './helpers/color.js';
 // // import removePrecision from './removePrecision.js';
 
 export default function(settings, geometry, openObjectIndexes, constructLinePreview, onProgress) {
-  const totalStages = 11;
-  let current = -1;
-  const updateProgress = (action) => {
-    current ++;
-    if (typeof onProgress !== 'undefined') {
-      onProgress({
-        progress: {
-          done: current,
-          total: totalStages,
-          action
-        }
-      });
-    }
+  const total = 11;
+  let done = -1;
+  const updateProgress = action => {
+    done ++;
+    if (onProgress) onProgress({ progress: { done, total, action } });
   };
 
   updateProgress('Constructing unique lines from geometry');
@@ -70,9 +62,9 @@ export default function(settings, geometry, openObjectIndexes, constructLinePrev
   return gcode;
 }
 
-const PRECISION_INVERSE = 1000;
+const PRECISION = 1000;
 function toFixedTrimmed(value) {
-  return (Math.round(value * PRECISION_INVERSE) / PRECISION_INVERSE).toString();
+  return (Math.round(value * PRECISION) / PRECISION).toString();
 }
 
 function gcodeToString(gcode) {
diff --git a/src/slicer.js b/src/slicer.js
index b651aec..0f77d18 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -96,9 +96,7 @@ function sliceAsync(settings, geometry, openObjectIndexes, constructLinePreview,
           break;
         }
         case 'PROGRESS': {
-          if (typeof onProgress !== 'undefined') {
-            onProgress(data);
-          }
+          if (typeof onProgress !== 'undefined') onProgress(data);
           break;
         }
       }