casperlamboo
|
622be82706
|
Merge remote-tracking branch 'origin/feature/split-settings' into develop
# Conflicts:
# example/save.js
# example/viewer.js
# jspm.config.js
# package.json
# src/GCode.js
# src/Slicer.js
# src/index.js
# src/sliceActions/addBrim.js
# src/sliceActions/calculateLayersIntersections.js
# src/sliceActions/createLines.js
# src/sliceActions/detectOpenClosed.js
# src/sliceActions/generateInfills.js
# src/sliceActions/generateInnerLines.js
# src/sliceActions/generateSupport.js
# src/sliceActions/intersectionsToShapes.js
# src/sliceActions/removePrecision.js
# src/sliceActions/slice.js
|
2017-07-18 11:26:11 +02:00 |
|