19735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ian Paschal	c7f6351903	Add typings ... Contributes to CL-1331	2019-05-15 10:09:27 +02:00
ChrisTerBeke	913fac0094	Should be non-human readable string	2019-05-14 21:18:00 +02:00
ChrisTerBeke	b1920b05e9	Remove hacky code that is now not needed anymore	2019-05-14 21:13:29 +02:00
ChrisTerBeke	56c1da2580	printer_type has a default value so cannot be Optional	2019-05-14 21:01:34 +02:00
ChrisTerBeke	70c679859a	Use default value for printer type, allow printer_type field from cloud	2019-05-14 20:56:28 +02:00
Ian Paschal	f81340c14a	Merge pull request #5717 from Ultimaker/CL-1259_hide_useless_override_button ... CL-1259 Hide the Override button if it is not an option	2019-05-14 15:30:53 +02:00
Ghostkeeper	f4dac40f8b	Merge branch '4.1' ... Conflicts: resources/i18n/es_ES/cura.po -> Correction to Spanish translations while we generated new templates on 4.1.	2019-05-14 14:50:36 +02:00
Ghostkeeper	ef707e4bad	Update file headers of translation templates ... We're in Cura 4.1 now. Also, the reporting e-mail was somehow missing from all the cura.po files. Contributes to issue CURA-6521.	2019-05-14 14:35:58 +02:00
Ghostkeeper	f845d13514	Update translation templates per language from pot file ... This is generated with the i18n-update-po CMake target. Contributes to issue CURA-6521.	2019-05-14 14:31:14 +02:00
Ghostkeeper	51cc2ff701	Remove duplicate entries ... MSGMerge crashes on these. They are probably caused by the build system being a little bit naive about where it gets its strings from.	2019-05-14 14:30:10 +02:00
Ghostkeeper	1941d5219f	Update translation templates for 4.1 ... These are the new strings for Cura 4.1. Contributes to issue CURA-6521.	2019-05-14 14:25:01 +02:00
Lipu Fei	d1805d34be	Move background to ScrollView for GcodeTextArea	2019-05-14 11:44:14 +02:00
Lipu Fei	7f8896705f	Merge remote-tracking branch 'origin/4.1'	2019-05-14 10:41:12 +02:00
Lipu Fei	5280ec4af5	Fix Mark2 appearing at the bottom of machine list	2019-05-14 10:38:27 +02:00
Ghostkeeper	65bc29cd4c	Give slightly more information when definition is invalid ... Because it now fails at the assertion inside assertIsDefinitionValid, it'll show the information at that point in the stack, rather than showing that the entire function returned False which could be a lot of things (if you don't actually go reading the function because then you discovered that it could only be one thing).	2019-05-14 09:08:50 +02:00
Ghostkeeper	c3efb666e8	Remove non-existent setting override	2019-05-14 09:06:26 +02:00
Ghostkeeper	03d96f3fb5	Merge branch '4.1'	2019-05-13 17:11:39 +02:00
Ghostkeeper	2e93948c84	Take minimum of all build volume temperature values ... According to the Materials and Processing team here, this is better because it guarantees that the coldest of your materials won't sag. Contributes to issue CURA-6514.	2019-05-13 17:11:13 +02:00
Ghostkeeper	a41aee98f8	Set the value for PLA as the default for build volume temperature ... This way, most prints with 3rd party materials and 3rd party printers will be fine. Also, it requires me to change the fewest amount of profiles. Contributes to issue CURA-6514.	2019-05-13 16:31:33 +02:00
Ghostkeeper	60060db0d5	Reduce weight of S5 definition ... It's now the 2nd year after the introduction of the S5 so we have to reduce this weight by one. Contributes to issue CURA-6500.	2019-05-13 15:47:47 +02:00
Ian Paschal	c4ca133b40	Update UM3OutputDevicePlugin.py ... Contributes to CL-1331	2019-05-13 15:39:29 +02:00
Ghostkeeper	da74ef83ac	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-05-13 15:17:23 +02:00
maukcc	9dd4fd2128	HMS434 update	2019-05-13 15:16:15 +02:00
maukcc	80efb0bac3	HMS update	2019-05-13 15:14:28 +02:00
Ghostkeeper	3a6534a3a4	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master ... Conflicts: resources/definitions/hms434.def.json -> We both fixed the gantry height value vs. default_value problem.	2019-05-13 15:11:32 +02:00
Ian Paschal	e39769cc00	Fix last typing issue ... Contributes to CL-1331	2019-05-13 14:59:23 +02:00
Ian Paschal	b8ab9f6398	Fix typings ... Contributes to CL-1331	2019-05-13 14:53:58 +02:00
Ian Paschal	177e031f4f	Add "lite" Machine class ... Contributes to CL-1331	2019-05-13 14:45:02 +02:00
Ian Paschal	8b25816b1b	Fix typo and white space ... Contributes to CL-1331	2019-05-13 14:44:39 +02:00
Diego Prado Gesto	36ddf2f018	Do not allow the use of "weight" for third party printers ... Otherwise external contributors can manipulate the order in which they appear in the list	2019-05-13 13:49:00 +02:00
Diego Prado Gesto	cac4b8b7f1	Remove useless comment line	2019-05-13 13:34:13 +02:00
Diego Prado Gesto	233013c946	Cache a lot of items in the list so there are no glitches	2019-05-13 13:23:10 +02:00
maukcc	abf5719f11	HMS434 updates ... Small updates for the HMS434 machine	2019-05-13 10:01:03 +02:00
Ghostkeeper	022c2678d0	Overwrite gantry height value instead of default_value ... Because fdmprinter now overwrites the value using a formula, the default_value properties are no longer used.	2019-05-13 09:38:36 +02:00
Ghostkeeper	137619567a	Merge branch '4.1'	2019-05-13 09:32:58 +02:00
Ghostkeeper	e26e825d83	Overwrite gantry height value instead of default_value ... Because the default in fdmprinter has a formula in the value, the default_value properties wouldn't get used any more.	2019-05-13 09:30:32 +02:00
Ghostkeeper	dbcea27405	Merge branch 'GunZi200-patch-1'	2019-05-10 13:14:55 +02:00
Ghostkeeper	3c94a2c3be	Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1	2019-05-10 13:13:07 +02:00
Guðni Már Gilbert	d5b6b80291	removed an extra comma	2019-05-10 10:07:53 +00:00
Ghostkeeper	36d25b2586	Merge branch 'patch-2' of https://github.com/GunZi200/Cura into GunZi200-patch-2	2019-05-10 11:58:11 +02:00
Ghostkeeper	f238e861b0	Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1	2019-05-10 11:53:43 +02:00
Ghostkeeper	350dd5db3c	Correct positioning of tooltip for g-code text area	2019-05-10 11:32:40 +02:00
Ghostkeeper	67a5490907	Show tooltip on top of control elements	2019-05-10 11:09:56 +02:00
Ghostkeeper	72987fd2c5	Merge branch 'joba-1-port-filter'	2019-05-10 09:46:01 +02:00
Guðni Már Gilbert	1277220aed	Adjust retraction distance and retraction speed	2019-05-09 22:06:34 +00:00
Guðni Már Gilbert	056f36f6ac	Update creality_ender3.def.json ... I suggest a change to the value of max Z-axis Jerk to be the same as on Marlin 1.1.9 firmware used by Ender 3. Its a small change, reducing 0,4 to 0,3. Having these settings match the firmware's configuration makes a print's estimated time more accurate.	2019-05-09 20:40:14 +00:00
Ghostkeeper	3629b955fe	Merge branch 'port-filter' of https://github.com/joba-1/Cura into joba-1-port-filter	2019-05-09 16:55:44 +02:00
Remco Burema	feb074d4b5	Merge pull request #5721 from Ultimaker/CURA-6334_add_id_to_profilesPage ... Add the ids for the menu buttons to be used in Squish.	2019-05-09 16:52:01 +02:00
Ian Paschal	df6898ae45	Add connection_types to fake machine ... Contributes to CL-1331	2019-05-09 16:41:15 +02:00
Ian Paschal	d391ec4e6b	Comments ... Contributes to CL-1331	2019-05-09 16:41:01 +02:00