17030 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jack Ha	aa3cd8ba9d	Solved merge conflict	2018-03-12 11:39:39 +01:00
Jack Ha	a3d6127dcb	CURA-4400 removed unnecessary correctExtruderSettings	2018-03-12 11:33:54 +01:00
Mark Burton	88c2e37ce4	Added wall_min_flow and wall_min_flow_retract settings. ... Wall lines whose flow is < wall_min_flow are converted into travel moves.	2018-03-12 10:25:39 +00:00
Jack Ha	1f8be6ad3c	CURA-4400 moved default extruder value to value instead of default_value because of engine	2018-03-12 11:05:55 +01:00
Jack Ha	3edc96ec8f	CURA-4400 fixed wrongly converted expression	2018-03-12 10:47:23 +01:00
Diego Prado Gesto	9613103591	CURA-4870 Remove Monitor stage status icons	2018-03-12 10:45:49 +01:00
Lipu Fei	2c5cc17b49	Fix build plate compatibility check ... CURA-5078	2018-03-12 10:34:18 +01:00
Jack Ha	552618fcd4	CURA-4400 added function to find model index by extruder position in SettingExtruder	2018-03-12 09:56:08 +01:00
Ghostkeeper	d98cab48ac	Get scripts from either Resources or Preferences ... We must retain the old directory for legacy. People might still have scripts there.	2018-03-12 09:48:03 +01:00
Ghostkeeper	a3efbc70fb	Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path	2018-03-12 09:42:21 +01:00
Ghostkeeper	15212d4426	Align for readability	2018-03-12 09:38:20 +01:00
Ghostkeeper	aae8a31f00	Don't display extruder count if you can't use it ... If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.	2018-03-12 09:23:25 +01:00
Mark Burton	239961cc48	Merge remote-tracking branch 'upstream/master' into mb-retract-on-long-combs	2018-03-12 08:22:53 +00:00
Mark Burton	b732a84a6a	Added retraction_combing_max_distance setting. ... When this is non-zero, combing travel moves that are longer will use retraction.	2018-03-12 08:21:11 +00:00
Jack Ha	d70cc072e9	Merge branch 'master' into feature_enable_disable_extruder	2018-03-12 09:06:24 +01:00
Ryan	4d5ace4564	Added default material diameter to SeeMeCNC printer definitions	2018-03-11 10:27:57 -04:00
Timur Tabi	5e4e049c1f	Add definition for Printrbot Simple Maker's Kit 1405 ... The Printrbot Simple Maker's Kit, model 1405, was a low-cost FDM printer without a heated bed and a 10x10cm print area. The print area can be extended to 185x100mm with the "Printrbot Simple XL Upgrade with Spool Rack for Maker's Kit 1405". More information can be found at http://printrbot.com/project/simple-makers/	2018-03-10 14:57:03 -06:00
Lipu Fei	7312ed8e3c	Fix project loading for version upgrade ... CURA-5054	2018-03-09 19:35:23 +01:00
Lipu Fei	e09325bf82	Fix project loading for version upgrade ... CURA-5054	2018-03-09 17:16:27 +01:00
Diego Prado Gesto	85d6919ce6	Merge branch 'master' into feature_sync_button	2018-03-09 16:59:18 +01:00
fieldOfView	e62ed62bdd	Remove duplicate import	2018-03-09 16:57:09 +01:00
fieldOfView	7123441db8	Fix keeping settings visible when showing all settings	2018-03-09 16:51:46 +01:00
Diego Prado Gesto	87380e007c	CURA-4870 Switch the hidden metadata entry also when switching printes ... so the active printer is correctly shown in the machines page.	2018-03-09 16:44:46 +01:00
fieldOfView	711d60e8c7	Allow switching back to the "Custom" set	2018-03-09 16:44:27 +01:00
Lipu Fei	a81981a27a	Better info on no profiles to import for gcode ... CIRA-4946 If a gcode is sliced with default profiles, there won't be any custom profiles to import from that gcode. In that case, we show a info message telling the user about this instead of showing an error message.	2018-03-09 16:40:57 +01:00
Diego Prado Gesto	472ae8e044	CURA-4870 Create a custom model for the machines in order to show the ... printers grouped by local or networked.	2018-03-09 16:35:23 +01:00
Lipu Fei	c41af83b41	Fix create quality changes for extruders ... CURA-5054	2018-03-09 16:29:49 +01:00
Ghostkeeper	2f1657f848	Update version numbers in variants ... These didn't match on my initial search-and-replace so I missed them. Contributes to issue CURA-5054.	2018-03-09 16:23:38 +01:00
Ghostkeeper	cf21e7c74b	Also upgrade definition_changes and user ... Because these files share their version numbers with quality changes. Contributes to issue CURA-5054.	2018-03-09 16:21:42 +01:00
Ghostkeeper	d8a066c1e7	Increment instance container version number instead of just quality_changes ... Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong. Contributes to issue CURA-5054.	2018-03-09 16:14:24 +01:00
Ghostkeeper	3a832d66a9	Safer check for extruder vs. global ... Because it might be an empty string. Contributes to issue CURA-5054.	2018-03-09 16:07:54 +01:00
Ghostkeeper	b797ac1a15	Read only position from metadata ... We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present. Contributes to issue CURA-5054.	2018-03-09 16:07:06 +01:00
Ghostkeeper	5d2e98cdd4	Translate to American English ... The spelling in AmE is with a Z.	2018-03-09 15:55:27 +01:00
fieldOfView	4c66c935af	Merge branch 'master' into feature_setting_visibility_profiles	2018-03-09 15:45:24 +01:00
Ghostkeeper	e18b1cde55	Store extruder position under 'position' instead of 'extruder' ... Otherwise it thinks it is still an extruder ID. Contributes to issue CURA-5054.	2018-03-09 15:37:30 +01:00
Ghostkeeper	71afbba789	Merge branch '3.2'	2018-03-09 15:36:51 +01:00
Ghostkeeper	c54ea00111	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:22:13 +01:00
Ghostkeeper	5caa92cf7a	Update current version for quality changes ... We now need to upgrade up to version 3000004. Contributes to issue CURA-5054.	2018-03-09 15:21:45 +01:00
Ghostkeeper	2962e0e282	Upgrade to quality_changes rather than quality ... Oops. Contributes to issue CURA-5054.	2018-03-09 15:20:20 +01:00
Diego Prado Gesto	8a48503104	Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button ... Fix some conflicts	2018-03-09 15:16:21 +01:00
Diego Prado Gesto	16a5b652f4	CURA-4870 Make the machine selection toolbutton react to changes in the ... output devices	2018-03-09 15:08:51 +01:00
Lipu Fei	206d20c440	Fix empty definition_changes check in MachineSettingsAction ... CURA-5060 Should check for both "empty" and "empty_definition_changes".	2018-03-09 15:04:57 +01:00
Ghostkeeper	65591e7c26	Merge branch 'master' of github.com:Ultimaker/Cura	2018-03-09 15:00:25 +01:00
Lipu Fei	c9905449eb	Clean up MachineSettingsAction imports ... CURA-5060	2018-03-09 14:54:13 +01:00
Ghostkeeper	fb814b6519	Implement upgrade for quality changes extruder metadata ... The metadata used to be the ID of the extruder. Now it's the position of the extruder stack. Contributes to issue CURA-5054.	2018-03-09 14:54:08 +01:00
Lipu Fei	8c7e413038	Remove unnecessary setGlobalContainerStack() in project loading ... CURA-5073	2018-03-09 14:37:43 +01:00
Lipu Fei	48dae7b6c7	Remove commented code ... CURA-5060	2018-03-09 14:35:43 +01:00
Lipu Fei	de72dd3455	Fix material update upon gcode flavour change ... CURA-5060	2018-03-09 14:26:53 +01:00
Andreea Scorojitu	a40be0c64a	Add default_build_plate to expert view, CURA-5032 ... The default build plate settings is now added in Expert view in SettingsVisibility	2018-03-09 14:25:35 +01:00
Ian Paschal	ae2a286e3f	Improved Icons & Styling	2018-03-09 14:07:29 +01:00