17030 Commits

Author SHA1 Message Date
Jaime van Kessel
1602bf0999 Re-Add the material & printcore selection to the configuration selector
CURA-5785
2018-11-09 16:59:10 +01:00
Remco Burema
8e05c2adcb Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922] 2018-11-09 15:27:02 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design
CURA-5785
2018-11-09 15:23:10 +01:00
Remco Burema
9bc85fcda7 Merge branch 'CURA-5922_add_safety_data_sheet_links' of https://github.com/Ultimaker/Cura into master_CURA-5922_add_safety_data_sheet_links 2018-11-09 15:16:22 +01:00
Jaime van Kessel
1d775c984e Added background padding to expandable component
CURA-5785
2018-11-09 14:31:06 +01:00
Ghostkeeper
7f54cacd0f
Code style
Discovered during work on CURA-5840.
2018-11-09 14:11:38 +01:00
Remco Burema
c8d9ad37ff Add Printing Guidelines links to materials in Marketplace. [CURA-5922] 2018-11-09 13:49:14 +01:00
Jaime van Kessel
2adb79aa39 Added re-usable expandable component
CURA-5785
2018-11-09 13:45:51 +01:00
Remco Burema
21d4cd8f9f Add Safety Data Sheet links to materials in Marketplace. [CURA-5922] 2018-11-09 13:44:42 +01:00
Ghostkeeper
161b200a67
Fix typo in label ID 2018-11-09 11:41:43 +01:00
Jaime van Kessel
88234f7e21 Change ExtruderIcon to match the new design
CURA-5785
2018-11-09 10:48:22 +01:00
Lipu Fei
c2e6bb8bc6 Merge remote-tracking branch 'origin/3.6' 2018-11-09 09:48:05 +01:00
Lipu Fei
80bf7bb989
Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade
Add version upgrade for quality profiles
2018-11-09 09:20:45 +01:00
Diego Prado Gesto
7a12cc53cc Merge branch 'master' into ui_rework_4_0 2018-11-09 08:53:31 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material
Use preferred material instead of generic PLA when creating a new material
2018-11-08 17:16:36 +01:00
Jaime van Kessel
d3302938b2 Fix technical data sheet not showing if there is no support_configs 2018-11-08 16:38:38 +01:00
Diego Prado Gesto
5b72fab2c1 Merge branch 'stelgenhof-master' 2018-11-08 16:30:25 +01:00
Diego Prado Gesto
3b8bc88a4d Merge branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master 2018-11-08 16:29:40 +01:00
Diego Prado Gesto
ad73cda215
Merge pull request #4739 from Ultimaker/reduce_buildplate_resolutions
Reduce resolution of heavy build plate meshes
2018-11-08 16:12:58 +01:00
Diego Prado Gesto
94e27fbbdb Add the quality folder to the version upgrade in order to update quality
profiles.

Contributes to CURA-5915.
2018-11-08 15:42:39 +01:00
Remco Burema
67fd0dd494 Merge branch 'cura4.0_header' into ui_rework_4_0 2018-11-08 15:34:58 +01:00
Remco Burema
d0ffab53ca Merge branch 'cura4.0_header' of https://github.com/Ultimaker/Cura into cura4.0_header 2018-11-08 15:34:07 +01:00
Remco Burema
2f2a960c0e
Merge pull request #4715 from Ultimaker/cura4.0_action_panel
Redesign of the Action Panel
2018-11-08 15:31:48 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Remco Burema
e66dd2be0b Action-Panel (CURA-5786) can now know about Preview-Stage (CURA-5829). 2018-11-08 15:03:24 +01:00
Remco Burema
215fc4e8ec Merge branch 'CURA-5829-Add-preview-stage' into ui_rework_4_0 2018-11-08 13:23:56 +01:00
Ghostkeeper
6d66060222
Don't allow support interface offset greater than support offset
The support interface can't exceed the volume of the support now, so this is now a technical limitation.

Contributes to issue CURA-5880.
2018-11-08 13:03:37 +01:00
Ghostkeeper
f132adc135
Rename 'Offset' to 'Horizontal Expansion'
This is more consistent with other similar settings.

Contributes to issue CURA-5880.
2018-11-08 12:59:24 +01:00
Ghostkeeper
dcc6003a92
Allow negative support interface offsets
There is no technical reason why this is not allowed. You could save some material with this.

Contributes to issue CURA-5880.
2018-11-08 12:50:09 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application
CURA-5840
2018-11-08 12:04:43 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor
CL-1140 Show print time in monitor tab
2018-11-08 11:53:47 +01:00
Remco Burema
aef5c67652 Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Ian Paschal
aa6ec9e44b Make text black
Contributes to CL-1040
2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab
Contributes to CL-1040
2018-11-08 10:49:22 +01:00
Ghostkeeper
d8a1d458cf
Merge branch '3.6' 2018-11-08 09:49:15 +01:00
Ghostkeeper
c5a9c6c6cc
Add translation for missing line in Korean
This one was not translated.

Contributes to issue CURA-5870.
2018-11-08 09:48:52 +01:00
Diego Prado Gesto
9f663cfd18 Change the gradient for the LinearGradient that works in the new versions of Qt.
I also changed it because we had a TODO here and I thought it was the right moment to do it.

Contributes to CURA-5829.
2018-11-07 17:25:43 +01:00
Jaime van Kessel
f15d03d48c Fix foldout of the layerview panel being too short or too long
CURA-5829
2018-11-07 16:30:52 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Lipu Fei
32cb7a78e8
Merge pull request #4749 from Ultimaker/CURA-5900_remove_CC0.6_PLA_profiles
Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core.
2018-11-07 13:52:16 +01:00
Diego Prado Gesto
58a01816aa Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core.
PLA is compatible with the print core but we don't want to provide
profiles because they were not fully tested.

Contributes to CURA-5900.
2018-11-07 13:39:06 +01:00
Jaime van Kessel
36a9642c90 Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura 2018-11-07 12:39:41 +01:00
Jaime van Kessel
68512a2184 Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-11-07 12:35:25 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Diego Prado Gesto
98534533a2 Merge branch '3.6' 2018-11-07 11:27:31 +01:00
Diego Prado Gesto
44ab6dee77
Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06
[3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"
2018-11-07 11:21:09 +01:00
Diego Prado Gesto
2c28e931ea Rename CC Red 0.6 to CC 0.6 in the Changelog.
Contributes to CURA-5900.
2018-11-07 11:06:40 +01:00
Lipu Fei
982123a04e Update bundled package versions for materials using CC 0.6 2018-11-07 10:32:30 +01:00