3151 commits

Author	SHA1	Message	Date
Jack Ha	8275c419c1	Merge branch '2.5'	2017-03-22 09:34:06 +01:00
Jack Ha	40a7d2fecc	Added not supported quality profiles. CURA-3555	2017-03-22 09:33:17 +01:00
Jaime van Kessel	f379791d70	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-21 14:43:58 +01:00
Jaime van Kessel	0752c4440c	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-21 14:43:30 +01:00
Jaime van Kessel	5489fc8caf	Added number of missing quality profiles ... CURA-3555	2017-03-21 14:43:01 +01:00
Jack Ha	f2eebc165f	Merge branch '2.5'	2017-03-21 14:37:42 +01:00
Lipu Fei	2d48809214	Also asks when opening a recent project file ... CURA-3495	2017-03-21 13:56:11 +01:00
Lipu Fei	f3167bb84b	Add dialog for opening a project file ... CURA-3495	2017-03-21 13:56:09 +01:00
Jaime van Kessel	70dbeaf256	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-21 13:24:06 +01:00
Lipu Fei	8dbb1d47e1	Shrink the widht of profile override combobox	2017-03-21 11:14:55 +01:00
Lipu Fei	8f3e7c6fa5	More spacing for override profile combobox	2017-03-21 11:05:37 +01:00
Ghostkeeper	45934202a9	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-21 10:47:35 +01:00
Ghostkeeper	780e24d050	Merge branch 'master' of https://github.com/austin-makeit/Cura into austin-makeit-master	2017-03-21 10:45:43 +01:00
Lipu Fei	eaad358e42	Remove shortcut text in the SaveButton	2017-03-21 09:51:07 +01:00
Jaime van Kessel	8a1ad98ed5	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-21 09:39:27 +01:00
Jaime van Kessel	a8cec631b4	Lowered the required qtquick number for open dialog	2017-03-21 09:39:07 +01:00
Lipu Fei	139bb76806	Add CTRL+P shortcut for save/print button ... CURA-3496	2017-03-21 09:28:03 +01:00
Lipu Fei	555cd58f5e	Save with code names for profile override preference ... CURA-3561	2017-03-21 09:09:17 +01:00
austin-makeit	2be100ec42	Rename makeit_l_dual_2nd to makeit_l_dual_2nd.def.json	2017-03-20 10:45:06 -07:00
austin-makeit	f893fa8633	Rename makeit_l_dual_1st to makeit_l_dual_1st.def.json	2017-03-20 10:44:52 -07:00
austin-makeit	8b009181c4	Rename makeit_dual_2nd to makeit_dual_2nd.def.json	2017-03-20 10:44:20 -07:00
austin-makeit	16ac40f22e	Rename makeit_dual_1st to makeit_dual_1st.def.json	2017-03-20 10:44:01 -07:00
austin-makeit	6ed00900fe	Update and rename makeit_pro_m to makeit_pro_m.def.json	2017-03-20 10:43:10 -07:00
austin-makeit	f5c9620d3b	Update and rename makeit_pro_l to makeit_pro_l.def.json	2017-03-20 10:42:37 -07:00
Jack Ha	b6d9fdcd13	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-20 15:10:14 +01:00
Jack Ha	1faa195c35	Renamed 'Save As' to 'Save As...' CURA-3496	2017-03-20 15:10:01 +01:00
Lipu Fei	892225d398	Move some code to OpenFilesIncludingProjectsDialog.qml ... CURA-3495	2017-03-20 14:59:23 +01:00
Jack Ha	ebf8782722	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-20 13:01:15 +01:00
Jack Ha	c1ca2ac09a	Merge branch '2.5'	2017-03-20 12:56:35 +01:00
Lipu Fei	f259038954	Adjust open project/models dialog size for high DPI ... CURA-3495	2017-03-20 11:37:04 +01:00
Lipu Fei	8d6ea7bb97	Adjust Discard/Keep Profile Dialog size for high DPI	2017-03-20 11:30:05 +01:00
jack	42e7a0defa	Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one ... CURA-3495 Open project/models menu item	2017-03-20 10:59:40 +01:00
Tim Kuipers	35516ccc45	JSON fix: tetrehedral infill line distance was wrong (CURA-3474) ... the infill line distance in the frontend is the average line distance, not the line distance between two lines which are equidistant	2017-03-17 15:05:01 +01:00
Lipu Fei	8e77d212f7	Remove "Save All" and add "Save As" MenuItem ... CURA-3496	2017-03-17 14:31:22 +01:00
austin-makeit	8cd5c8bb69	Update makeit_pro_m	2017-03-16 15:50:54 -07:00
austin-makeit	918c5e1254	Update makeit_pro_l	2017-03-16 15:49:35 -07:00
austin-makeit	2a0137156b	Merge pull request #2 from austin-makeit/patch-1 ... Patch 1	2017-03-16 15:45:34 -07:00
austin-makeit	8418c6b39b	Create makeit_l_dual_2nd	2017-03-16 15:43:02 -07:00
austin-makeit	2523630455	Create makeit_l_dual_1st	2017-03-16 15:42:48 -07:00
austin-makeit	499f1998ca	Create makeit_dual_2nd	2017-03-16 15:42:35 -07:00
austin-makeit	b5cc2b7059	Create makeit_dual_1st	2017-03-16 15:42:18 -07:00
austin-makeit	e4d32db873	Merge pull request #1 from austin-makeit/patch-2 ... Create MAKEiT definitions and extruders	2017-03-16 15:41:01 -07:00
austin-makeit	179919d14c	Create makeit_pro_m	2017-03-16 15:33:13 -07:00
austin-makeit	d0ce717add	Create makeit_pro_l	2017-03-16 15:30:42 -07:00
Jaime van Kessel	d52515d57d	Added invert zoom preference option	2017-03-16 19:06:57 +01:00
Jack Ha	ff77571300	Merge branch '2.5'	2017-03-16 16:01:33 +01:00
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