Commit graph

27 commits

Author SHA1 Message Date
Ghostkeeper
a785c9a205
Fix merge conflict resolution
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-03-04 10:59:40 +01:00
Tim Kuipers
451e3bd377 JSON: fix more dual extrusion global_only (CURA-458) 2016-02-29 17:39:37 +01:00
Tim Kuipers
f276dd0282 JSON: fix dual extrusion global_only (CURA-458) 2016-02-29 17:21:26 +01:00
Tim Kuipers
ce99ab8630 JSON: fix: global_only not depending on print_sequence (CURA-923)
because there is a bug in the frontend which causes the per-meshgroup settings not to be sent to the meshgroup, but instead sends them to the object itself, no setting which are not editable per object should be editable per meshgroup.
2016-02-23 13:24:39 +01:00
Tim Kuipers
7425c32aa4 JSON: moved Standby Temp to dual_extrusion_settings (CURA-868) 2016-02-19 16:08:40 +01:00
Jaime van Kessel
b2f37390fd Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:23 +01:00
Ghostkeeper
29e01a698b Match MIME types in printers with writer plugins
The MIME types as specified in the printer definitions need to match the MIME types specified in the mesh writer plugins.

Contributes to issue CURA-611.
2016-02-09 17:16:38 +01:00
Ghostkeeper
0fc17ffda0 Move file types to machine metadata
Much better place than machine settings...

Contributes to issue CURA-611.
2016-02-09 15:25:49 +01:00
Tim Kuipers
8a48791a0b Merge branch '2.1' 2016-01-28 15:25:18 +01:00
Tim Kuipers
02b4b9439b fix: all dual extrusion settings now have min_value(_warning) and max_value(_warning) specifications (CURA-666) 2016-01-07 19:16:56 +01:00
Tim Kuipers
cde6e4c655 JSON: extruder trains were reversed (CURA-494) 2015-12-14 15:20:09 +01:00
Tim Kuipers
99d9348c38 extruder trains can now be overridden (CURA-494) 2015-12-09 16:28:48 +01:00
Tim Kuipers
976abd5df8 JSON: support extruder nr for roof/layer_0 children of support_extruder_nr and introduced new support_infill_extruder_nr (CURA-366)
The engine now retrieves support_infill_extruder_nr instead of support_extruder_nr
2015-12-01 16:06:19 +01:00
Tim Kuipers
b245fe732b JSON: bugfix/feat: introduced missing Dual Extrusion Overlap 2015-11-26 17:03:58 +01:00
Tim Kuipers
914062a0bd JSON: prime tower visible by default 2015-11-26 12:26:17 +01:00
Tim Kuipers
e53a5b0928 JSON: bugfix: enable_prime_tower worked inversedly 2015-11-26 12:08:58 +01:00
Tim Kuipers
bddd74f816 default speeds different from print_speed (CURA-439) 2015-11-13 15:28:17 +01:00
Tim Kuipers
2783a4b8b6 JSON: support roof extruder and support first_layer_extruder were illegitimate children of support_extruder_nr 2015-11-03 16:30:19 +01:00
Tim Kuipers
dd5c016fa5 JSON: renamed hammock to support roof in dual_extrudion_printer.json 2015-11-03 16:03:46 +01:00
Arjen Hiemstra
0dee306c7f Remove extruder_x_temperature options 2015-10-06 16:55:31 +02:00
Arjen Hiemstra
0fca136fa8 Fix dual extrusion printer profile to confirm to updated JSON api 2015-10-06 14:53:32 +02:00
Arjen Hiemstra
6a36ceca7e Revert "Drop dual_extrusion JSON for 15.10"
This reverts commit 907f53240d.
2015-10-01 15:39:56 +02:00
Arjen Hiemstra
907f53240d Drop dual_extrusion JSON for 15.10
We do not support dual extrusion prinitng in 15.10 so there is no need
to bother with this currently.
2015-09-11 14:47:53 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Arjen Hiemstra
cbd685596e Add metadata to dual_extrusion_printer file 2015-08-25 18:12:40 +02:00
Arjen Hiemstra
17d3033b9a Move new JSON files to the right location 2015-08-25 18:11:49 +02:00
Renamed from resources/settings/dual_extrusion_printer.json (Browse further)