8024 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Tim Kuipers	5f1ffe8a4c	JSON fix: better description spaghetti_max_infill_angle (CURA-3558)	2017-03-20 13:15:32 +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
Jaime van Kessel	fe826d16b8	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-17 10:23:10 +01:00
Jaime van Kessel	296152ed33	Added extra logging when authentication gets removed for network printer	2017-03-17 10:22:41 +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	7604ae62f3	Merge branch '2.5'	2017-03-16 16:04:59 +01:00
Jack Ha	7d62a699fb	Capitalize Not Supported. CURA-3390	2017-03-16 16:04:47 +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
Jack Ha	6194ffa27b	Removed comment. CURA-3390	2017-03-16 15:28:57 +01:00
Jack Ha	60c5112824	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-16 15:27:55 +01:00
Jack Ha	9b06983f3e	GCode reader: Better layerheight guess, refactoring, more robust, take extruder offset into account of multi extrusion. CURA-3390	2017-03-16 15:27:48 +01:00
Jaime van Kessel	f736e74f77	Moved setting of color for convex hull to constructor ... This should result in less color changes so should make it slightly faster CURA-3419	2017-03-16 15:08:06 +01:00
Jaime van Kessel	36b5c369cf	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 13:44:26 +01:00
Jaime van Kessel	de02d331c7	Selection tool operation stoped no longer triggers platform physics ... CURA-3465	2017-03-16 13:42:29 +01:00
Lipu Fei	e00c68344a	CURA-3495 open project/models in one dialog	2017-03-16 13:37:06 +01:00
Lipu Fei	b35a97c770	CURA-3495 preRead() takes flexible arguments	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
Jaime van Kessel	134425db90	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 11:27:54 +01:00
Jaime van Kessel	36bcd90e08	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-16 11:27:10 +01:00
Jaime van Kessel	a170624ff1	Disabled the 2.5 upgrader	2017-03-16 11:26:50 +01:00