15845 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Simon Edwards	baa8064ec7	Merge pull request #4429 from Ultimaker/cura_connect_improvements_3.5 ... Cura connect improvements 3.5	2018-09-25 17:26:55 +02:00
Simon Edwards	e99b376374	Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5	2018-09-25 16:59:33 +02:00
Lipu Fei	91bcfb9445	Take in account extruders that haven't been loaded yet ... CURA-5751	2018-09-25 15:29:31 +02:00
Lipu Fei	8837ffc06d	Fix mateial management QML reference ... CURA-5682	2018-09-25 11:52:53 +02:00
Lipu Fei	fe8aa02e7c	Fix a direct signal emission that causes max recursion error ... CURA-5682 A max recursion error will occur when the user creates a material on the material management page. Too many signals get directly triggered and some of them head back again and causes a max recursion error.	2018-09-24 11:44:55 +02:00
Aleksei S	b44fb7ca24	Select correct material according to the active extruder ... CURA-5682	2018-09-21 17:35:46 +02:00
Aleksei S	86d8f8517d	In material page was not defined the used extruder nr, for generic materials ... CURA-5682	2018-09-21 13:48:46 +02:00
Lipu Fei	1bf78c086d	Remove import plugins which is not a module	2018-09-21 12:03:15 +02:00
Diego Prado Gesto	4bd5d29970	Don't crash if the plugin is not found (maybe some error while loading). ... In that case it's better not to show the dialog than crashing.	2018-09-20 18:41:30 +02:00
Diego Prado Gesto	2d300ab395	Revert "Fix plugins import in CuraApplication" ... This reverts commit e87f3d7ca9cf135142bee488f188b9639c8b38fd.	2018-09-20 18:34:08 +02:00
Lipu Fei	f912630d17	Merge pull request #4391 from Ultimaker/CURA-5095_collect_user_modified_settings ... Cura 5095 collect user modified settings	2018-09-20 10:13:27 +02:00
Diego Prado Gesto	4111318c7a	Remove duplicate shortcut in French, so the CI won't fail on it.	2018-09-20 08:56:01 +02:00
Ghostkeeper	ea4015c2cf	Fix missing report links ... My IDE crashed while doing a replace all. I see that it missed a few. Contributes to issue CURA-5741.	2018-09-19 17:31:39 +02:00
Ghostkeeper	ec42a96179	Update version number and fix reporting link ... I don't know, did we always have it refer to Uranium's issues page? Contributes to issue CURA-5741.	2018-09-19 17:25:57 +02:00
Ghostkeeper	91ed1171c2	Update translation sources for Cura 3.5 ... This is updated from the new cura.pot template. Contributes to issue CURA-5741.	2018-09-19 17:15:09 +02:00
Ghostkeeper	f9923e5fe7	Remove duplicate messages ... These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory. Contributes to issue CURA-5741.	2018-09-19 17:13:53 +02:00
Ghostkeeper	10e0175947	Update translation templates for Cura 3.5 ... These are the new strings for Cura 3.5. Contributes to issue CURA-5741.	2018-09-19 17:10:58 +02:00
Ghostkeeper	04b74d2285	Fix typo in Extra Infill Wall Count description ... Some very observant user found this small typo. Thanks.	2018-09-19 13:58:09 +02:00
Ian Paschal	7ad6fc4cad	Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues ... Add confirmation dialogues before making destructive changes in UM3/S5 monitor	2018-09-19 13:14:39 +02:00
Ghostkeeper	44d828d137	Merge branch 'CURA-5725_simulation_stop_key_press' into 3.5	2018-09-18 17:29:35 +02:00
Diego Prado Gesto	ed9b0dd41b	Add a missing bracket back. ... Contributes to CURA-5725.	2018-09-18 17:25:35 +02:00
Ghostkeeper	e41361a053	Fan speed override is about supported areas, not bridged areas ... This is a correction suggested by Smartavionics (the author of that setting) on the Ultimaker forum thread about the 3.5 beta.	2018-09-18 17:18:37 +02:00
Diego Prado Gesto	13cab3653e	Remove unworking code that I forgot to remove after explaining a ... possible solution to myself. Contributes to CURA-5725	2018-09-18 17:09:57 +02:00
Diego Prado Gesto	c31f584e5b	Fix my own mistake. The keys act throught the labels and the function in ... the labels is called setValue that then points to the setValueManually. Contributes to CURA-5725.	2018-09-18 17:04:24 +02:00
Diego Prado Gesto	0ef46feeae	Fix code style. ... Contributes to CURA-5725.	2018-09-18 16:53:25 +02:00
Diego Prado Gesto	f965b66c87	Stop the simulation also when the range slider is used. Reuse some code. ... Contributes to CURA-5725.	2018-09-18 16:30:15 +02:00
Lipu Fei	eafd856a14	Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5	2018-09-18 16:11:46 +02:00
Diego Prado Gesto	e28b662649	Clean up the code a bit and update comments. ... Contributes to CURA-5736.	2018-09-18 16:04:31 +02:00
Lipu Fei	a33ce8178a	Support mulitple bundled_packages JSON files ... CURA-5718	2018-09-18 15:53:56 +02:00
Lipu Fei	9924e3e26c	Remove duplicated code ... CURA-5735	2018-09-18 15:08:55 +02:00
Aleksei S	1b1ca8a53b	Fix, simulation did not play after second layer ... CURA-5725	2018-09-18 14:39:43 +02:00
Aleksei S	f33576cc81	Stop simulation after pressing Up or Down in simulation layer textfield ... CURA-5725	2018-09-18 13:56:20 +02:00
Lipu Fei	ddc5d983a1	Fix single extrusion machines without an ExtruderStack ... CURA-5736	2018-09-18 13:35:25 +02:00
Ghostkeeper	e5778be887	Corrections to change log ... One was missing. One was confusing. One was incomplete. Contributes to issue CURA-5710.	2018-09-18 12:41:44 +02:00
Ghostkeeper	3a096cdb23	Add confirmation dialogue for deleting jobs ... Re-using MessageDialog again. Contributes to issues CL-1053 and CURA-5729.	2018-09-18 11:42:34 +02:00
Ghostkeeper	83528ffb48	Add confirmation dialogue for sending prints to top of queue ... Very simple. Just re-use the MessageDialog component. Contributes to issues CL-1053 and CURA-5729.	2018-09-18 11:41:51 +02:00
Ghostkeeper	ac4ee8c428	Fix context of pause, resume and abort labels ... More in line with what we have in the rest of our code base. Discovered during work on CL-1053 and CURA-5729.	2018-09-18 11:25:35 +02:00
Ghostkeeper	a7a022eca0	Add confirmation dialogue before aborting a print ... It's a destructive operation so we should ask first. Contributes to issue CL-1053 and CURA-5729.	2018-09-18 11:24:30 +02:00
Lipu Fei	725ea847a7	Add material_diameter into fdmprinter ... When saving a material to a file, it will save all the settings in that container, which needs to create SettingInstances for all the cached ones, and for those instances, their definitions will be retrieved from the machine definition. material_diameter is one of the settings, but it only exists in the extruder definitions, so when it tries to save a material profile, a lot of warnings/errors will occur due to the missing "material_diameter" in fdmprinter. Adding it back fixes this problem.	2018-09-18 10:35:44 +02:00
Ghostkeeper	51d342678e	Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5	2018-09-18 09:38:55 +02:00
Lipu Fei	b723621fda	Merge pull request #4370 from fieldOfView/fix_usb_printing_port_access ... [3.5][regression]Fix opening port after baudrate detection	2018-09-17 17:38:12 +02:00
Lipu Fei	da047ea674	isInstalled() should check old plugins as a fallback	2018-09-17 17:26:38 +02:00
Lipu Fei	15657f4cfc	Remove unneeded code	2018-09-17 17:26:19 +02:00
Lipu Fei	4db213c55a	Fix missing import	2018-09-17 16:24:10 +02:00
Lipu Fei	a4b20e046d	Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins	2018-09-17 16:22:22 +02:00
Lipu Fei	6d1db55072	Fix SDK version comparison	2018-09-17 16:14:28 +02:00
Lipu Fei	51742b2a68	Merge pull request #4378 from Ultimaker/stop_simulation_when_changing_layers_or_paths ... Stop simulation when dragging handles	2018-09-17 15:38:59 +02:00
Ghostkeeper	816c3cbd11	Fix forgotten separation between header and body ... I copied these over from a piece where they had a different layout. Contributes to issue CURA-5710.	2018-09-17 14:43:17 +02:00
Diego Prado Gesto	6c9c68e004	Active the focus when the selected item changes. ... In this case, if the user was updating some information in one material and then select other material, the new data is stored. Contributes to CURA-5682.	2018-09-17 14:41:45 +02:00
Ghostkeeper	1bf05e6701	Merge branch 'CURA-5718_fix_upgrade_for_bundled_plugins' into 3.5	2018-09-17 14:36:17 +02:00