GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 21:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,547 Commits 290 Branches 260 Tags
Commit Graph

6672 Commits

Author SHA1 Message Date
Jaime van Kessel
fba7a6ff33
Fix importing profiles 
CURA-6847
 2019-10-02 17:01:21 +02:00
Lipu Fei
750632ec41 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-02 12:52:37 +02:00
ChrisTerBeke
445743ab75
Use empty string as fallback value 2019-10-01 19:53:40 +02:00
ChrisTerBeke
76536fe715
Ensure string matching is done with strings 2019-10-01 19:52:40 +02:00
ChrisTerBeke
5f31551184
Fix checking for cases where machine creation failed 2019-10-01 19:41:02 +02:00
ChrisTerBeke
c3d846440d
Set some meta data before switching active stacks, fix manual added device pairing 2019-10-01 19:31:35 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
ChrisTerBeke
99832c3a68
Use printer type name instead of id 2019-09-27 21:09:53 +02:00
ChrisTerBeke
9e54cc33ce
Move code 2019-09-27 20:50:46 +02:00
ChrisTerBeke
b18f9469bf
Select correct machine type connecting to output device 2019-09-27 20:39:57 +02:00
ChrisTerBeke
01e665a0d7
Partial revert of #6432, actually fix refreshing configurations 2019-09-27 19:25:23 +02:00
ChrisTerBeke
93c1c88793 Only show cloud flow message when signed in and not cloud connected yet, fix machine configuration when using legacy network selection flow 2019-09-27 13:38:13 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +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
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +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
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
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
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script 
CURA-6799
 2019-09-23 16:10:27 +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
Ghostkeeper
699e601de8
Improve context of override and new translation items 
Contributes to issue CURA-6768.
 2019-09-23 14:20:43 +02:00
Lipu Fei
8d77726089 Add intent logic for project loading 
CURA-6800
 2019-09-23 13:05:36 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Lipu Fei
18d93d0b7b Fix UM2 extended variants 
CURA-6775
 2019-09-23 10:43:58 +02:00
Thomas Karl Pietrowski
bdc35d7573 plugins: Reweighting stages 
In theory it should be possible to add stages, but there is no possiblity to add any other stage in between. Therefore I moved the weights by 10+n*10. So we can add 10 before prepare and 9 stages between those 3 known stages.
It is probably possible to set the same weight to multiple stages, but I'm not sure how Cura decides, which stage to take first then. By the moment the plugin's init is called? Or by alphabet?
Therefore putting some space in between the weights should give some clearity.
 2019-09-21 22:57:23 +02:00
Remco Burema
cb7d99d2dc Revert "Make 3MF-reader aware of setting-version for introduction Intent." 
This reverts commit 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab.

Should have been (and is now) done in the version upgrade instead.
 2019-09-20 11:56:08 +02:00
Ghostkeeper
3479a3df76
Fix _applyVariants using variant manager 
The variant manager doesn't get properly filled any more.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
12043df367
Don't use material manager to find or remove materials 
That remove function in the material manager was very weird...

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
729019a2dc
Don't use material manager to reset the material after uninstalling material package 
This class is deprecated.

Contributes to issue CURA-6776.
 2019-09-20 09:57:27 +02:00
Nino van Hooff
c43cdb5c63 Implement allowPositive for printhead settings 
CURA-6690
 2019-09-19 14:49:18 +02:00
Lipu Fei
472e6e88c3 Fix typing 2019-09-19 14:39:03 +02:00
Lipu Fei
d8b59c4471 Fix renamed um2 nozzles 
CURA-6599
 2019-09-19 14:26:01 +02:00
Lipu Fei
823f7e5921 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-19 14:14:29 +02:00
Nino van Hooff
17a832f52f Do not transform negative printhead min max values to positive while 
displaying

CURA-6690
 2019-09-19 13:56:37 +02:00
Ghostkeeper
8b8429d629
Merge branch 'CURA--6683_icons_per_object_settings' 2019-09-19 10:48:23 +02:00
Ghostkeeper
05de920c21
Once more with feeling 
Sorry, I didn't see the other review comment until after I pushed the previous commit.

Contributes to issue CURA-6600.
 2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files 
This naming is more consistent with the naming of the metadata entry and most of the other code.

Contributes to issue CURA-6600.
 2019-09-18 14:27:04 +02:00
Nino van Hooff
53ea6ce1a7 POS: Fix: currentMeshType reference 
CURA-6683
 2019-09-18 11:39:58 +02:00
Jaime van Kessel
549eb21a5a
Simplify the machinesettings qml 2019-09-18 11:24:11 +02:00
Nino van Hooff
7d66409494 POS: Refactor settings dialog into its own file 
CURA-6683
 2019-09-18 11:23:10 +02:00
Nino van Hooff
fbba39cb63 POS: Correct label text 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
be7bd59e30 Code Style: camelCase for qnl properties, brackets, commas 
CURA-6683
 2019-09-18 11:21:12 +02:00
Nino van Hooff
c3bbd884b5 Use Cura.SecondaryButton for POS select settings button per design 
CURA-6683
 2019-09-18 11:07:18 +02:00