815 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Peter Uithoven	d3038d87d7	Adding polyfills	2017-09-07 12:55:56 +02:00
casperlamboo	24a100fbb1	Merge branch 'develop'	2017-08-25 15:36:52 +02:00
casperlamboo	d0f3137335	Merge branch 'master' into develop	2017-08-25 15:36:33 +02:00
casperlamboo	740d9d53ca	fix combing	2017-08-25 15:35:38 +02:00
casperlamboo	b0341ec8db	add combing test example	2017-08-24 10:55:58 +02:00
casperlamboo	cb61566c08	update comb code	2017-08-24 10:55:36 +02:00
casperlamboo	12a0eadaf4	update example	2017-08-17 16:13:30 +02:00
casperlamboo	1afbe54dc7	update combing	2017-08-17 16:13:21 +02:00
casperlamboo	65472890eb	basic implementation of comb	2017-08-11 18:54:04 +02:00
casperlamboo	4ededa4dfe	add duration and filament usage	2017-08-03 00:17:34 +02:00
Simon Voordouw	7e55b95822	Merge branch 'develop'	2017-08-01 14:36:44 +02:00
casperlamboo	9363fe58af	actually edit parts array	2017-08-01 14:24:15 +02:00
casperlamboo	b566a387c6	remove parts that don't contain shells	2017-08-01 13:58:44 +02:00
peteruithoven	0c727dd16c	Disable public publish to npm	2017-07-31 10:31:26 +02:00
casperlamboo	48f2cef965	Merge branch 'develop'	2017-07-28 15:13:01 +02:00
casperlamboo	484a6413a3	Merge branch 'feature/updated-settings' into develop	2017-07-28 15:11:09 +02:00
casperlamboo	ab4427e818	differentiate between open lines and closed lines for non filled paths	2017-07-28 15:02:24 +02:00
casperlamboo	53bd335d7f	fix settings	2017-07-28 12:17:40 +02:00
casperlamboo	72db7105fb	combine interlines and outline into shell	2017-07-28 12:13:53 +02:00
casperlamboo	d380db1d7a	remove log	2017-07-28 11:21:51 +02:00
casperlamboo	39f29eb489	separate inner fill and outer fill	2017-07-28 11:05:48 +02:00
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