Commit graph

15 commits

Author SHA1 Message Date
Jaime van Kessel
a9bd73f32a Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-03-04 10:59:40 +01:00
fieldOfView
1c88e35ed9 Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files 2016-02-19 21:30:24 +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
Kurt Loeffler
050bc91912 Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI.
Cherry pick from master.
Conflicts:
	resources/machines/ultimaker2.json
	resources/machines/ultimaker_original.json

Contributes to issue CURA-276.
2015-12-23 12:02:42 +01:00
Kurt Loeffler
608bfa568b Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. 2015-12-14 11:14:55 -08:00
Tim Kuipers
ff500e4315 JSON: machine_extruder_trains array refactored to objcet with int children (CURA-494) 2015-12-09 14:15:23 +01:00
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +01:00
Tim Kuipers
8c629c511c JSON: temp flow settings 2015-10-27 16:49:43 +01:00
Arjen Hiemstra
acfd2861f1 Make the UMO upgrade selection page work properly 2015-10-05 16:47:45 +02:00
Arjen Hiemstra
690bd7b861 Fix add machine pages for UMO/+ 2015-09-03 10:14:17 -07: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
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
2015-08-21 13:29:30 +02:00
Arjen Hiemstra
1ff3a30ede Move the machine definition files to the new location 2015-08-05 20:11:37 +02:00
Renamed from resources/settings/ultimaker_original.json (Browse further)