Merge branch 'babel' into develop

src/index.js

@@ -1,15 +1,14 @@
 import { sliceGeometry, sliceMesh } from './slicer.js';
-import baseSettings from './settings/default.yml!text';
-import printerSettings from './settings/printer.yml!text';
-import materialSettings from './settings/material.yml!text';
-import qualitySettings from './settings/quality.yml!text';
-import yaml from 'js-yaml';
+import baseSettings from './settings/default.yml';
+import printerSettings from './settings/printer.yml';
+import materialSettings from './settings/material.yml';
+import qualitySettings from './settings/quality.yml';
 
 const defaultSettings = {
-  base: yaml.safeLoad(baseSettings),
-  printer: yaml.safeLoad(printerSettings),
-  material: yaml.safeLoad(materialSettings),
-  quality: yaml.safeLoad(qualitySettings)
+  base: baseSettings,
+  printer: printerSettings,
+  material: materialSettings,
+  quality: qualitySettings
 };
 
 export {

src/sliceActions/addBrim.js

@@ -1,4 +1,4 @@
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 import { PRECISION } from '../constants.js';
 
 const offsetOptions = {

src/sliceActions/generateInfills.js

@@ -1,6 +1,6 @@
 import { PRECISION } from '../constants.js'
 import getFillTemplate from './getFillTemplate.js';
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default function generateInfills(slices, settings) {
   let {

src/sliceActions/generateOutlines.js

@@ -1,4 +1,4 @@
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default function calculateOutlines(slices, settings) {
   for (let layer = 0; layer < slices.length; layer ++) {

src/sliceActions/generateSupport.js

@@ -1,5 +1,5 @@
 import getFillTemplate from './getFillTemplate.js';
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 import { PRECISION } from '../constants.js';
 
 export default function generateSupport(slices, settings) {

src/sliceActions/getFillTemplate.js

@@ -1,4 +1,4 @@
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default function getFillTemplate(bounds, size, even, uneven) {
   const paths = [];

src/sliceActions/helpers/Slice.js

@@ -1,4 +1,4 @@
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default class {
   constructor() {

src/sliceActions/intersectionsToShapes.js

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default function intersectionsToShapes(layerIntersectionIndexes, layerIntersectionPoints, lines, settings) {
   const layers = [];

src/sliceActions/optimizePaths.js

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 
 export default function optimizePaths(slices, settings) {
   const start = new THREE.Vector2(0, 0);

src/sliceActions/shapesToSlices.js

@@ -1,4 +1,4 @@
-import Shape from 'Doodle3D/clipper-js';
+import Shape from 'clipper-js';
 import Slice from './helpers/Slice.js';
 
 import { CLEAN_DELTA, PRECISION } from '../constants.js';

src/slicer.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import slice from './sliceActions/slice.js';
-import SlicerWorker from './slicerWorker.js!worker';
+import SlicerWorker from './slicer.worker.js';
 
 export function sliceMesh(settings, mesh, sync = false, onProgress) {
   if (typeof mesh === 'undefined' || !mesh.isMesh) {