Commit graph

12754 commits

Author SHA1 Message Date
Diego Prado Gesto
f27685e6ac CURA-4017 Enable the setting zig_zagiffy_infill for the grid and triangular patterns 2018-02-20 13:56:30 +01:00
Diego Prado Gesto
6b34f080ad Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-20 11:12:21 +01:00
Diego Prado Gesto
6af5a5d4bc CURA-4946 When storing the gcode profile, the definition must be the
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
2018-02-20 11:11:21 +01:00
Ian Paschal
481858c1b4
Merge pull request #3360 from Ultimaker/CURA-4790-lighter-weights
CURA-4790 Added weight properties to theme
2018-02-20 09:40:37 +01:00
Diego Prado Gesto
6a4f519238 Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when"
This reverts commit 744313af27.
2018-02-20 09:30:05 +01:00
Ian Paschal
1d4d592d45 CURA-4790 Added weight properties to theme 2018-02-19 16:52:32 +01:00
Jaime van Kessel
7e8ee00e06 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-19 15:38:06 +01:00
Jaime van Kessel
3cf16fd34b Removed sending of material profiles.
It takes a godawfull long time and the machine ignores most of them anyway.
2018-02-19 15:37:08 +01:00
fieldOfView
51062a4784 Add a button to open the configuration folder. 2018-02-19 15:30:39 +01:00
Aleksei S
8d98f20751 Merge branch 'master' of github.com:Ultimaker/cura 2018-02-19 15:05:16 +01:00
Aleksei S
1afe2668f7 Fix: Extreme small model was not automatically scaled. 2018-02-19 15:04:08 +01:00
Ian Paschal
438f11b2e6 CURA-4965 Custom / Duplicated Material's Build Plate Temperature returns to default
Holy hell that took a long time to figure out. Thanks @diegopradogesto!
2018-02-19 14:09:02 +01:00
Mark
9af6b4d6f6
Merge pull request #3264 from uBuild-3D/patch-1
Create ubuild-3d_mr_bot_280.def.json
2018-02-19 13:19:12 +01:00
Mark
3e7d7c4167
Merge pull request #3342 from probonopd/patch-4
Add AppImageKit to credits
2018-02-19 12:18:09 +01:00
Mark
2b70c83894
Merge pull request #3216 from dagoma3d/dagoma-profiles
Enhance Dagoma profiles
2018-02-19 12:12:23 +01:00
Jack Ha
823ac048fa Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-19 09:14:10 +01:00
Jack Ha
2c689ef03f Log markup 2018-02-19 09:14:04 +01:00
probonopd
e55f2d0355
Update cura.po 2018-02-17 15:02:37 +01:00
probonopd
38502e6829
Update cura.pot 2018-02-17 14:59:58 +01:00
probonopd
c84ba800d3
Update AboutDialog.qml 2018-02-17 14:58:25 +01:00
probonopd
19eb37e612
Update AboutDialog.qml 2018-02-17 14:53:07 +01:00
Diego Prado Gesto
cc2cc2a751 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 14:02:20 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
2018-02-16 14:01:46 +01:00
Aleksei S
f6095e9ad0 Merge branch 'master' of github.com:Ultimaker/cura 2018-02-16 11:50:03 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers
CURA-4962
2018-02-16 11:48:08 +01:00
Jaime van Kessel
16ab593eab Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-16 11:15:48 +01:00
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number.
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
2018-02-16 11:13:40 +01:00
Diego Prado Gesto
85059882fe CURA-4959 Add buildplate information to the summary when saving a
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.
2018-02-16 11:01:02 +01:00
Diego Prado Gesto
41d297f21a Merge branch 'Setting-Optimization' 2018-02-16 09:42:19 +01:00
Diego Prado Gesto
d2ba63147d Merge branch 'master' into Setting-Optimization 2018-02-16 09:39:30 +01:00
Diego Prado Gesto
125fd1a1e2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 09:15:12 +01:00
Diego Prado Gesto
735dac6a4a Modify debug message to show the correct/useful information 2018-02-16 09:15:06 +01:00
Aleksei S
86b31c3a6c Fix: in 3.0 version we did not save quality type under extruder.cfg in project
for custom fdm pritners. For this case during deserializing share quality stack
between global and extruder's stacks
CURA-4966
2018-02-16 09:12:42 +01:00
Mark
17943ceb70 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 15:49:19 +01:00
Mark
c508e77fe2 Improved the text 2018-02-15 15:49:06 +01:00
Jack Ha
530297b40a Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 15:23:34 +01:00
Jack Ha
06ec77e012 Better readability in PreviewPass 2018-02-15 15:23:17 +01:00
Diego Prado Gesto
ea5a95edaa Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-15 14:59:40 +01:00
Diego Prado Gesto
a2fde9f5f2 Revert "Fix rounded values in qml files"
This reverts commit f11a1341ee.
2018-02-15 14:58:58 +01:00
Mark
38e84b962d Make the large text a little bigger
CURA-4790
2018-02-15 14:19:45 +01:00
Jack Ha
1551560a6b Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 13:53:53 +01:00
Jack Ha
037298cf03 Tweaked the snapshot images to make it look prettier 2018-02-15 13:53:45 +01:00
Diego Prado Gesto
e7df8efe4d CURA-4698 Change value of setting as indicated by materials team 2018-02-15 13:34:37 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
Mark
2f37bd4b73 Add native rendering to Print Setup Label
CURA-4941
2018-02-15 12:57:42 +01:00
Mark
1e02463c7e
Merge pull request #3320 from fieldOfView/fix_text_rendertype
Set renderType to Text.NativeRendering for qtquick controls 2 Labels
2018-02-15 11:50:06 +01:00
fieldOfView
32d677295f Set rendertype for units in SettingTextField 2018-02-15 11:38:51 +01:00
fieldOfView
593dad7cca Fix categories too 2018-02-15 11:34:46 +01:00
Ian Paschal
bc47c6e623 Fix for CURA-4963
Exclude buildplate and nozzle meshes from being reloaded on F5 press.
2018-02-15 11:20:46 +01:00
fieldOfView
ec1cf4065e Set renderType to Text.NativeRendering for qtquick controls 2 Labels
Apparently, the qtquickcontrols 2 Label no longer defaults to using renderType: Text.NativeRendering
This causes text to render with QtRendering which looks subtly different on Windows and succinctly broken on some OSX installations.
2018-02-15 11:12:19 +01:00