3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
10534 commits 307 branches 270 tags 779 MiB
Commit graph

2535 commits

Author SHA1 Message Date
Simon Edwards
ece9f73a10 Don't actively none/null out the Qt network objects. Let them live longer to avoid "premature object destroy" crashes. 
CL-511
 2017-10-02 16:32:38 +02:00
Simon Edwards
4439ce1e43 Stop building and sending the POST request if the user has already aborted it all 
CL-511
 2017-10-02 16:31:32 +02:00
jack
9ac3f8654e Merge pull request #2522 from Ultimaker/CL-271_config_change_notification 
CL-271 Show a notification when a configuration change is needed for your print
 2017-10-02 10:41:31 +02:00
Jack Ha
b7a6a13336 CL-271 correct string and change Unknown printer to Unknown which is already in the catalog 2017-10-02 10:14:34 +02:00
Simon Edwards
21af3fb109 Show a notification when a configuration change is needed for your print 
CL-271
 2017-09-29 17:17:57 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
402617af1e Loading extruder stack files also for single extruder printers - CURA-4379 2017-09-29 15:16:14 +02:00
Jaime van Kessel
6d687d6f06 Re-enable changing of multi-extrusion machines to single extrusion 
CURA-4359
 2017-09-29 13:50:31 +02:00
Simon Edwards
e868b972b5 Implement the print job pause, resume and abort for Cura Connect 
CL-455
 2017-09-29 13:07:06 +02:00
Jack Ha
b7dd756427 CL-506 changed Aborted to Print aborted and added it to all translations on the top 2017-09-29 11:21:15 +02:00
Ghostkeeper
4932cc1e85
Revert string changes that can easily be reverted 
These strings can be re-used from other places.

Contributes to issue CL-506.
 2017-09-29 11:03:33 +02:00
fieldOfView
940a8a44c8 Apply screenScaleFactor to Cura Connect UI 
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.

Contributes to CURA-4376
 2017-09-28 17:36:35 +02:00
Jaime van Kessel
a7d06ff866 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-28 16:07:23 +02:00
Jaime van Kessel
38a2245d74 XML materials are now added in one batch 2017-09-28 16:07:03 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
jack
585b1dea3a Merge pull request #2508 from Ultimaker/CL-118_config_change 
CL-118 Add support and text for disabled printers and print jobs which require config changes.
 2017-09-28 15:15:51 +02:00
Simon Edwards
8658053a3b Improved status messages, and the 'printing' counter in the sidebar. 
CL-118
 2017-09-28 14:37:38 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Simon Edwards
01ff608a09 Change "Required action" to "Action required" 
CL-118
 2017-09-28 11:40:48 +02:00
Simon Edwards
4ca8bc5a9e CL-118 Add support and text for disabled printers and print jobs which require config changes. 2017-09-28 11:25:34 +02:00
Diego Prado Gesto
4b3e83f876 Not allowing to modify the number of extruders in multiextruder printers, except Custom FDM printers - CURA-4359 2017-09-27 15:55:34 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-27 14:20:38 +02:00
Ghostkeeper
d8c1546be3
Revert making the camera image black while it doesn't react 
This was giving segfaults sometimes on my computer. I suspect it's because the camera image could have been written to by both this Python code and by the camera itself, giving it a sort of data race or maybe that the image was discarded by the camera while it's being written to by Python. In any case, this should make it more stable.

Contributes to issue CURA-4376.
 2017-09-27 14:20:20 +02:00
Jaime van Kessel
2dee054003 Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0 2017-09-27 12:57:42 +02:00
fieldOfView
72bf073101 Fix LayerView layer box width 2017-09-27 11:43:14 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect 
CURA-4376
 2017-09-27 10:29:48 +02:00
Jaime van Kessel
cd11c6832d Added user agent header to firmware update 2017-09-27 09:37:38 +02:00
Jaime van Kessel
28aadc1b05 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-26 11:36:20 +02:00
Jaime van Kessel
826773ae42 Added a lot more logging to debug the not-authenticated issue 2017-09-26 11:20:14 +02:00
fieldOfView
7394a0c6ef Fix typo 2017-09-26 11:05:46 +02:00
Ghostkeeper
2fbcfe65ea
Only write the information we need to workspaces 
This way we can be sure that no sensitive information enters the workspaces even if some future developer or a plug-in puts it there.

Contributes to issue CURA-4371.
 2017-09-26 09:56:49 +02:00
Jaime van Kessel
583b776c6c Fixed error spam on progress sliced layer run 
CURA-4349
 2017-09-26 09:30:49 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
alekseisasin
d7ed8244ae In project loading dialog the CANCLE button did not work 
CURA-4345
 2017-09-25 14:32:02 +02:00
ChrisTerBeke
11241642b3 CURA-4354 fixed plugin injected tool icon path finding, example in PerObjectSettingsTool 2017-09-22 16:15:38 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0' 2017-09-22 09:55:05 +02:00
ChrisTerBeke
21ea99d9f2 CURA-4269 small code improvement for z-offset in project loading 2017-09-22 09:34:24 +02:00
ChrisTerBeke
e7e24caf97 CURA-4269 small code improvement for z-offset in project loading 2017-09-22 09:31:11 +02:00
alekseisasin
7c462f5703 After loading a model from a project Y position is ignored 
CURA-4269
 2017-09-21 17:36:12 +02:00
ChrisTerBeke
ddfb5f0b48 fix conflict after revert 2017-09-21 15:09:04 +02:00
Ghostkeeper
11060e010b
Clarify message title 
The title should add something to the message, such as a summary.
 2017-09-21 12:52:07 +02:00
Jaime van Kessel
b434fdb875 Layerview scrollbar now has fixed size. 
Instead of using the size of the other items. This worked when the bar was still part of the larger view, but since it's now
below the item it broke it.

CURA-4342
 2017-09-20 13:35:13 +02:00
Jaime van Kessel
ade1c039ea Print information not being set won't cause crash anymore 2017-09-20 11:03:20 +02:00
Jaime van Kessel
ddacdf523e Fixed some small issues when certain qml objects were null 
CURA-4349
 2017-09-20 09:48:00 +02:00
Jaime van Kessel
c4f5c970e5 Removed uneeded logging 2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5f3d45385 When project loading needs to create a new machine, also create a new definition changes 
CURA-4345
 2017-09-19 14:02:01 +02:00
ChrisTerBeke
b7671f3da7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-18 17:24:05 +02:00
ChrisTerBeke
e18b24add2 CURA-4269 use z offset decorator to keep project file positions below bed 2017-09-18 17:24:00 +02:00
Ghostkeeper
0060909117
Use named arguments for i18n string 
Otherwise the i18n system can't figure out which %s belongs to which parameter.

Contributes to issue CURA-4341.
 2017-09-18 17:13:01 +02:00