7641 commits

This branch

This branch

All branches

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
jack	af43b2e8c4	Merge pull request #1554 from LipuFei/feature_CURA-3495_open_in_one ... CURA-3495 Open project/models menu	2017-03-21 14:32:53 +01:00
jack	6d1a99ff33	Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox ... Add more spacing between the label and combobox for override profile option	2017-03-21 14:12:40 +01:00
Lipu Fei	622ff4e662	Add default for preference "view/invert_zoom"	2017-03-21 13:56:12 +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	9e5513ade6	Use QUrl to parse fileUrl ... 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
Jaime van Kessel	90a92dce19	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 13:23:50 +01:00
Lipu Fei	8dbb1d47e1	Shrink the widht of profile override combobox	2017-03-21 11:14:55 +01:00
Jaime van Kessel	00258e570f	If a container_changes can not be found, handle it more gracefully ... CURA-3560	2017-03-21 11:13:10 +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
jack	07cfe76edb	Merge pull request #1553 from Ultimaker/feature_CURA-3561_save_profile_override_with_codes ... CURA-3561 Save with code names for profile override preference	2017-03-21 09:31:21 +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	6858db5e17	Merge branch '2.5'	2017-03-20 15:17:29 +01:00
Jack Ha	b8d8e4fac3	Updated changelog. CURA-3467	2017-03-20 15:17:18 +01: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	48c6c523ec	Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559	2017-03-20 14:43:46 +01:00
Jack Ha	df09d49217	Merge branch '2.5'	2017-03-20 14:10:07 +01:00
Jack Ha	2b17f9665f	Fix prime tower location/visualization on buildplate. CURA-3525	2017-03-20 14:09:55 +01:00
Jack Ha	a56b7cd98d	Merge branch '2.5'	2017-03-20 13:42:11 +01:00
Jack Ha	b21a87b25b	Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559	2017-03-20 13:41:47 +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
Thomas Karl Pietrowski	c75261a023	Removing multiple import ... We only need to import UM.Platform once.	2017-03-18 09:57:09 +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
Jaime van Kessel	e620d8fd9a	Added extra logging to authentication loading to indicate difference between no auth at all or (some) loaded auth	2017-03-17 10:30:04 +01:00