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
ChrisTerBeke
07899ba798
Merge branch 'feature_hide_gradual_infill' into 3.0
2017-09-28 09:34:25 +02:00
ChrisTerBeke
ca277da35c
Merge branch '3.0'
2017-09-28 09:22:15 +02:00
ChrisTerBeke
bff79c63d5
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-28 09:21:53 +02:00
ChrisTerBeke
8f4692b3bb
Merge branch '3.0' into FieldOfView/fix_quality_disabled_alignment
2017-09-28 09:19:13 +02:00
Ghostkeeper
3fa281084f
Merge branch '3.0'
2017-09-28 09:17:55 +02:00
Ghostkeeper
2884e1e5b5
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-28 09:17:40 +02:00
ChrisTerBeke
f2e362838e
Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment
2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890
Hide gradual infill checkbox if the gradual infill steps setting is disabled
2017-09-27 22:28:20 +02:00
Ghostkeeper
c4fc4a7198
Add better descriptions for abbreviated units
...
This should help the translators next time to find better translations.
Contributes to issue CURA-4341.
2017-09-27 17:34:12 +02:00
Ghostkeeper
e56a6214d2
Fix grammar mistake
...
These are two sentences.
Contributes to issue CURA-4341.
2017-09-27 17:33:17 +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
