6318 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	8f023524d2	Small textual changes for project handling ... CURA-1263	2016-12-05 11:44:42 +01:00
Jaime van Kessel	535250e714	Loading a project no longer destroys authentication ... CURA-1263	2016-12-05 11:43:27 +01:00
Jaime van Kessel	ceb6017cf4	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-05 11:28:20 +01:00
Jack Ha	7a35e4170b	Moved translation functionality needed for 3mf into ThreeMFReader. Fix CURA-3089, impacts CURA-382	2016-12-05 11:28:06 +01:00
Jaime van Kessel	1860b8667b	Changed extension of 3mf projects to curaproject.3mf ... CURA-1263	2016-12-05 11:27:36 +01:00
Jaime van Kessel	2559728cf6	Merge pull request #1207 from samirabaza/patch-4 ... Minor starting code new line fix	2016-12-05 09:28:51 +01:00
SAMSECTOR	c4a39443cb	Minor starting code new line fix	2016-12-05 09:27:35 +01:00
Jaime van Kessel	56daf80f2f	removed pixelRatioSize, as this made the screen look weird on osx ... CURA-1263	2016-12-05 09:23:37 +01:00
SAMSECTOR	a18bd6c404	Minor starting code new line fix	2016-12-03 19:53:10 +03:00
Jaime van Kessel	db18635049	Instead of emitting signals for all containers, only emit them for top ... This significantly speeds up project loading. CURA-1263	2016-12-02 16:27:58 +01:00
Jaime van Kessel	a1acfe167c	Fixed UI spacing if there is no material conflict in project load ... CURA-1263	2016-12-02 15:31:55 +01:00
Jaime van Kessel	a0813b3af3	Added warning when trying to load project with objects on buildplate ... CURA-1263	2016-12-02 15:30:21 +01:00
Jaime van Kessel	5d1ba828bc	Closing load project screen cancels loading of workspace ... CURA-1263	2016-12-02 15:15:34 +01:00
Jaime van Kessel	a5c38e0591	Assign the empty containers before handling the globalcontainer changed signal	2016-12-02 15:08:18 +01:00
Jaime van Kessel	f782a76324	Material labels are now also displayed in the open project dialog ... CURA-1263	2016-12-02 14:54:42 +01:00
Jaime van Kessel	c950288b86	Minor UI changes to projectDialog ... CURA-1263	2016-12-02 13:41:39 +01:00
Jaime van Kessel	9a03e8640b	Added spacers to workspace dialog ... CURA-1263	2016-12-02 13:39:39 +01:00
Jaime van Kessel	3345e918e8	Conflict resolvement boxes are now invisible if there is nothing to resolve ... CURA-1263	2016-12-02 13:37:56 +01:00
Jaime van Kessel	c50d0172cc	Moved open project to below open recent ... CURA-1263	2016-12-02 13:33:13 +01:00
Jaime van Kessel	c236f7d266	Total number of settings is now calculated for open project dialog ... CURA-1263	2016-12-02 13:31:31 +01:00
Jaime van Kessel	04d268b1fb	Machine name is now also displayed in open project dialog ... CURA-1263	2016-12-02 13:27:39 +01:00
Jaime van Kessel	b3f1f6b4db	Project load dialog now also gives information about the quality & quality changes ... CURA-1263	2016-12-02 13:01:01 +01:00
Jaime van Kessel	6bb1b7ec80	Number of settings & mode are now displayed in open Project ... CURA-1263	2016-12-02 11:54:28 +01:00
Jaime van Kessel	ea0cbec691	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-02 11:13:45 +01:00
Jaime van Kessel	5119ee9a93	Use correct descriptor for project open ... CURA-1263	2016-12-02 11:13:21 +01:00
Ghostkeeper	53ab4955df	Set initial bed temperature to be equal to normal ... By default. Update from the materials team.	2016-12-02 11:05:54 +01:00
Jaime van Kessel	4cf454757f	Change import & export back to save & open ... CURA-1263	2016-12-02 10:43:02 +01:00
Jaime van Kessel	0ee68b716f	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-02 10:41:55 +01:00
Jaime van Kessel	f21bc4fc42	Only add extra line to brim multiple extruders are used	2016-12-02 10:14:59 +01:00
Jack Ha	1972e59713	Merge branch 'master' of github.com:Ultimaker/Cura	2016-12-01 14:06:34 +01:00
Jack Ha	2924d2bf71	Fix color update in extruder comboboxes. CURA-3033	2016-12-01 14:06:17 +01:00
Ghostkeeper	1035526185	Merge branch 'samirabaza-master'	2016-12-01 10:56:03 +01:00
Ghostkeeper	b94027ffef	Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master	2016-12-01 10:55:44 +01:00
SAMSECTOR	1ea4441148	Update printrbot_simple_extended.def.json ... added platform offset "platform_offset": [0, -0.3, 0],	2016-12-01 08:22:31 +03:00
Ghostkeeper	f6422769b5	Merge branch 'feature_z_seam_location'	2016-11-30 16:34:50 +01:00
Tim Kuipers	1305b51806	JSON fix: multiple_mesh_overlap description was clumsy (CURA-2444)	2016-11-30 16:29:06 +01:00
Tim Kuipers	8da058d95d	JSON fix: description of z_seam_type still mentioned 'Back' (CURA-1461)	2016-11-30 16:25:40 +01:00
Jaime van Kessel	e941d417f1	Added CuraVersion to 3mf metadata	2016-11-30 14:15:19 +01:00
Jaime van Kessel	d08c1b73bf	Fixed export profile derp ... CURA-1263	2016-11-30 13:13:47 +01:00
Jaime van Kessel	86019c2df0	Renamed load&save workspace to import&export project ... CURA-1263	2016-11-30 12:59:09 +01:00
Jaime van Kessel	61db5b42b7	Moved loading of meshdata in workspace to after machine has changed ... This fixes the issue where the location of the objects was not correct. CURA-1263	2016-11-30 12:57:10 +01:00
Jaime van Kessel	dcdfe612e7	Added more robust fault handling for preferences while loading workspace ... CURA-1263	2016-11-30 12:04:30 +01:00
Ghostkeeper	db2ee920ce	Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master	2016-11-30 11:09:56 +01:00
Tim Kuipers	b8ff7acb68	JSON fix: initial fan speed zero by default (CURA-3068)	2016-11-30 10:27:53 +01:00
Tim Kuipers	09e884fd92	JSON refactor: moved Initial Fan Speed out of the children of Fan Speed (CURA-3068) ... we don't want it to inherit from Fan Speed, but children must always inherit from their parent.	2016-11-30 10:27:53 +01:00
Jaime van Kessel	477ffe12aa	Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura	2016-11-30 09:13:05 +01:00
Jaime van Kessel	e6d280ee47	Merge pull request #1196 from fieldOfView/fix_um3_postprocessing ... Allow postprocessing before sending data to the printer	2016-11-30 09:12:06 +01:00
SAMSECTOR	edd76cd9ab	Update printrbot_simple_extended.def.json	2016-11-30 10:27:31 +03:00
Thomas Karl Pietrowski	415b761c58	Merge pull request #1197 from fieldOfView/add_octoprint_readme ... Add link to OctoPrintPlugin	2016-11-29 18:00:42 +01:00
Tim Kuipers	e60f05c2fd	JSON fix: limit_to_extruder for support_conical_enabled (CURA-2896)	2016-11-29 17:54:01 +01:00