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
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
Ghostkeeper
17f0be6d56
Merge branch '3.0'
2017-09-29 09:15:52 +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
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
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
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
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
Ghostkeeper
3fa281084f
Merge branch '3.0'
2017-09-28 09:17:55 +02:00
Ghostkeeper
d999d1c7f2
Remove extra space
...
Just a typo.
Contributes to issue CURA-4341.
2017-09-27 17:32:47 +02:00
Ghostkeeper
df14ea2b1a
Proper capitalisation of 'OK'
...
This is consistent with the rest.
Contributes to issue CURA-4341.
2017-09-27 17:32:24 +02:00
Ghostkeeper
2715ef604d
Use lower case text for translation, then transform to upper case
...
The formatting is done in QML, regardless of how the data looks.
Contributes to issue CURA-4341.
2017-09-27 17:31:26 +02:00
Ghostkeeper
94846d0faf
Add missing word
...
I'm guessing it was 'This'. That must've accidentally gotten selected when working with it.
Contributes to issue CURA-4341.
2017-09-27 17:30:29 +02:00
Ghostkeeper
68b4dfd3c3
Fix spelling mistake
...
Contributes to issue CURA-4341.
2017-09-27 17:29:30 +02:00
Jaime van Kessel
fa66f2c117
Merge pull request #2481 from krisrok/master
...
refine abort sequence
2017-09-27 16:18:13 +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
krisrok
6641415a38
refine abort sequence
...
homing the head with "G28" does not work on my printer for some reason. "G28 X" and "G28 Y" however do.
this fix should not break behaviour on other printers as "G28" is just a shortcut.
2017-09-25 23:43:45 +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
