GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 02:05:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,552 Commits 295 Branches 268 Tags
Commit Graph

10552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jaime van Kessel
8313ea3d23 Merge pull request #2512 from fieldOfView/fix_cura_connect_hi_dpi 
Apply screenScaleFactor to Cura Connect UI
 2017-09-28 17:35:42 +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
fieldOfView
1715f0578d 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 15:42:52 +02:00
Ghostkeeper
15f09d0757
Merge branch '3.0' 2017-09-28 15:33:13 +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
Ghostkeeper
fd8ca69581
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:32:25 +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
fded206cc3 Merge branch '3.0' 2017-09-28 15:04:52 +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
Ghostkeeper
5e7445fc8b
Merge branch '3.0' 2017-09-28 13:24:18 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
Ghostkeeper
5d4a2ae097
Remove erroneously added CuraEngine 
Bad. Bad
 2017-09-28 13:23:54 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user) 
CURA-4345
 2017-09-28 13:22:15 +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
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Mark
729d61082a add CuraEngine to gitignore 2017-09-28 12:58:03 +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
ChrisTerBeke
c4c9375bc3 Merge branch '3.0' 2017-09-28 09:35:48 +02:00