GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 21:48:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,085 Commits 290 Branches 260 Tags
Commit Graph

11085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghostkeeper
bc53fea8aa
Merge branch 'mb-infill-offset' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-origin 2017-10-02 13:42:07 +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
Ghostkeeper
b468a4f0cc
Merge branch '3.0' 2017-10-02 13:35:47 +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
b5ce439c96 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-10-02 13:18:44 +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
Jerooney
6eb7932517 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 13:00:53 +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
Simon Edwards
58f22568c0 Merge pull request #2517 from Ultimaker/CL-460-avahi-connect-detect 
CL-460 do not downgrade Cura Connect printer to legacy
 2017-10-02 11:33:18 +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
Ghostkeeper
812873af15
Don't expand convex hull if offset < 0 
We can only do Minkowski sums now, no subtractions. So if there needs to be a subtraction, don't do anything for now. Previously it would expand with abs(hull_offset), so a negative value would cause expansion rather than contraction.

Contributes to issue #2042.
 2017-10-02 09:50:09 +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
9f8691feef Merge branch '3.0' of github.com:Ultimaker/Cura 2017-09-29 15:22:23 +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
Robin den Hertog
a18aaee6b6 Merge pull request #2507 from Ultimaker/CL-462_SyncTimeToPrinterIfPrinterHasNoTime 
CL-462
Tested  together with Randal seen by atleast me and @nallath and verry shortly @ghostkeeper
 2017-09-29 05:15:59 -07:00
Jack Ha
67d730c851 CL-460 use name instead of object to cluster_printers_seen 2017-09-29 13:58: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
ffe3e16b56
Merge branch '3.0' 2017-09-29 13:38:50 +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
Jack Ha
10fab716d5 CL-460 do not downgrade Cura Connect printer to legacy 2017-09-29 13:14:14 +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
daid
7f6de3aed5 CL-462, time sync to the printer if a printer has no valid system datetime. As any datetime is better then no datetime at all. 2017-09-29 12:41:24 +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
Ghostkeeper
0dba424617
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 10:49:38 +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
17f0be6d56
Merge branch '3.0' 2017-09-29 09:15:52 +02:00