Commit graph

12 commits

Author SHA1 Message Date
Ghostkeeper
c67ae0f1c9 Remove retraction settings from machine definitions
These should be different per material, not per machine.

Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
43dff1296c Move retraction distance to material settings
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1'
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
2016-04-04 18:49:09 +02:00
Tim Kuipers
4c47615145 JSON+profiles: removed shell thickness as a whole (CURA-1309) 2016-03-30 19:12:41 +02:00
Jaime van Kessel
b2f37390fd Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:23 +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
Ghostkeeper
80698c47de Add machine_file_format setting
This will determine which file formats a machine is able to save to. The setting is currently not yet used. It will be used to filter the output formats under the Save to File dialogue.

Contributes to issue CURA-611.
2016-02-09 13:50:02 +01:00
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +01:00
Nicanor Romero Venier
c95672ccd3 Reordered and changed settings in BQ profiles 2015-10-27 12:31:47 +01:00
Nicanor Romero Venier
bcd863d33b Renaming of BQ printers meshes 2015-10-27 12:06:21 +01:00
Arjen Hiemstra
8ac5c8d52d Move all contributed profiles to an "Other" manufacturer
CURA-210 #done
2015-09-29 17:23:28 +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