GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 14:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,422 Commits 295 Branches 268 Tags
Commit Graph

13422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
f576b1f117 CURA-4400 fix crash when switching from disabled 1st extruder to single extruder machine 2018-03-08 14:28:57 +01:00
Ghostkeeper
375770818b
Add typing for _getPrinterOutputDevices 
Then my IDE will give hints on where a printer of the wrong type is being added.

Contributes to issue CURA-5061.
 2018-03-08 14:23:14 +01:00
Diego Prado Gesto
ae094c8201 CURA-4870 Disable the connect button in the discovery list when the 
printer is not a host of printers.
 2018-03-08 14:02:22 +01:00
Diego Prado Gesto
1bde7a6228 CURA-4870 Set the correct version of the QtQuick.Controls to be 
compliant with v5.8
 2018-03-08 14:01:19 +01:00
Jack Ha
a9976e93c1 CURA-4400 fix per object setting change reslicing without reevaluate is non printing mesh all the time 2018-03-08 13:57:11 +01:00
Ian Paschal
1a57e9323b Improved status icon size 2018-03-08 12:54:59 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Jack Ha
961b868424 CURA-4400 fix updating quality slider 2018-03-08 09:47:22 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Diego Prado Gesto
4c7ec3920d CURA-4870 Reduce text size of the Machine selector menu 2018-03-08 09:25:14 +01:00
Lipu Fei
2a10c9a2d7 Move assertion in _performMerge() 
CURA-5070
 2018-03-08 09:10:45 +01:00
Diego Prado Gesto
86103b4a0f CURA-4870 Change text size of the selected printer 2018-03-07 22:54:03 +01:00
Diego Prado Gesto
ae5f1c3408 CURA-4870 Add line separator between machine selector and sync button 2018-03-07 22:49:27 +01:00
Diego Prado Gesto
3629c3959e CURA-4870 Match the printer type in the dropdown with one of the 
available printer types in the group
 2018-03-07 22:33:15 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker 
Docker support
 2018-03-07 11:08:42 -08:00
Diego Prado Gesto
be8fc9f3f1 CURA-4870 Manage the case when there is an empty material or variant in the printer and Cura needs to apply this configuration 2018-03-07 19:59:06 +01:00
Diego Prado Gesto
2818ff7f31 CURA-4870 Fix binding loop in some components with the height property by changing the vertical alignments 2018-03-07 19:40:44 +01:00
Diego Prado Gesto
867e6388f2 Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 2018-03-07 18:55:54 +01:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the 
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
 2018-03-07 18:52:48 +01:00
Ian Paschal
a02486e85a Added status icon 2018-03-07 17:15:56 +01:00
Jack Ha
16cebe35ef CURA-4400 added docs to new functions 2018-03-07 16:41:03 +01:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading 
CURA-5056
 2018-03-07 16:38:24 +01:00
Lipu Fei
77e3be68b3 Add removeMaterialByRootId() in MaterialManager 
CURA-5056
 2018-03-07 16:38:24 +01:00
Lipu Fei
29792bbdd8 Reschedule update upon incomplete data in MaterialManager 
CURA-5056
 2018-03-07 16:38:24 +01:00
Ian Paschal
a704f59034
Merge pull request #3175 from smartavionics/mb-add-bridge-settings 
Add bridge settings to experimental category.
 2018-03-07 16:30:08 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output 
model so it can be used to show the buildplate name in the configuration
list.
 2018-03-07 13:57:13 +01:00
Diego Prado Gesto
0beee79c3a CURA-4870 Revert skipping stack checks 2018-03-07 13:17:55 +01:00
Jack Ha
859ac88357 Merge branch 'master' into feature_enable_disable_extruder 2018-03-07 12:59:40 +01:00
Diego Prado Gesto
7b772ffad7 Merge branch 'master' into feature_sync_button 2018-03-07 11:49:25 +01:00
Lipu Fei
27cce56467 Add error message for possible bugs in MaterialManager 
CURA-5056
 2018-03-07 11:45:49 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update 
CURA-5056
 2018-03-07 11:45:49 +01:00
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page 
CURA-4960
 2018-03-07 11:34:10 +01:00
Ghostkeeper
507de9c22c
Catch timeout exceptions when printing via USB 
If the firmware froze or something...
 2018-03-07 11:30:36 +01:00
Jack Ha
4568fab531 CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder 2018-03-07 11:27:23 +01:00
Diego Prado Gesto
6abbe7381a CURA-4870 Adjust a little bit the maximum size so three printers of two 
different types can fit
 2018-03-07 11:26:50 +01:00
Diego Prado Gesto
bb3d706c92 CURA-4870 Adapt the size of the sync dropdown to the height of the 
contents or a maximum size defined manually.
Create sections in the list view depending on the machine types that are
in the group.
 2018-03-07 11:24:02 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange 
I think this is more clear to the users what this should actually do.
 2018-03-07 11:01:00 +01:00
Lipu Fei
6cae5c2e35 Remove unnecessary signal connection in MaterialsModel 
CURA-5052
 2018-03-07 10:39:23 +01:00
Diego Prado Gesto
813f4e83e0 CURA-4870 Adjust colors for the selected configuration 
Remove the printer icon since it doesn't look as expected
 2018-03-07 09:56:38 +01:00
Jack Ha
bab46d7048 CURA-4400 only reevaluate non printing mesh if the setting actually matters 2018-03-06 17:19:31 +01:00
Lipu Fei
75d9297c7d Optimize 3MF writer and XML material serialization 
CURA-5049
 2018-03-06 17:05:58 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Ian Paschal
5b2ff705e7 CURA-4870 Add menu icons 2018-03-06 17:03:44 +01:00
Jack Ha
ab49bd9016 Merge branch 'feature_enable_disable_extruder' of github.com:Ultimaker/Cura into feature_enable_disable_extruder 2018-03-06 17:02:07 +01:00
Jack Ha
095d9fbdf6 CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 17:01:30 +01:00
Diego Prado Gesto
987794c515 CURA-4870 Update the Sync Button accordingly to changes both in the 
output device or in the current configuration, in order to check wether
a configuration matches or not.
 2018-03-06 16:59:51 +01:00
Jack Ha
92e80fa26a CURA-4400 Bugfix do not handle layer scene nodes in solidview 2018-03-06 16:28:40 +01:00
Jack Ha
63e679e4a0 CURA-4400 updated UM3 machine_head_with_fans_polygon 2018-03-06 16:28:00 +01:00
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00