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
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
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
dbf13b0d1a
Fix calling loggers
...
Because UM.Logger is a module, not the Logger class.
2017-09-29 09:14:43 +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
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
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
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
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
ChrisTerBeke
07899ba798
Merge branch 'feature_hide_gradual_infill' into 3.0
2017-09-28 09:34:25 +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
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
fcc914cf0d
Make material colour indication a circle instead of square
...
The rest of them are circles. This one should be one too.
2017-09-27 17:28:32 +02:00
Ghostkeeper
33fdca4a6b
Fix mistakes in translations from Bothof
...
What do we pay these guys for?
Contributes to issue CURA-4341.
2017-09-27 17:27:47 +02:00
Ghostkeeper
609187a4ce
Update translations from Bothof
...
These are the new translations we got from Bothof for German, Spanish, Finnish, French, Italian, Dutch, Turkish and Simplified Chinese.
Contributes to issue CURA-4341.
2017-09-27 17:26:29 +02:00
Diego Prado Gesto
dcf07e4f35
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-27 17:25:22 +02:00
Diego Prado Gesto
0731f942ae
Merge branch 'fix_infill_slider_rounding' into 3.0
2017-09-27 17:24:41 +02:00
Diego Prado Gesto
f8722a2d4b
Fixed code style in the function - CURA-4352
2017-09-27 17:21:43 +02:00
fieldOfView
47ad68bda7
Show ticks when they are not available
2017-09-27 17:20:55 +02:00
fieldOfView
87c7373cb0
Fix visibility when there are ticks but no available ticks
2017-09-27 17:14:41 +02:00
ChrisTerBeke
3ddb45160d
Update infill slider icon border color to not look like a checkbox, fixes #2487
2017-09-27 16:59:03 +02:00
ChrisTerBeke
e948f54ada
Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment
2017-09-27 16:37:40 +02:00
Diego Prado Gesto
c03d54f598
Merge branch '3.0' into fix_infill_slider_rounding
2017-09-27 16:11:10 +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
fieldOfView
3be8f45636
Move the quality indicator to the center when there is only one quality available
...
Fixes #2485
CURA-4383
2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a
CURA-4380 code improvements for build plate adhesion label
2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc
CURA-4380 gradual infill checkbox closer to slider to indicate category
2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c
CURA-4380 quality slider text disabled color when slider cannot be used
2017-09-27 14:32:05 +02:00
Mark
500989e36d
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:28:31 +02:00
Mark
aa93c67a94
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:27:04 +02:00
Ghostkeeper
78a6e686c1
Merge branch '3.0'
2017-09-27 14:23:20 +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
ChrisTerBeke
f5310ad2ff
Revert "For discard changed window retrieve data from setting "value" property instead of "resolve""
...
This reverts commit a2e0f4d64fcab35e0eeada795a20b725480013eb.
2017-09-27 14:16:56 +02:00
ChrisTerBeke
f8e8dcacdf
CURA-4381 use modulus to set infill slider step size and tick show
2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc
CURA-4352 fix passing int values as float when changing slider value
2017-09-27 13:13:55 +02:00
Jaime van Kessel
035a851eb0
Merge pull request #2480 from fieldOfView/fix_disable_solid_view
...
Make Solid View a required plugin
2017-09-27 13:03:51 +02:00
