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
..
models	remove stl loader	2017-07-18 10:21:37 +02:00
stl	remove stl's and add json files	2017-07-18 10:22:26 +02:00
generateRawData.js	replace tabs with spaces	2017-06-22 13:21:19 +02:00
index.html	add save example	2017-06-22 13:22:17 +02:00
main.css	update slicer viewer	2017-06-22 13:22:17 +02:00
save.html	add save example	2017-06-22 13:22:17 +02:00
save.js	Merge remote-tracking branch 'origin/feature/split-settings' into develop	2017-07-18 11:26:11 +02:00
SlicerViewer.js	remove unused import	2017-06-22 13:22:17 +02:00
viewer.html	add save example	2017-06-22 13:22:17 +02:00
viewer.js	add save example	2017-06-22 13:22:17 +02:00