28475 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	31106d13d0	Reduce nesting complexity with some pre-checks ... There were two pre-checks here, where the main body of the function was indented two deep. Instead, just early-out if the checks fail. This is easier to read and understand. Found during investigation of CURA-8128.	2021-06-16 12:58:09 +02:00
Ghostkeeper	cc6a629d92	Merge branch '4.10'	2021-06-15 17:13:25 +02:00
Ghostkeeper	f18e5f96ab	Use Cura-style drop-down to select mesh type ... MacOS has some trouble with the QtQuick.Controls 1 system-styled drop-downs since Qt 5.15. We've removed the other ones, but forgot about this one. Contributes to issue CURA-8128.	2021-06-15 17:13:08 +02:00
Ghostkeeper	8af12de955	Merge branch '4.10'	2021-06-15 16:30:17 +02:00
Ghostkeeper	adf3f51a4e	Use buttons from QtQuick.Controls 2 ... This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS. As discussed in the CCB.	2021-06-15 16:28:20 +02:00
Remco Burema	04002056ae	Update SDK/API from 7.5.0 to 7.6.0 for 4.10 ... CURA-8320	2021-06-15 16:08:07 +02:00
Jaime van Kessel	88f6bb743c	Merge branch '4.10' of github.com:Ultimaker/Cura into 4.10	2021-06-15 11:12:41 +02:00
Jaime van Kessel	467ae6a1d3	Fix quality_changes profile not showing ... CURA-7392	2021-06-15 11:12:18 +02:00
freejoe	f7ece0e580	Change adhesion_type to 'raft'; ... Change travel_speed to 65mm/s for LKx printers;	2021-06-15 16:44:38 +08:00
Ghostkeeper	47c1663a37	Merge branch '4.10'	2021-06-14 15:47:24 +02:00
Ghostkeeper	ac859fd4c2	Merge branch 'CURA-7859_fix_center_selected_model' into 4.10	2021-06-14 15:47:08 +02:00
Ghostkeeper	cf604570bb	Fix code style ... Contributes to issue CURA-7859.	2021-06-14 15:41:30 +02:00
Ghostkeeper	1d23f47ed6	Merge branch '4.10'	2021-06-14 15:27:13 +02:00
Ewald Kleefstra	94871a32e3	Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py ... Get extrusion mode from global container stack instead of first extruder Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>	2021-06-14 15:26:57 +02:00
Ewald Kleefstra	76da7768e8	Added relative extrusion mode support for PauseAtHeight.py script	2021-06-14 15:26:41 +02:00
Ghostkeeper	af6603e63d	Merge branch 'master' of https://github.com/ewaldkleefstra/Cura into ewaldkleefstra-master	2021-06-14 15:21:11 +02:00
Ghostkeeper	dc09465afe	Standardise capitalisation of printer names ... Some contributors seem to have a shift key stuck here or there. Many 'stylised' capitalisations weren't reflected even on the manufacturer's websites, or were also stylising words like 'pro' and 'dual' or even actual chemical names like 'nylon'. Normalising the caps makes it more fair for everyone, since all of these are written in the same font. As discussed with the Cura team.	2021-06-11 13:49:35 +02:00
Ghostkeeper	b9a151c816	Merge branch '4.10'	2021-06-10 17:48:06 +02:00
Ghostkeeper	ab13a2f0df	Update headers to reflect 4.10 version number	2021-06-10 17:44:18 +02:00
Ghostkeeper	e387af6460	Update translation files for all languages from new template ... The new strings from the translation templates are copied into the translation files, so that the translator just needs to fill them in. Contributes to issue CURA-8310.	2021-06-10 17:42:06 +02:00
Ghostkeeper	f815d15b10	Merge branch '4.10'	2021-06-10 17:37:35 +02:00
Ghostkeeper	8bba6d5951	Update translation templates for Cura 4.10 ... These are the new translations that need to be translated for Cura 4.10. Contributes to issue CURA-8310.	2021-06-10 17:37:22 +02:00
Jaime van Kessel	392c4cfec1	Fix extruder profiles not being shown in profile preferences ... CURA-7392 Fixes #7530	2021-06-10 16:55:22 +02:00
Jaime van Kessel	ba9c97a263	Give whats new screen a bit more room ... CURA-8290	2021-06-10 16:36:30 +02:00
Jaime van Kessel	8caae610ba	Set object bottom to be on buildplate with center model action ... CURA-7859	2021-06-10 16:18:42 +02:00
ChronosTech	4aae3bac09	Update setting version PLA_B - HT0.4	2021-06-10 11:41:42 +02:00
ChronosTech	3fb8dc0931	Update setting version	2021-06-10 11:34:44 +02:00
ChronosTech	f8725d13cf	remove material_print_temperature_maximum_value	2021-06-09 17:24:53 +02:00
Ghostkeeper	56db7f7144	Change file extension to .umm ... Because that's apparently what the firmware is looking for. Contributes to issue CURA-8055.	2021-06-09 17:17:33 +02:00
Ghostkeeper	62bc9be22b	Re-enable compression ... I had disabled that in an attempt to fix the bytes-to-str conversion issue, but it turned out to not be the cause. Compression is fine. Contributes to issue CURA-8055.	2021-06-09 17:14:46 +02:00
Ghostkeeper	e9031f1aff	Add documentation ... Contributes to issue CURA-8055.	2021-06-09 17:10:31 +02:00
Ghostkeeper	66b2825a66	Fix writing bytes to string-stream ... Don't open the file first. We can let the zipfile module handle that. Contributes to issue CURA-8055.	2021-06-09 17:08:57 +02:00
Ghostkeeper	ec727e1068	Hide button entirely if no export is available ... Not just disabling it. Contributes to issue CURA-8055.	2021-06-09 16:42:37 +02:00
Ghostkeeper	bdcaef134f	Basic implementation of exporting all materials in a .zip archive ... It seems to complain about the data types though. Contributes to issue CURA-8055.	2021-06-09 16:35:51 +02:00
Konstantinos Karmas	a602897ce3	Merge branch 'master' of https://github.com/Ultimaker/Cura	2021-06-09 14:07:49 +02:00
Ghostkeeper	e66783664b	Implement default path for exporting all materials ... It needs to be a removable drive if one is available, or else just the local file paths. Contributes to issue CURA-8055.	2021-06-08 17:36:25 +02:00
Ghostkeeper	abba3bdd10	Implement a sync button and file dialogue to export all materials ... Contributes to issue CURA-8055.	2021-06-08 16:57:24 +02:00
Remco Burema	54478758df	Merge pull request #9775 from SynDaverCO/SynDaverStartGcodeCorrection ... edit start gcode	2021-06-08 16:52:46 +02:00
Ghostkeeper	f436cb8e7b	Add notion of whether printers support the material export archive ... Contributes to issue CURA-8055.	2021-06-08 16:50:03 +02:00
Remco Burema	9d951fbe10	Merge pull request #9724 from Ultimaker/CURA-8141_Double_click_to_open_digital_library_files ... CURA-8141: Immediately open a digital library file after double clicking on it	2021-06-08 16:22:57 +02:00
Ghostkeeper	1f012ce2e4	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2021-06-08 16:12:14 +02:00
Ghostkeeper	813d612f90	Upgrade Volumic quality profiles to setting_version 17 ... The changes in this version upgrade relate to renamed printers. Since these profiles don't refer to the renamed printers (only to the new Volumic printers) they don't need an actual change, just a version number increment. Contributes to issue CURA-8292.	2021-06-08 16:04:42 +02:00
Ghostkeeper	0ae1e958f9	Merge branch 'master' of https://github.com/VOLUMIC/Cura into VOLUMIC-master	2021-06-08 16:00:46 +02:00
Remco Burema	c73e25195d	Merge pull request #9948 from Ultimaker/CURA-8291_Verbose_plugin_loading_on_startup ... CURA-8291: Set enterprise edition on initialization	2021-06-08 15:55:54 +02:00
Konstantinos Karmas	633002865c	Set enterprise edition on initialization ... CURA-8291	2021-06-08 15:12:33 +02:00
Remco Burema	58a5323709	Merge pull request #9884 from Ultimaker/CURA-7873_fix_positioning_merged_meshes ... Fix positioning of merged transformed meshes	2021-06-08 12:37:34 +02:00
Konstantinos Karmas	b971ba20e8	Merge pull request #9937 from Ultimaker/CC0.4_print_profile ... CC0.4 print profiles	2021-06-08 09:16:08 +02:00
mixware011	e6091fa32a	Update setting version to 17 for 4.10	2021-06-08 13:57:08 +08:00
mixware011	54b28942ff	Update setting version to 17 for 4.10	2021-06-08 13:57:02 +08:00
mixware011	fb83ecf135	Update setting version to 17 for 4.10	2021-06-08 13:56:56 +08:00