Commit Graph

544 Commits

Author SHA1 Message Date
casperlamboo
a19ffbffab merge vertices of example 2017-07-28 10:48:46 +02:00
casperlamboo
f390f1cc7c Merge branch 'develop' 2017-07-27 18:53:37 +02:00
casperlamboo
138a1faa7e Merge branch 'develop' into feature/updated-settings
# Conflicts:
#	src/sliceActions/helpers/GCode.js
2017-07-27 18:33:52 +02:00
casperlamboo
9805991d9f use new settings
#25
2017-07-27 18:33:25 +02:00
casperlamboo
bcf62c71ec remove settings from gcode class 2017-07-27 18:20:08 +02:00
casperlamboo
9bc832fcdd remove infillOverlap refference 2017-07-27 18:05:09 +02:00
casperlamboo
eb6747a49c Merge branch 'develop' 2017-07-27 16:48:34 +02:00
casperlamboo
b8b67e664b Fix extruder calculation 2017-07-27 16:47:36 +02:00
casperlamboo
34f6a91db9 remove unnecessary check 2017-07-27 14:48:15 +02:00
casperlamboo
bcfbe99579 remove overlap setting 2017-07-27 12:42:14 +02:00
casperlamboo
ccc88bdb77 pre calculate bounding boxes 2017-07-27 10:35:30 +02:00
casperlamboo
4304f7373d add comment
@peteruithoven I was wrong about the less then :(
2017-07-25 14:36:26 +02:00
casperlamboo
2304560a13 Revert "Fix generate inner lines"
This reverts commit b62e3b5cb8.
2017-07-25 14:34:12 +02:00
casperlamboo
ee83f69647 Merge branch 'develop' 2017-07-25 14:20:33 +02:00
casperlamboo
b62e3b5cb8 Fix generate inner lines
Use correct number of shells
2017-07-25 14:19:26 +02:00
casperlamboo
1ee1321859 Merge branch 'master' into develop 2017-07-24 17:57:37 +02:00
casperlamboo
78c1718e6e upgrade version 2017-07-24 17:56:59 +02:00
casperlamboo
23948d9ddc remove old clipper-js 2017-07-24 17:56:32 +02:00
casperlamboo
2abbd6d325 Merge branch 'develop' 2017-07-24 17:50:05 +02:00
casperlamboo
4f50ccb088 version bumb 2017-07-24 17:47:13 +02:00
casperlamboo
a00773a2c9 use @doodle3d/clipper-js 2017-07-24 17:47:03 +02:00
casperlamboo
3c08a4f47c Merge branch 'master' into develop 2017-07-24 17:15:33 +02:00
peteruithoven
0f078614b1 Merge remote-tracking branch 'origin/master' 2017-07-24 16:00:41 +02:00
peteruithoven
e39d02abbd Merge branch 'develop' 2017-07-24 16:00:15 +02:00
peteruithoven
d1849cb8af version bump 2017-07-24 16:00:02 +02:00
peteruithoven
e723db92a0 Merge branch 'develop' 2017-07-24 15:58:27 +02:00
peteruithoven
b366861326 Merge branch 'babel' into develop 2017-07-24 15:52:27 +02:00
peteruithoven
46dd12d6ec Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 15:50:44 +02:00
casperlamboo
0ad8de8c80 simplify code 2017-07-24 15:45:18 +02:00
casperlamboo
4a61164af9 Terminate web worker on error 2017-07-24 15:40:54 +02:00
casperlamboo
cb465b9eee Throw error when provided mesh is empty
@peteruithoven
2017-07-24 15:40:39 +02:00
casperlamboo
8b475d8e4b typo 2017-07-24 13:01:22 +02:00
casperlamboo
c07a0b81c2 update git ignore 2017-07-24 13:01:16 +02:00
peteruithoven
f039b92802 Prepare script 2017-07-20 22:34:36 +02:00
peteruithoven
45a3c54112 Adding webpack-dev-server dependency 2017-07-20 16:59:33 +02:00
peteruithoven
d718646e77 Using better yml-loader 2017-07-20 16:58:42 +02:00
peteruithoven
1a002fce9d removed jspm.config.js 2017-07-20 16:32:55 +02:00
peteruithoven
6744df1779 Fixed simple example 2017-07-20 16:32:48 +02:00
peteruithoven
0f4434330b Lowercasing slicer.js 2017-07-20 16:25:02 +02:00
peteruithoven
541d205a2f Merge branch 'develop' into babel 2017-07-20 16:24:14 +02:00
peteruithoven
788cd3d476 Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 16:22:11 +02:00
peteruithoven
9b979acbd0 Ignore higher .babelrc file in example 2017-07-20 16:14:01 +02:00
peteruithoven
8d8be75dd6 Removing doodle3d-slicer dep from example 2017-07-20 16:13:46 +02:00
peteruithoven
c99489e5d0 Publish under doodle3d npm org 2017-07-20 16:13:20 +02:00
peteruithoven
167c2c67ca simple example fixed 2017-07-20 12:12:25 +02:00
peteruithoven
566c80f6e8 Adding three dependency 2017-07-20 12:09:23 +02:00
peteruithoven
fa1ae069bf Removing jspm specific loader specification 2017-07-20 11:54:49 +02:00
peteruithoven
f330aad040 Clipper-js dependency 2017-07-20 11:51:48 +02:00
peteruithoven
a0747d6db2 Include settings in build step 2017-07-20 11:42:46 +02:00
peteruithoven
02b1f080fb Assumming package user configured loaders 2017-07-20 11:34:47 +02:00