3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
10548 commits 313 branches 275 tags 718 MiB
Commit graph

10548 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
889753f958 Fix unit test 
CURA-4360
 2017-10-02 15:12:56 +02:00
Jerooney
9cbd710593 Update camera color 
This will apply to all UMO+, UM2, UM2+ and UM3 with old firmware users, which look at the camera view. The background changed from blue > grey.
 2017-10-02 14:41:06 +02:00
jack
575c3ebebb Merge pull request #2530 from Ultimaker/CL-457_cura_connect_visual 
CL-457 cura connect visual
 2017-10-02 14:40:13 +02:00
Jaime van Kessel
1f8a5a1957 Minor codestyle refactor 2017-10-02 14:19:44 +02:00
Jaime van Kessel
8e4bc433d6 Added missing has_machine_quality tag for UM2 
CURA-4382
 2017-10-02 14:15:13 +02:00
Simon Edwards
e1001c1aa4 CL-470 Update the icon SVGs 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-02 13:53:09 +02:00
Jaime van Kessel
bd80a47652 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-02 13:36:33 +02:00
Jaime van Kessel
7a85dc28d7 Changing to a printer with user settings doesn't trigger keep/discard popup anymore 
Fixes #2499 CURA-4384
 2017-10-02 13:35:19 +02:00
Ghostkeeper
db46e9377d
Add translations for strings that were added after string freeze 
Please let's not do this again.

The Spanish, Dutch, French, German and Chinese translations were asked to a native or secondary speaker of the language in the office. The Finnish, Italian, Russian and Turkish translations are obtained from Google Translate (with some more clever searching than copy-paste). The Korean and Japanese translations are not needed since we don't translate cura.pot for those languages. The Polish and Brazillian Portuguese translations will be made after receiving the translations from the translators.

Contributes to issue CL-118.
 2017-10-02 13:33:08 +02:00
Jaime van Kessel
e33528538f Merge branch 'materials_empty' of github.com:Ultimaker/Cura into 3.0 2017-10-02 13:10:08 +02:00
Jack Ha
f15f6e2e37 CL-457 added margin to top in monitor screen 2017-10-02 11:55:54 +02:00
Jack Ha
48ad909431 CL-457 removed commented out code 2017-10-02 11:45:09 +02:00
Jack Ha
2264c6c303 CL-457 corrected qml errors 2017-10-02 11:37:08 +02:00
Diego Prado Gesto
daa0793427 Minor code changes - CURA-4395 2017-10-02 11:15:24 +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
3abf25937b CL-470 Add icons to the printer state box on the monitor tab. 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-01 13:30:44 +02:00
Simon Edwards
5865d52000 CL-474 Fix the image used for the camera icon 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-10-01 12:01:08 +02:00
Simon Edwards
553a309d23 CL-473 Print job duration time has the wrong format. Use the Cura format from the Prepare tab. 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-09-30 12:59:46 +02:00
Simon Edwards
eb85c28c10 CL-476 "View print jobs" and "View printers" buttons should be blue 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-09-30 11:46:55 +02:00
Simon Edwards
cee8a687da Show the printer status as 'printing' in the case that a running print job isn't under control of Cura Connect 2017-09-30 11:06:31 +02:00
Simon Edwards
43a6231131 CL-469 Remove the "Printer Group" text from the sidebar. 
Subtask of  CL-457 Cura plugin: primary visual improvements
 2017-09-30 11:05:47 +02:00
Simon Edwards
7aa2f5f0b8 Disable the fade on the monitor blue overlay to prevent the annoying "flash of blue" problem 
CL-457 CL-468
 2017-09-30 10:52:34 +02:00
Simon Edwards
e04a63d337 CL-468 The sidebar in the monitor tab should have a grey background 
Subtask of CL-457 Cura plugin: primary visual improvements
 2017-09-30 10:48:16 +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
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +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
A.Sasin
0912348cbe Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-29 13:53:18 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition 
CURA-4345
 2017-09-29 13:52:00 +02:00
Jaime van Kessel
0900a0ff07 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into fix_multiple_extruder_issues 2017-09-29 13:51:07 +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
jack
08baeabc4f Merge pull request #2509 from Ultimaker/CL-455_cura_connect_pause_abort 
CL-455 Implement the print job pause, resume and abort for Cura Connect
 2017-09-29 13:47:05 +02:00
Ghostkeeper
89de83254d
Update end g-code for Ultimaker 3 
As requested by Coen.

Contributes to issue EM-1859.
 2017-09-29 13:38:35 +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
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +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
Diego Prado Gesto
f0e89b7e01 Reverted a previous workaround that fixed errors when selecting material and variants in the application menus - CURA-4386 CURA-4379 2017-09-29 09:40:54 +02:00
Ghostkeeper
dbf13b0d1a
Fix calling loggers 
Because UM.Logger is a module, not the Logger class.
 2017-09-29 09:14:43 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This 
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
 2017-09-28 18:02:39 +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
Diego Prado Gesto
61e65d5cb0 Fixing code style - 
CURA-4386 CURA-4379
 2017-09-28 16:14:58 +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
Ghostkeeper
92c407580a
Comment out visibility of flow temperature graph 
Apparently it's not allowed to be in there. By being commented out I hope that a future developer won't make the same mistake and add it there to be editable in the interface.
 2017-09-28 15:33:00 +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
Mark
4e4e71ad4b Change AGPL to LGPL 2017-09-28 15:04:24 +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