8646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	57e6c031aa	UM2Go no longer shows olson block dialog ... CURA-3742	2017-05-09 13:18:34 +02:00
Jack Ha	492d051ebc	Merge branch 'master' of github.com:Ultimaker/Cura	2017-05-09 13:15:39 +02:00
Lipu Fei	acde348c6d	Use ConfigParser hack to replace connect_signals=False hack ... CURA-3756	2017-05-09 13:07:42 +02:00
Jack Ha	0d76ce72b0	Add comments CURA-3756	2017-05-09 13:07:42 +02:00
Lipu Fei	711b493ebf	Fix code style	2017-05-09 13:07:42 +02:00
Lipu Fei	3e6d4b9230	document why no signals connecting in project file pre-read ... CURA-3756	2017-05-09 13:07:41 +02:00
Lipu Fei	9c747733c4	Project Reader: Use ".<ext>" for profile type detection ... CURA-3756	2017-05-09 13:07:41 +02:00
Ghostkeeper	61f7b6aa68	Add spaces around binary operator ... According to our code style. Contributes to issue CURA-3756.	2017-05-09 13:07:41 +02:00
Lipu Fei	53141303d2	WIP: Fix project loading ... CURA-3756	2017-05-09 13:07:41 +02:00
Jack Ha	209822d0fc	Fix unit test. Related to CURA-3757	2017-05-09 12:59:16 +02:00
Lipu Fei	19ee790cd7	Remove device pixel ratio from DiscardOrKeepProfileChangesDialog	2017-05-09 12:05:01 +02:00
Lipu Fei	36dedabd11	Fix DPI issue with DiscardOrKeepProfileChangesDialog	2017-05-09 11:47:55 +02:00
Jaime van Kessel	7632b9df79	Removed unused connection	2017-05-09 10:27:50 +02:00
Jaime van Kessel	eb677f5625	Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura	2017-05-09 10:20:27 +02:00
Lipu Fei	2887819153	Only enable "prime_blob_enable" for UM3 ... CURA-3634	2017-05-09 10:14:43 +02:00
Ghostkeeper	17ad6a34ca	Merge branch 'master' of github.com:Ultimaker/Cura	2017-05-08 16:50:46 +02:00
Tim Kuipers	e6cf4a4538	JSON Prime Blob description wording (CURA-3634)	2017-05-08 16:46:09 +02:00
Ghostkeeper	24f8404aeb	Merge branch 'maukcc-master'	2017-05-08 16:45:02 +02:00
MaukCC	b00c8e8119	Update cartesio_0.25_pva_high.inst.cfg	2017-05-08 16:33:35 +02:00
MaukCC	29f4f6be8f	Update cartesio_0.25_pva_normal.inst.cfg	2017-05-08 16:33:15 +02:00
MaukCC	d53cd72583	Update cartesio_0.4_pva_high.inst.cfg	2017-05-08 16:32:58 +02:00
MaukCC	72b4fd7a19	Update cartesio_0.4_pva_normal.inst.cfg	2017-05-08 16:32:43 +02:00
MaukCC	fa5ae88499	Update cartesio_0.8_pva_coarse.inst.cfg	2017-05-08 16:32:27 +02:00
MaukCC	8febaa081d	Update cartesio_0.8_pva_extra_coarse.inst.cfg	2017-05-08 16:32:11 +02:00
MaukCC	5bb4f06eb5	Update cartesio_0.8_pva_high.inst.cfg	2017-05-08 16:31:54 +02:00
MaukCC	3080e79277	Update cartesio_0.8_pva_normal.inst.cfg	2017-05-08 16:31:39 +02:00
MaukCC	65b6564c15	Update cartesio_0.8_nylon_normal.inst.cfg	2017-05-08 16:30:54 +02:00
MaukCC	35cbb26466	Update cartesio_0.25_nylon_high.inst.cfg	2017-05-08 16:30:37 +02:00
MaukCC	d04466dfd5	Update cartesio_0.25_nylon_normal.inst.cfg	2017-05-08 16:30:20 +02:00
MaukCC	f572275604	Update cartesio_0.4_nylon_high.inst.cfg	2017-05-08 16:30:05 +02:00
MaukCC	d84de374f0	Update cartesio_0.4_nylon_normal.inst.cfg	2017-05-08 16:29:48 +02:00
MaukCC	a597202ff5	Update cartesio_0.8_nylon_coarse.inst.cfg	2017-05-08 16:29:32 +02:00
MaukCC	4ee00e63b5	Update cartesio_0.8_nylon_extra_coarse.inst.cfg	2017-05-08 16:29:18 +02:00
MaukCC	585d278516	Update cartesio_0.8_nylon_high.inst.cfg	2017-05-08 16:29:00 +02:00
MaukCC	7e70dc1d9a	Update cartesio_0.25_pc_high.inst.cfg	2017-05-08 16:28:22 +02:00
MaukCC	4f87dbdca9	Update cartesio_0.25_pc_normal.inst.cfg	2017-05-08 16:27:50 +02:00
MaukCC	fe6fca84f4	Update cartesio_0.4_pc_high.inst.cfg	2017-05-08 16:27:35 +02:00
MaukCC	4d80b69897	Update cartesio_0.4_pc_normal.inst.cfg	2017-05-08 16:27:21 +02:00
MaukCC	6579b44099	Update cartesio_0.8_pc_coarse.inst.cfg	2017-05-08 16:27:00 +02:00
MaukCC	3f9f1c3c82	Update cartesio_0.8_pc_extra_coarse.inst.cfg	2017-05-08 16:26:44 +02:00
MaukCC	ff59f823e1	Update cartesio_0.8_pc_high.inst.cfg	2017-05-08 16:26:29 +02:00
MaukCC	752420737e	Update cartesio_0.8_pc_normal.inst.cfg	2017-05-08 16:26:12 +02:00
MaukCC	0bb336b2fe	Update cartesio_0.25_petg_high.inst.cfg	2017-05-08 16:25:29 +02:00
MaukCC	a8179ca866	Update cartesio_0.25_petg_normal.inst.cfg	2017-05-08 16:25:11 +02:00
MaukCC	cff4dafee7	Update cartesio_0.4_petg_high.inst.cfg	2017-05-08 16:24:54 +02:00
MaukCC	a2e10370d8	Update cartesio_0.4_petg_normal.inst.cfg	2017-05-08 16:24:41 +02:00
MaukCC	09e5588788	Update cartesio_0.8_petg_coarse.inst.cfg	2017-05-08 16:24:19 +02:00
MaukCC	19bc0204c5	Update cartesio_0.8_petg_extra_coarse.inst.cfg	2017-05-08 16:23:59 +02:00
MaukCC	3d9e3918ea	Update cartesio_0.8_petg_normal.inst.cfg	2017-05-08 16:23:42 +02:00
MaukCC	996303b899	Update cartesio_0.8_petg_high.inst.cfg	2017-05-08 16:23:26 +02:00