Commit graph

7424 commits

Author SHA1 Message Date
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
Jaime van Kessel
676182cd54 Fixed authentication timeout
CURA-1916
2016-07-15 10:52:31 +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
Johan K
3d413df215 Changed the point data type sent from the backend from int64 to float.
Added extruder information to LayerPolygon
2016-07-14 11:08:05 +02:00
fieldOfView
e7b8517a39 Merge branch 'master' of https://github.com/fieldOfView/MachineSettingsActionPlugin 2016-07-14 10:34:48 +02:00
Aldo Hoeben
c7df086387 Update README.md
Fix typo
2016-07-14 10:34:29 +02:00
Aldo Hoeben
0f3b8a4aa4 Add a note about adding the action to the first_start_actions of a generic machine definition 2016-07-14 10:33:59 +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
fieldOfView
2d77fefdb0 Remove action for multiextruder printers and printers that use variants
(for now)
2016-07-14 08:50:54 +02:00
fieldOfView
3f56685acc Use new-style imports 2016-07-13 23:26:28 +02:00
fieldOfView
09c95001ed Store customized settings in variant instead of user profile 2016-07-13 22:45:58 +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
fieldOfView
4e62d7d951 Remove dangling argument 2016-07-13 12:55:11 +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
Jack Ha
ecbc387020 Merge branch 'master' into cura-1811 2016-07-13 11:15:16 +02:00
Jack Ha
9eade0707b Added prime locations to machine_disallowed_areas.
CURA-1811
2016-07-13 11:14:15 +02:00
fieldOfView
e7f139b048 First commit 2016-07-13 11:07:48 +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
fieldOfView
b622c7ecc8 Initialise variant, material and quality to empty containers of the respective type
Before it would be impossible to switch to a valid option once a variant/material/quality had gone to an "empty" state. Now at least it is recoverable.
2016-07-12 18:29:40 +02:00
Tim Kuipers
779f66967e JSON fix: support speed was only enabled when roofs were enabled 2016-07-12 14:48:40 +02:00
Ghostkeeper
dc7ca47be9 Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 14:45:09 +02:00
Tim Kuipers
878bf35356 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-07-12 14:43:10 +02:00
Tim Kuipers
7d2ae57f86 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-07-12 14:41:10 +02:00
Tim Kuipers
94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge
Merge branch 'feature_firmware_travel_settings'  c755479b1b
overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version.

This commit is just fdmprinter.def.json as it was at 2c09fc4a67
2016-07-12 14:38:39 +02:00
Ghostkeeper
f63acc98b8
Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 13:47:25 +02:00
fieldOfView
f5f3f9c516 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-12 13:10:08 +02:00
fieldOfView
08213890fb Remove reliance on "_current_settings" postfix when removing user profile containers
CURA-1896
2016-07-12 13:09:53 +02:00
Simon Edwards
64ecb114b8 Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import.
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
2016-07-12 12:41:49 +02:00
Tim Kuipers
26612e17b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-12 11:22:37 +02:00