3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
22542 commits 306 branches 270 tags 786 MiB
Commit graph

22542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lipu Fei
e5c59b1308 Fix TestVariantNode 2019-10-04 11:00:01 +02:00
Jaime van Kessel
71e9fb8a22
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 10:39:30 +02:00
Jaime van Kessel
5bd5875a20
Also add intent warning to custom print setup 
CURA-6601
 2019-10-04 10:39:02 +02:00
Lipu Fei
7233bdb255 Fix TestMachineNode: remove invalid property has_machine_materials 2019-10-04 10:37:45 +02:00
Jaime van Kessel
e197fe99fa
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 10:33:57 +02:00
Jaime van Kessel
c86f28cc9e
Ignore disabled extruders when checking for intent warning 
CURA-6601
 2019-10-04 10:33:13 +02:00
Lipu Fei
61a1b61756 Remove unnecessary activeQualityName property 
CURA-6846
 2019-10-04 10:27:39 +02:00
Lipu Fei
0d554c4938 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-04 10:19:36 +02:00
Jaime van Kessel
4793c77380
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 09:39:47 +02:00
Jaime van Kessel
f8951e4140
Add scrollbar to profile dropdown 
CURA-6843
 2019-10-04 09:39:26 +02:00
Ghostkeeper
38ae0e75f2
Fallback to fdmprinter if not has_machine_quality 
Contributes to issue CURA-6847.
 2019-10-03 16:25:09 +02:00
KOUBeMT
44290d3715 setting_version_update 2019-10-03 16:00:55 +02:00
Lipu Fei
877bb1efdb Diable local printer ListView buffer to force redraw 
CURA-6793
 2019-10-03 15:56:00 +02:00
KOUBeMT
a135a3f328 LW&Speed_Update 2019-10-03 15:52:38 +02:00
Lipu Fei
bd84c4d98d Show quality and intent a custom profile is based on 
CURA-6846
 2019-10-03 14:18:51 +02:00
Lipu Fei
027768f151 Use machine def id as quality_definition fallback 
CURA-6847
 2019-10-03 12:56:22 +02:00
Lipu Fei
26b523f190 Fix quality profile menu size 
CURA-6838
 2019-10-03 12:37:11 +02:00
Lipu Fei
ba805b9da3 Fix QML errors 
CURA-6849
 2019-10-03 12:28:07 +02:00
Lipu Fei
2d59271a69 Remove hard-coded height 2019-10-03 12:28:07 +02:00
KOUBeMT
f1ecb63c3f Setting version update 2019-10-03 12:11:20 +02:00
KOUBeMT
3f9f465053 Update strateo3d.def.json 2019-10-03 12:03:48 +02:00
Jaime van Kessel
2059042e60
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-03 09:52:23 +02:00
Jaime van Kessel
1def289bb9
Fix crash when importing profile that has different quality_definition 
CURA-6847
 2019-10-03 09:51:45 +02:00
Lipu Fei
a93fd982dd Fix renaming custom profile 
CURA-6842
 2019-10-02 23:59:48 +02:00
Jaime van Kessel
b78f34db12
Merge pull request #6434 from Ultimaker/CURA-6785_one_at_a_time_ordering 
Cura 6785 one at a time ordering
 2019-10-02 17:37:41 +02:00
Jaime van Kessel
fba7a6ff33
Fix importing profiles 
CURA-6847
 2019-10-02 17:01:21 +02:00
Jaime van Kessel
8beeac7fca
Make the radio button in the checkbar look consistent. 
The drake meme and CURA-6845 told me that it should look like that.
 2019-10-02 16:57:04 +02:00
Jaime van Kessel
ff3837bac5
Only show "Custom Profile" header if there are custom profiles 
CURA-6844
 2019-10-02 16:48:57 +02:00
Jaime van Kessel
c6850b4f73
Set right text color if menubutton is disbled 
CURA-6848
 2019-10-02 16:39:50 +02:00
Remco Burema
8f2caf362d Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent 2019-10-02 16:12:14 +02:00
Jaime van Kessel
5ec6b2fdf7
Fix typing 
CURA-6785
 2019-10-02 15:48:10 +02:00
