3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21624 commits 348 branches 300 tags 769 MiB
Commit graph

21624 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
932fb75145
Add maximum deviation setting 
This setting allows tweaking the deviation from the norm separately from the length of line segments.

Implements CURA-6458.
 2019-04-12 18:40:22 +02:00
Diego Prado Gesto
d0aee9da3f Merge branch 'master' into CURA-6447_fix_start_onboarding 2019-04-12 16:39:51 +02:00
Remco Burema
d3310be846 Deprecate some MachineManagaer functions. 
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!

part of CURA-6457
 2019-04-12 16:19:54 +02:00
Diego Prado Gesto
6169d1ad5c Change a label 
Contributes to CURA-6435.
 2019-04-12 16:16:10 +02:00
Diego Prado Gesto
969b5f7081 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-12 16:15:36 +02:00
Diego Prado Gesto
06a044b40f Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-12 16:10:15 +02:00
Diego Prado Gesto
82b7817fc6
Merge pull request #5616 from Ultimaker/CURA-6057_fix_onboarding 
Latest commits to onboarding
 2019-04-12 16:00:11 +02:00
Diego Prado Gesto
3bfe7df044 Fix the alignment of the MachineSelectorButton 
Sometimes it was creating a button with width zero. Now it expands to the width of the container.

Also fixing a small issue with the buttons and the link not being correctly aligned to the vertical center.

Contributes to CURA-6057.
 2019-04-12 15:45:10 +02:00
Diego Prado Gesto
1d9d10c909 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-12 13:54:45 +02:00
Remco Burema
367a12557f Filter placeholders-devices: but use parseBool instead. [CURA-6057] 2019-04-12 13:14:35 +02:00
Remco Burema
c5f4b30264 Don't show 'discovered' machines that are placeholders. [CURA-6057] 2019-04-12 13:01:39 +02:00
Lipu Fei
6383c77473 Fix section text 
CURA-6449
 2019-04-12 12:25:38 +02:00
Lipu Fei
26205fbdce Remove translation for Unknown printer type 
CURA-6449
 2019-04-12 12:23:24 +02:00
Lipu Fei
f303485595 Remove changelog preferences entry in version upgrade 
CURA-6436
CURA-6447
 2019-04-12 12:13:55 +02:00
Lipu Fei
3794c8f75e Remove ChangeLog plugin 
CURA-6436
CURA-6447
 2019-04-12 12:13:41 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Робокинетика
d5bf2a73f4
The correct author is specified 2019-04-12 12:43:59 +03:00
Simon Edwards
474aff2d4a
Merge pull request #5606 from Ultimaker/CL-1325_pass_output_device_to_cloud_check 
CL-1325 Pass output device (or not) to cloud check method
 2019-04-12 10:57:34 +02:00
Lipu Fei
e0e3c9609f Fix update should show logic 
CURA-6447
 2019-04-12 09:56:45 +02:00
Lipu Fei
4065a1204a Fix string comparisons 2019-04-12 08:52:35 +02:00
Робокинетика
724661b600
Fixed some flaws 2019-04-11 21:17:15 +03:00
Робокинетика
ba1459d575
Fixed some flaws 2019-04-11 21:15:12 +03:00
Lipu Fei
32fcc79dd8 Fix _shouldResolve() 
CURA-6456
 2019-04-11 16:34:57 +02:00
Remco Burema
55dcf31e3c Fix QML binding loop warnings for CustomConfiguration. 2019-04-11 16:24:51 +02:00
Remco Burema
db71a40acc Handle undefined extruder-color on start in RecommendedSupportSelector. 2019-04-11 16:23:36 +02:00
Remco Burema
852e7bc8f6 Fit missing font in material-vendor text. 2019-04-11 14:46:27 +02:00
Diego Prado Gesto
13be1eb9aa Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 14:20:39 +02:00
Diego Prado Gesto
a428bf49f4 Use the 'busy' property of the ActionButton 
Instead of creating a new BusyIndicator, use the existing one.

Contributes to CURA-6435.
 2019-04-11 14:20:17 +02:00
Diego Prado Gesto
aabcd71b72 Use the 'busy' property of the ActionButton 
Instead of creating a new BusyIndicator, use the existing one.

Contributes to CURA-6435.
 2019-04-11 14:17:10 +02:00
Tim Kuipers
7ccf1cd617 Revert "Revert "JSON: new setting infill_randomize_start_location"" 
This reverts commit cc9aa1129a.

Reintroduce the feature which I reverted on master (because I accidentally pushed to master).
 2019-04-11 14:08:49 +02:00
Tim Kuipers
cc9aa1129a Revert "JSON: new setting infill_randomize_start_location" 
This reverts commit 89a74e8ae2.

Accidentally committed to master.
 2019-04-11 14:07:52 +02:00
Tim Kuipers
89a74e8ae2 JSON: new setting infill_randomize_start_location 2019-04-11 13:59:43 +02:00
Diego Prado Gesto
96301842f2 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-11 12:47:19 +02:00
Diego Prado Gesto
a32488895b Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 12:08:18 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group 
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
 2019-04-11 11:33:01 +02:00
Jaime van Kessel
767ccad970 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-11 10:52:19 +02:00
Jaime van Kessel
c9a4f0c8b1 Fixed some minor qml issues with userOperations popup 2019-04-11 10:51:57 +02:00
Ian Paschal
17a5816b88 Fix typing 
Contributes to CL-1325
 2019-04-11 10:12:27 +02:00
Ian Paschal
61c38c5ec0 Pass output device (or not) to cloud check method 
Contributes to CL-1325
 2019-04-10 15:43:44 +02:00
Diego Prado Gesto
7d644c0d1a
Merge pull request #5594 from stecklars/anycubic-definition-fixes 
Fix comments in anycubic printer definitions
 2019-04-10 13:23:26 +02:00
Lipu Fei
01c0fe1ffb Fix update should show logic 
CURA-6447
 2019-04-10 10:52:11 +02:00
Lipu Fei
0665076018 Fix merge conflicts 2019-04-10 10:42:51 +02:00
Lipu Fei
0d437e7e96 Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 10:40:42 +02:00
Lipu Fei
70e97304d1 Fix add-by-ip page layout 
CURA-6057
 2019-04-10 10:33:11 +02:00
Lipu Fei
4bd3088b58 Fix ScrollableTextArea 
CURA-6447
 2019-04-10 09:50:39 +02:00
Lipu Fei
9a33a301ab Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 09:08:05 +02:00
Lipu Fei
0e49d3dc12
Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-10 09:06:55 +02:00
Lipu Fei
b692787def Fix how onboarding flow is shown 
CURA-6447
 2019-04-10 07:16:09 +02:00
Jaime van Kessel
9cc4665db8 Fix crash for when resetDownload is called after a long wait 
CURA-6448
 2019-04-09 17:10:18 +02:00
Jaime van Kessel
c2b901ae47 Merge branch 'CURA-6057_fix_onboarding' of github.com:Ultimaker/Cura 2019-04-09 16:34:36 +02:00