7343 commits

Author	SHA1	Message	Date
Jack Ha	aa691033e0	Added Not Supported profiles for incompatible materials. CURA-3510	2017-03-16 16:01:18 +01:00
Lipu Fei	e00c68344a	CURA-3495 open project/models in one dialog	2017-03-16 13:37:06 +01:00
Lipu Fei	ea16f967d7	Fix code styling	2017-03-16 13:37:06 +01:00
Jaime van Kessel	a7b5879263	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 13:18:41 +01:00
Jaime van Kessel	efce0696bd	Recently activated material can no longer be removed ... CURA-3147	2017-03-16 13:11:51 +01:00
Tim Kuipers	36420070fa	JSOn fix: more description on support_bottom_stair_step_height (CURA-3380)	2017-03-16 13:02:50 +01:00
Jaime van Kessel	134425db90	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 11:27:54 +01:00
Jaime van Kessel	1f734d5245	Disabled the start_layers_at_same_position setting	2017-03-16 11:21:08 +01:00
Jaime van Kessel	6da6ae1b9e	start_x and start_y are now settable per extruder	2017-03-16 11:19:44 +01:00
Jaime van Kessel	5bcfba0f17	Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)" ... This reverts commit 1482c27b21.	2017-03-16 11:16:55 +01:00
Jaime van Kessel	ad7752bb16	Revert "Updated version of superdraft and verydraft. CURA-3479" ... This reverts commit 62de4f9ec6.	2017-03-16 11:16:02 +01:00
Jaime van Kessel	0c1829af1e	Revert "Upgrade built-in instance containers" ... This reverts commit b162be4df8.	2017-03-16 11:15:20 +01:00
Tim Kuipers	9302f4e9c6	JSON feat: support_bottom_stair_step_width (CURA-3380)	2017-03-16 11:14:53 +01:00
Tim Kuipers	999e59be66	fix: can now insert negative mold angle values (CURA-3512)	2017-03-15 16:21:42 +01:00
Tim Kuipers	09855bc21c	fix: 90 mold angle now possible (CURA-3512)	2017-03-15 15:12:08 +01:00
Jack Ha	f918a978b2	Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390	2017-03-15 14:29:59 +01:00
Jaime van Kessel	6cc0bd893f	Save as now defaults to 3mf ... CURA-3496	2017-03-15 09:57:50 +01:00
Jaime van Kessel	48cba91b16	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-15 09:27:08 +01:00
Jaime van Kessel	138c3db26f	Preferred mimetype is now used when saving to local or removable drive ... CURA-3496	2017-03-15 09:23:47 +01:00
Ghostkeeper	c52649a91f	Merge branch 'patch-3' of https://github.com/probonopd/Cura into probonopd-patch-3	2017-03-15 09:13:33 +01:00
Jack Ha	132b6aa9d7	Merge branch '2.5'	2017-03-15 09:10:49 +01:00
probonopd	9dbb7fcc15	Update as per discussion in https://github.com/Ultimaker/Cura/pull/1350	2017-03-14 18:31:58 +01:00
jack	284e620da2	Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5 ... Version Upgrade 2.4 to 2.5	2017-03-14 16:05:43 +01:00
jack	056c9dd362	Merge pull request #1532 from Ultimaker/feature_version_upgrade_2.5_tests ... Version Upgrade 2.4 to 2.5 tests	2017-03-14 16:05:36 +01:00
MaukCC	35c0f3ca74	Update cartesio.def.json	2017-03-14 15:05:20 +01:00
MaukCC	37d7cd989b	Create draft.inst.cfg	2017-03-14 15:03:52 +01:00
MaukCC	4620187fdc	Update extra_coarse.inst.cfg	2017-03-14 15:03:05 +01:00
MaukCC	de2fd03057	Update coarse.inst.cfg	2017-03-14 15:02:49 +01:00
MaukCC	5428a29a28	Update cartesio.def.json	2017-03-14 14:44:56 +01:00
MaukCC	7acf26ebe7	Update normal.inst.cfg	2017-03-14 14:29:11 +01:00
MaukCC	3698e2fca6	Update low.inst.cfg	2017-03-14 14:28:57 +01:00
MaukCC	880f47044d	Update high.inst.cfg	2017-03-14 14:28:38 +01:00
MaukCC	f7b495ce2a	Update extra_coarse.inst.cfg	2017-03-14 14:28:22 +01:00
MaukCC	8b7d66608a	Update coarse.inst.cfg	2017-03-14 14:28:09 +01:00
MaukCC	4c5e0614d8	Update coarse.inst.cfg	2017-03-14 14:00:58 +01:00
MaukCC	7ad6356256	Update extra_coarse.inst.cfg	2017-03-14 14:00:38 +01:00
MaukCC	302627639d	Update high.inst.cfg	2017-03-14 13:59:53 +01:00
MaukCC	b5a188ef78	Update low.inst.cfg	2017-03-14 13:59:28 +01:00
MaukCC	e1a3f16da7	Update normal.inst.cfg	2017-03-14 13:59:03 +01:00
Jack Ha	62de4f9ec6	Updated version of superdraft and verydraft. CURA-3479	2017-03-14 13:09:07 +01:00
MaukCC	44269d4ede	Update cartesio_0.25.inst.cfg	2017-03-14 12:21:09 +01:00
MaukCC	88fa6eeb2a	Update cartesio_0.4.inst.cfg	2017-03-14 12:18:51 +01:00
MaukCC	803aaf57fb	Update cartesio_0.8.inst.cfg	2017-03-14 12:17:30 +01:00
Lipu Fei	97b943736b	Use translation for text in keep/discard profile dialog	2017-03-14 11:59:51 +01:00
Jack Ha	0a398738b7	Merge branch '2.5' into feature_version_upgrade_2.5	2017-03-14 11:18:14 +01:00
Tim Kuipers	a46e84939b	JSON fix: better mold angle warning (CURA-3512)	2017-03-13 18:07:31 +01:00
Tim Kuipers	85356d621c	lil default (CURA-3512)	2017-03-13 18:00:51 +01:00
Tim Kuipers	4294a162e6	lil typo fix (CURA-3512)	2017-03-13 17:39:04 +01:00
Ghostkeeper	9b7f054d32	Merge branch '2.5'	2017-03-13 17:23:59 +01:00
Tim Kuipers	914aa89711	feat: model to mold (CURA-3512)	2017-03-13 17:19:29 +01:00