Remco Burema
784396424c Get old diameter from old material instead of new candidate. 
part of CURA-6821
 2019-10-02 15:46:01 +02:00
Nino van Hooff
55fe4ee986 Update documentation and typing 
CURA-6824
 2019-10-02 13:30:59 +02:00
Nino van Hooff
1b1029a3e0 Use 2 leading spaces for doxygen documentation 
CURA-6785
 2019-10-02 13:13:32 +02:00
Nino van Hooff
9512030060 Check for adhesion area collisions in one-at-a-time ordering 
CURA-6785
 2019-10-02 13:09:37 +02:00
Jaime van Kessel
3199d5f9ad
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-02 13:06:52 +02:00
Jaime van Kessel
f5f91c9c3a
Ensure that profiles are cleaned up if one of the set is incorrect 2019-10-02 13:06:27 +02:00
Ghostkeeper
672fc58930
Allow down to half the layer height for infill layer thickness 
This is possible because CuraEngine rounds these to the nearest layer thickness. So if it's more than half the layer height it gets rounded up and it's still properly one layer.

Contributes to issue #6465.
 2019-10-02 12:59:48 +02:00
Lipu Fei
750632ec41 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-02 12:52:37 +02:00
Ian Paschal
2d03bc6bc3
Merge pull request #6461 from Ultimaker/CS-347_auto_switch_to_cloud 
Fix cloud connection auto fallback
 2019-10-02 11:45:58 +02:00
Ghostkeeper
2a4c387067
Add sideways move to not squash the primed amount onto the nozzle 
Provided by Psychonno and tested by MetalRobo in #6424.
 2019-10-02 11:44:24 +02:00
Jaime van Kessel
872d6365a9
Fix seam location if it's relative 2019-10-02 10:45:50 +02:00
Ghostkeeper
649ca99fe0
Only match on printer-specific materials, not variant-specific too 
If a submaterial doesn't exist for the current variant node but it does exist for a different variant node, then it would not be found in the variant-specific materials and then would be looked up in the printer-specific materials. It then depends on the order in which findInstanceContainersMetadata returns things for whether the actual printer-specific material is selected or a different variant-specific material is selected. No longer now, because the variant name is specified to be absent so it may not match on variant-specific profiles any more.
Maybe this even gives us a small performance gain when combining these dictionaries, since there are now like 80% fewer profiles in that query.

Contributes to issue CURA-6831.
 2019-10-02 08:55:13 +02:00
Ghostkeeper
0b610ccd58
Fix getting correct metadata entry for variant name 
Turns out that the material profiles deserialise the variant to the 'variant_name' metadata entry, not just 'variant'. This caused it to find no variant-specific material profiles at all anywhere. It would always fall back to the machine-specific names.

Contributes to issue CURA-6831.
 2019-10-02 08:55:12 +02:00
Ghostkeeper
c8be172343
Add debugging functionality to visualise the container tree 
Could be useful for later, don't you think?

Contributes to issue CURA-6831.
 2019-10-02 08:55:12 +02:00
Ghostkeeper
b245be6970
Remove has_machine_materials metadata 
It's not behaving as expected here. For instance, Ultimaker 3 wasn't specifying has_machine_materials and thus only the base materials would get loaded, but clearly the Ultimaker 3 has materials specialised for it.
Whether or not a printer has materials specialised for it is now determined by whether the specialisations exist in the material files. So we don't need the metadata entry any more. It seemed to have not been in use anyway, except by one printer which specified that has_machine_materials is true. I've now made it behave as if it's always true.

Contributes to issue CURA-6831.
 2019-10-02 08:55:04 +02:00
Lipu Fei
179fa325fc
Merge pull request #6458 from Ultimaker/CURA-6817_intent_fix_sync_config 
Fix synchronise configurations (intent branch).
 2019-10-02 08:53:53 +02:00
Lipu Fei
89c35cd03c Simplify code 
CURA-6817
 2019-10-02 08:53:00 +02:00
Lipu Fei
be33a9aa7e Fix updating current root material IDs 
CURA-6821
 2019-10-02 08:41:05 +02:00
ChrisTerBeke
445743ab75
Use empty string as fallback value 2019-10-01 19:53:40 +02:00