Tim Kuipers
63afe917e5
JSON fix: combing mode has link icon now (CURA-2568)
2016-10-11 14:08:10 +02:00
fieldOfView
1bafe75664
Merge branch '2.3'
2016-10-11 13:40:10 +02:00
fieldOfView
15a870c050
Add some documentation
...
CURA-2544
2016-10-11 13:39:44 +02:00
fieldOfView
1fd7c2793c
Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3
2016-10-11 13:35:27 +02:00
fieldOfView
7e99fcc5d7
Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3
2016-10-11 13:35:04 +02:00
fieldOfView
d04e6a6644
Use buffered writing for writing gcode to removable drives
...
GCode files are still written line by line, but python is instructed to use buffering. This greatly decreases the total time required to write large(ish) files to USB drives, while having minimal impact on memory use.
CURA-2544
2016-10-11 13:34:48 +02:00
Ghostkeeper
0c604ca002
Update translation of PostProcessingPlugin
...
These were missed previous time because I had my extract script set-up wrong.
Contributes to issue CURA-570.
2016-10-11 13:34:02 +02:00
Jack Ha
aefa21c76b
Moved functions to better place. CURA-2449 CURA-2589
2016-10-11 13:05:24 +02:00
Tim Kuipers
311ebdc3ba
fix: changelog clarity improvements suggested by nickthetait (CURA-2000)
2016-10-11 11:35:20 +02:00
Tim Kuipers
3b38d52c75
fix: changelog bugfixes formatting (CURA-2000)
2016-10-11 11:22:16 +02:00
fieldOfView
0af42587b0
Fix jobname when opening multiple files at once
2016-10-10 18:42:55 +02:00
fieldOfView
6852e59404
Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3
2016-10-10 17:50:01 +02:00
fieldOfView
879ab529f2
Fix deleting grouped object using the context-menu
...
CURA-2573
2016-10-10 17:48:00 +02:00
Tim Kuipers
b38bb5a007
fix: nylon has standby temp 175 (CURA-2567)
2016-10-10 17:17:41 +02:00
Simon Edwards
2f8163b843
Merge branch '2.3'
2016-10-10 15:16:59 +02:00
fieldOfView
b4a2a0a417
Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3
2016-10-10 14:35:08 +02:00
fieldOfView
472ba7ed26
Fix exporting materials for machines other than those in the product_id_map
...
CURA-2583
2016-10-10 14:34:53 +02:00
Arjen Hiemstra
4464b7d40a
Fix installation of AppData file
2016-10-10 13:38:03 +02:00
Arjen Hiemstra
c67d698940
Merge branch '2.3'
...
* 2.3:
Return the empty container if there are no results when listing qualities
Return empty quality instead of None in QualityManager::findQualityByQualityType
Put material selection in warning state for unsupported materials
2016-10-10 13:37:31 +02:00
Arjen Hiemstra
c6afb14a09
Return the empty container if there are no results when listing qualities
...
Contributes to CURA-2271
2016-10-10 13:34:45 +02:00
Arjen Hiemstra
68662561e8
Return empty quality instead of None in QualityManager::findQualityByQualityType
...
Contributes to CURA-2271
2016-10-10 13:23:43 +02:00
fieldOfView
fea0dfdfa1
Put material selection in warning state for unsupported materials
...
CURA-2271
2016-10-10 13:19:20 +02:00
fieldOfView
4e507a203a
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-10-10 13:13:45 +02:00
fieldOfView
99ca2f7752
Put material selection in warning state for unsupported materials
...
CURA-2271
2016-10-10 13:12:56 +02:00
Tim Kuipers
cece4b0f41
fix: nylon has standby temp 175 (CURA-2567)
2016-10-10 11:02:43 +02:00
Ghostkeeper
aff66cf24b
Merge pull request #1031 from hughsie/wip/hughsie/appdata
...
Add an example AppData file so that Cura is visible in Linux software…
2016-10-10 10:26:51 +02:00
Jack Ha
83caa334a2
Also wait for lock file in saveSettings. CURA-2449
2016-10-10 09:09:31 +02:00
Jack Ha
fc0417bd45
Merge branch 'master' of github.com:Ultimaker/Cura
2016-10-09 11:54:48 +02:00
Jack Ha
8b0d6e974a
Added lock file writing and checking. CURA-2449
2016-10-09 11:54:34 +02:00
Ghostkeeper
608248bec8
Fix display of inherited materials
...
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.
Contributes to issue CURA-2576.
2016-10-08 17:14:24 +02:00
fieldOfView
90c3a09bc0
Add tooltip for formulas on profile overview tabs
2016-10-08 15:15:12 +02:00
fieldOfView
6bea0ad7b4
Select the currently active extruder on the profiles tab
2016-10-08 15:14:11 +02:00
fieldOfView
5d3d13e9ef
Make whole row for user & quality_changes values italic
...
The italic pattern is now shared between the sidebar and the profile overview. Current settings (user) and the values set in the custom profile (quality_changes) are now made italic in both places.
2016-10-08 14:52:39 +02:00
fieldOfView
fd5b512554
Hide incompatible material message when a compatible material is chosen
...
CURA-2271
2016-10-08 11:54:44 +02:00
Richard Hughes
6c81c9a735
Add an example AppData file so that Cura is visible in Linux software centers
...
Fixes: https://github.com/Ultimaker/Cura/issues/530
2016-10-08 10:01:35 +01:00
fieldOfView
59457ad326
Corrections suggested by @bagelorb
...
CURA-2000
2016-10-07 19:56:52 +02:00
Jaime van Kessel
dbea06689f
Extruder manager now uses right definition for material selection
2016-10-07 17:42:56 +02:00
Jaime van Kessel
aadc45c780
Merge branch '3mf_fixes' of github.com:Ultimaker/Cura
2016-10-07 16:51:37 +02:00
Tim Kuipers
74669d79d1
fix: use machine standby temp rather than Cura standby temp for Nylon fdm_material (CURA-2567)
2016-10-07 15:12:12 +02:00
Tim Kuipers
e2dd9bb958
fix: added missing fdm_materials from fdm_materials repo (CURA-2567)
2016-10-07 14:51:34 +02:00
Tim Kuipers
82c4460adf
fix: update materials from fdm_materials (CURA-2567)
2016-10-07 14:43:09 +02:00
Jaime van Kessel
8ac7558677
Apply transformation again
...
CURA-382
2016-10-07 14:31:48 +02:00
Jaime van Kessel
47870f43ef
Groups with just a single item are now discarded
...
CURA-382
2016-10-07 13:51:53 +02:00
Jaime van Kessel
7c59f8f2f2
Multiple objects are now handled with right transformation
2016-10-07 12:51:51 +02:00
Ghostkeeper
bfe3fa733a
Revert "Remove obsolete and outdated material files"
...
This reverts commit 47caacfd44
. That commit was giving some trouble with our build process. Eventually these files will need to be deleted, but not right before the new release.
Contributes to issue CURA-2567.
2016-10-07 11:05:41 +02:00
Jaime van Kessel
7d28f5cdf1
3mf reader now uses correct origin
2016-10-07 09:23:26 +02:00
fieldOfView
0201f50523
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-10-06 17:28:39 +02:00
fieldOfView
71c22e8369
Ensure profiles are always exported in order (global, ex. 0, ex. 1, ...)
...
The order is important because the importer expects this order.
CURA-2478
2016-10-06 17:28:33 +02:00
Arjen Hiemstra
47caacfd44
Remove obsolete and outdated material files
...
Contributes to CURA-2567
2016-10-06 17:27:00 +02:00
Arjen Hiemstra
c550dd5072
Use the active container stack for determining activeQualityVariantId
...
Contributes to CURA-2271
2016-10-06 16:41:51 +02:00