Merge pull request #135 from Microsoft/dev

Version 0.7.1
microsoft · Apr 9, 2016 · c8d0d9b · c8d0d9b
2 parents f7473f7 + e20dd66
commit c8d0d9b
Show file tree

Hide file tree

Showing 34 changed files with 10,663 additions and 1,315 deletions.
diff --git a/archive/browser.0.7.0.maker.js b/archive/browser.0.7.0.maker.js
diff --git a/archive/browser.0.7.1.maker.js b/archive/browser.0.7.1.maker.js
diff --git a/archive/node.0.7.0.maker.js b/archive/node.0.7.0.maker.js
diff --git a/archive/node.0.7.1.maker.js b/archive/node.0.7.1.maker.js
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
   "main": "index.js",
   "scripts": {
@@ -25,10 +25,20 @@
     "2D",
     "vector",
     "drawing",
+    "path",
+    "arc",
+    "circle",
+    "line",
+    "outline",
+    "kerf",
+    "shape",
+    "geometry",
+    "trigonometry",
     "SVG",
     "DXF",
     "CNC",
-    "Laser cutter",
+    "laser",
+    "cutter",
     "Water jet"
   ],
   "author": "Dan Marshall / Microsoft Corporation",

diff --git a/playground/export-format.js.map b/playground/export-format.js.map
diff --git a/playground/index.html b/playground/index.html
@@ -48,6 +48,7 @@
     <script src="../src/core/angle.js"></script>
     <script src="../src/core/point.js"></script>
     <script src="../src/core/units.js"></script>
+    <script src="../src/core/equal.js"></script>
     <script src="../src/core/measure.js"></script>
     <script src="../src/core/path.js"></script>
     <script src="../src/core/break.js"></script>

diff --git a/playground/playground.js b/playground/playground.js
diff --git a/playground/playground.js.map b/playground/playground.js.map
diff --git a/playground/pointer.js b/playground/pointer.js
diff --git a/playground/pointer.js.map b/playground/pointer.js.map
diff --git a/playground/require-iframe.js b/playground/require-iframe.js
diff --git a/playground/require-iframe.js.map b/playground/require-iframe.js.map