Commit graph

14 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
Tim Kuipers
3c919e9652 Revert "JSOn/profiles: changed infill overlap to mm (CURA-786)"
This reverts commit 24f1726585.
2016-04-11 19:04: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
Tim Kuipers
24f1726585 JSOn/profiles: changed infill overlap to mm (CURA-786) 2016-03-03 17:28:45 +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
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
b9b798002a Fixed indentation of JSON profiles 2015-10-27 12:51:13 +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
Nicanor Romero Venier
ead30e71ec Added profiles for 2nd Gen printers from BQ 2015-10-14 12:49:43 +02:00