GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,385 Commits 295 Branches 268 Tags
Commit Graph

21385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
4e8929a072
Fix structure of mock container tree 
Found during testing and tooling.
 2019-09-27 15:26:14 +02:00
Ghostkeeper
f33937eb7b
Use extruderList instead of extruders 
The extruders attribute is deprecated.

Found during testing and tooling.
 2019-09-27 15:25:41 +02:00
Ghostkeeper
97eaeab3bd
Fix missing intent in mock and missing quality_type 
These are used by the code. Otherwise there would be an AttributeError of 'intent' not existing, and the quality type in the quality node wouldn't match because it's a magic mock.
 2019-09-27 15:13:23 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +02:00
Remco Burema
31434ebde8 Fix QML nullptr warnings. 2019-09-27 11:51:50 +02:00
Lipu Fei
e5d94fd2e4 Change to "name" property 
CURA-6599
 2019-09-26 17:19:15 +02:00
Jaime van Kessel
f5639192ee
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-26 16:27:19 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Remco Burema
3c2467b6d6 Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent 2019-09-26 14:02:32 +02:00
Remco Burema
e452c640d4 Set empty intent if quality is empty. 
... instead of crashing.
Not _really_ part of a ticket, but I'm solving  this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807
 2019-09-26 14:02:21 +02:00
Jaime van Kessel
eced1fe907
Fix updating a profile with changed settings 2019-09-26 14:02:11 +02:00
Jaime van Kessel
b7b34eb6f7
Re-add the reset custom settings button to recommended panel 
CURA-6810
 2019-09-26 13:39:16 +02:00
Jaime van Kessel
785c33abec
Change the action_button_hover color in dark theme 
This makes it actually visible.
 2019-09-26 13:16:52 +02:00
Jaime van Kessel
b72b542d21
Add missing font & color 
CURA-6810
 2019-09-26 12:55:14 +02:00
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML 
CURA-6599
 2019-09-25 14:38:38 +02:00
Lipu Fei
d1330e5ffa Fix updating custom quality menu model 
CURA-6599
 2019-09-25 14:36:46 +02:00
Lipu Fei
f395c92732 Fix custom profile menu 
CURA-6599
 2019-09-25 08:28:24 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Lipu Fei
07269e4988 Merge remote-tracking branch 'origin/master' into feature_intent 2019-09-25 08:03:37 +02:00
Lipu Fei
af1a03d02f
Merge pull request #6400 from Ultimaker/CURA-6799_pause_at_height_resume_speed 
Cura 6799 pause at height resume speed
 2019-09-25 08:01:13 +02:00
Remco Burema
8412288cb2 Ignore leftover buildplate/'global' variants. 
part of CURA-6802
 2019-09-24 16:39:45 +02:00
Nino van Hooff
2fa4230d1c Only consider feedrates for extrusions (Pause At Height) 
CURA-6799
 2019-09-24 16:11:00 +02:00
Remco Burema
78effbb191 Upgrade globals as well. 
part of CURA-6802
 2019-09-24 15:57:30 +02:00
Jaime van Kessel
26d1b4057d
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 14:38:13 +02:00
Jaime van Kessel
1fc2ea7cd2
Merge pull request #6398 from Ultimaker/CURA-6768_4.3_translations_lionbridge 
Update translations for Cura 4.3 from Lionbridge
 2019-09-24 14:37:31 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
0b4a3039e5
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 14:24:57 +02:00
Jaime van Kessel
a741530db2
Also ensure that the container tree is used when selecting an intent 
CURA-6807
 2019-09-24 13:17:36 +02:00
Ellecross
4272a50515 Added CS tickets to the change log 4.3.0 2019-09-24 12:26:24 +02:00
Jaime van Kessel
f469b99471
Create intent nodes based on the selected quality type 
Previously it would use the material type from the material, but since
the material from the node can be different to that of the quality, we need
to use the one from quality instead (This is due to the fallback system)

CURA-6807
 2019-09-24 11:57:50 +02:00
Lipu Fei
bd314a765f Update setting_version 
CURA-6799
 2019-09-24 11:19:03 +02:00
Jaime van Kessel
984bee6f7e
Merge branch 'master-reweight-stages' of https://github.com/thopiekar/Cura 2019-09-24 11:14:42 +02:00
Lipu Fei
1977a865f1 Fix HMS434 version upgrade 
CURA-6774
 2019-09-24 11:05:52 +02:00
Lipu Fei
a6218179a9
Merge pull request #6329 from maukcc/master 
HMS434 change
 2019-09-24 11:04:50 +02:00
Ghostkeeper
9024567522
Remove multi-buildplate option 
It doesn't work any more.
 2019-09-24 11:04:00 +02:00
Jaime van Kessel
56c7fb9f7d
Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-24 10:34:21 +02:00
Jaime van Kessel
2d1dec098b
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-24 09:27:23 +02:00
Jaime van Kessel
3ab0b5decf
Add extra exception handling for UFPwriter 2019-09-24 09:24:36 +02:00
Jaime van Kessel
4dc918c647
Fix unit test 2019-09-23 17:09:54 +02:00
maukcc
184116995c HMS434 outside wall 2019-09-23 16:35:41 +02:00
Nino van Hooff
2a488b48e9 Restore feedrate at end of Pause at Height script for Repetier. 
CURA-6799
 2019-09-23 16:31:24 +02:00
Diego Prado Gesto
52eabaae49 Merge branch 'CURA-6768_4.3_translations_lionbridge' of github.com:Ultimaker/Cura into CURA-6768_4.3_translations_lionbridge 2019-09-23 16:25:10 +02:00
Diego Prado Gesto
d82f5b55c2 Change some strings in German, based on an internal review 
Contributes to CURA-6768.
 2019-09-23 16:23:04 +02:00
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script 
CURA-6799
 2019-09-23 16:10:27 +02:00
Ghostkeeper
557746a832
Partial fix for intent manager not finding correct profile in test 
Only in test.
 2019-09-23 15:17:15 +02:00
Ghostkeeper
7d40d962e8
Mock ContainerTree instead of ContainerRegistry to test intent manager 
Because now it relies on the container tree instead of querying the registry anew every time.
 2019-09-23 15:03:24 +02:00
Ghostkeeper
43a568cd06
Make fixes found through manual checking of translations 
I'm not a native speaker of French or Portuguese but enough to make those corrections of not translating 'Trimesh'. I'm not an expert of the Korean language to fix that missing translation but I made do with someone who learnt it as a second language. I am an expert at Dutch so I made a couple of fixes there.

Contributes to issue CURA-6768.
 2019-09-23 14:55:03 +02:00
Nino van Hooff
3552484477 Add missing newline 
CURA-6805
 2019-09-23 14:49:04 +02:00
Ghostkeeper
8f97751e11
Don't make 'print core' translatable 
It is an Ultimaker name so it should never be translated.

Contributes to issue CURA-6768.
 2019-09-23 14:35:22 +02:00
Ghostkeeper
80bc1119fc
Add clarification for translators of this file format 2019-09-23 14:25:55 +02:00