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

19469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
cc9aa1129a Revert "JSON: new setting infill_randomize_start_location" 
This reverts commit 89a74e8ae209f53e3b0876c3bef79bc19dc7c985.

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
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
f94344263b Fix merge conflicts 2019-04-09 11:33:07 +02:00
Lipu Fei
738886b4fb Merge remote-tracking branch 'origin/CURA-6057_fix_onboarding' into CURA-6447_fix_start_onboarding 2019-04-09 11:31:42 +02:00
Diego Prado Gesto
74fe1c5aa8 Set the alignWhenCentered to false 
so the radio button is perfectly centered instead of shifted

Contributes to CURA-6057.
 2019-04-09 11:14:52 +02:00
Jaime van Kessel
87c4c03283 Fix incorrect tag in start g-code 
Fixes #5591
 2019-04-09 10:47:55 +02:00
Jaime van Kessel
49a9561625 Added exception handling for serial write 2019-04-08 17:43:03 +02:00
Jaime van Kessel
2765122b95 Fix case where aborting a download would cause a crash 2019-04-08 17:32:43 +02:00
Jaime van Kessel
f5ef6aed8d Make textfield use states 
CURA-6435
 2019-04-08 17:10:36 +02:00
Diego Prado Gesto
bf47bfc4ea Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-08 16:26:43 +02:00
Diego Prado Gesto
7bf25a3be5 Also allow upper case CURAPACKAGE filenames 2019-04-08 16:26:14 +02:00
Lipu Fei
a0a9f20454 Fix disagree user agreement 
CURA-6057
 2019-04-08 15:06:40 +02:00
Lipu Fei
75e92aaa78 Adjust printer setup page for Mac 
CURA-6057
 2019-04-08 14:49:55 +02:00
Lipu Fei
3bf8a1f257 New style more info dialog for SliceInfo 
CURA-6057
 2019-04-08 14:34:35 +02:00
Lipu Fei
ac1b1a9902 Use ScrollableTextArea in whats new page 
CURA-6057
 2019-04-08 14:11:28 +02:00
Lipu Fei
4f1282df04 Add ScrollableTextArea 
CURA-6057
 2019-04-08 14:10:18 +02:00
Ian Paschal
1ef98d029d Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-04-08 13:45:21 +02:00
Ian Paschal
2a7df3cedd Fix untranslated string 
Contributes to CL-1302
 2019-04-08 13:45:09 +02:00
Jaime van Kessel
cbfe10a748 Prevent a zeroDivision error from crashing the usb printing 
This fixes #5592
 2019-04-08 13:36:48 +02:00
Jaime van Kessel
0bad57259c Increased the font size of notification icon to make it more readable 
CURA-6151
 2019-04-08 13:27:30 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page 
CURA-6057
 2019-04-08 13:06:30 +02:00
Lipu Fei
0bac3e8111 Fix button text 
CURA-6057
 2019-04-08 12:39:21 +02:00