Commit graph

3802 commits

Author SHA1 Message Date
Jaime van Kessel
b8f9535e74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-18 15:16:45 +02:00
Jaime van Kessel
3e908824b9 Added workaround for singleton not getting shortcuts
CURA-1603
2016-07-18 15:16:20 +02:00
Tim Kuipers
47fcec8271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-18 14:27:25 +02:00
Tim Kuipers
f079d83705 Merge branch 'feature_gradual_infill' 2016-07-18 14:27:12 +02:00
Jaime van Kessel
48d39ce387 material_guid is now also a setting in fdmprinter
CURA-1836
2016-07-18 11:46:12 +02:00
Jaime van Kessel
a17cf59699 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-18 10:26:38 +02:00
Jaime van Kessel
c2fab4da47 Print information handles single extrusion machines correctly again
CURA-1931 and CURA-1038
2016-07-18 10:25:51 +02:00
fieldOfView
935481e05f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-18 09:41:50 +02:00
Jaime van Kessel
56efb92f3e Added additional decoration to UpdateQualityContainerFromUserContainer
This allows the usage from QML withouth parameters. CURA-1890
2016-07-15 16:04:02 +02:00
Jaime van Kessel
dcc3bc8f80 Also refactored name of printlength in jobspecs.qml
CURA-1836
2016-07-15 15:56:39 +02:00
Jaime van Kessel
d46eafa968 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-15 15:56:28 +02:00
Jaime van Kessel
7a43164654 Both material weights & lengths are now exposed
CURA-1038
2016-07-15 15:49:25 +02:00
Tim Kuipers
8029139358 JSON fix: making max gradual infill steps lower to allow for engine not crashing when setting the infill to a low percentage (CURA-836) 2016-07-15 13:54:56 +02:00
Tim Kuipers
4c3860e06a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-15 13:34:21 +02:00
Tim Kuipers
a52095df0e JSON fix: disabled prime location by default (CURA-1816) 2016-07-15 13:32:43 +02:00
Tim Kuipers
942539981b JSON fix: moved prime location to category platform_adhesion (CURA-1816) 2016-07-15 13:30:17 +02:00
Jaime van Kessel
d48b4bf790 Material GUID is now sent to engine for each extruder
CURA-1836
2016-07-15 13:23:25 +02:00
Jaime van Kessel
6d92f50038 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-15 13:17:50 +02:00
Jaime van Kessel
bd183266c6 Forced size of heatup buttons in checkup
CURA-422
2016-07-15 13:11:36 +02:00
Tim Kuipers
3b44fd1608 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-15 12:58:13 +02:00
Tim Kuipers
026fd3e2dd feat: tetrahedral infill (CURA-1925) 2016-07-15 12:57:37 +02:00
Tim Kuipers
42d400d436 JSON feat: cubic isometric infill (CURA-1723) 2016-07-15 12:52:33 +02:00
Tim Kuipers
29457ab11f JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
just putting this commit under that issue so that it will be reviewed...
2016-07-15 12:52:14 +02:00
Jaime van Kessel
806197f56b Only basename is used for the name
CURA-1680
2016-07-15 12:10:09 +02:00
Jaime van Kessel
951e7bf629 Refusing to change material actually prevents material from being changed
CURA-1909
2016-07-15 11:40:43 +02:00
Jaime van Kessel
a7e22e82b6 Duplication now works regardles how deeply group nested a node is
CURA-1578
2016-07-15 11:20:08 +02:00
Tim Kuipers
3e97e008af JSON fix: gradual infill has max value; warning value may be a bit lower (CURA-836) 2016-07-14 18:54:54 +02:00
Tim Kuipers
5964856991 JSON fix: n_infill_steps ==> gradual_infill_steps (CURA-836) 2016-07-14 18:54:47 +02:00
Tim Kuipers
528aa2d961 JSON feat: Gradual Infill Steps and Gradual Infill Step Height (CURA-836) 2016-07-14 18:54:40 +02:00
fieldOfView
cd4774565b Add missing copyright notice 2016-07-14 18:44:29 +02:00
Jaime van Kessel
e291a4360f Removed definitions from empty instance containers
This caused empty profiles to pop up in dropdown. Issue is now fixed in
_emptyInstanceContainer where it should be fixed

CURA-1913
2016-07-14 17:02:26 +02:00
Jaime van Kessel
775e7f153b Empty containers now have fdmprinter as definition
CURA-1913
2016-07-14 11:26:56 +02:00
Ghostkeeper
1c37dc2d3d
Better warning values for extruder prime pos
Based on the machine dimensions and nozzle position.

Contributes to issue CURA-1816.
2016-07-14 09:13:37 +02:00
fieldOfView
daf03b0a7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-14 08:57:13 +02:00
fieldOfView
2c5644ff08 Only show Machine Actions for the currently active machine
Many machine actions act on the currently active printer, because they don't have a pointer to the printer selected on the Printer manager.
2016-07-14 08:55:53 +02:00
Jaime van Kessel
c92b2bc385 Changed order of setting properties
CURA-1842
2016-07-13 17:22:54 +02:00
Jaime van Kessel
66a64a7a2b Removing object from a group is now possible
CURA-1891
2016-07-13 16:23:49 +02:00
Arjen Hiemstra
f92f0c52c6 Another stray conflict marker 2016-07-13 14:33:42 +02:00
Arjen Hiemstra
36c185e921 Remove stray git conflict markers 2016-07-13 14:31:20 +02:00
Arjen Hiemstra
3f1bd5b586 Update changelog with corrections done after release
Also make sure to include all CureEngine features listed in the
online changelog

Contributes to CURA-1688
2016-07-13 14:21:59 +02:00
Jaime van Kessel
ec0e19e175 Removed material profiles field from sliceinfo 2016-07-13 14:20:41 +02:00
Jaime van Kessel
dfd56d049f getActiveExtruderStack now returns stack based on machine_id instead of definiton ID
Contributes to CURA-1898
2016-07-13 13:08:14 +02:00
Ghostkeeper
b33c2f9c25
Even better fallbacks for unknown subprofiles
These fallbacks specify their types so that they can be found with the filters.

Contributes to issue CURA-844.
2016-07-13 12:06:18 +02:00
Jaime van Kessel
de408666c3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 11:39:05 +02:00
fieldOfView
7eee1efa14 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-13 11:19:05 +02:00
fieldOfView
c37163059a Update wording to reflect the official HBK is also supported 2016-07-13 11:18:45 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders
Contributes to CURA-1898
2016-07-13 11:17:44 +02:00
Jaime van Kessel
936617f2aa Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 09:49:20 +02:00
Jaime van Kessel
b0137016f7 Fixed formating of documentation
CURA-1898
2016-07-13 09:46:23 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes.
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
2016-07-13 09:29:47 +02:00