Commit graph

119 commits

Author SHA1 Message Date
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
Jaime van Kessel
21ff2eaab0 Fixed machine head polygons 2015-08-20 16:14:58 +02:00
Jaime van Kessel
329b2d4f77 Removed unused settings from fdmprinter 2015-08-20 15:49:43 +02:00
Tim Kuipers
b785ba05ac JSON bugfix: maker_starter had become wrong 2015-08-18 13:38:08 +02:00
Tim Kuipers
2c10c3a36b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-18 13:08:23 +02:00
Tim Kuipers
91aeef18cc JSON: removed dual settings from UMO and UM2 2015-08-18 13:08:05 +02:00
Tim Kuipers
3d58939738 moved new speed and line width settings to overrides 2015-08-18 13:07:38 +02:00
Tim Kuipers
2b81db03ed JSON: moved more settings to dual_extrusion_printer.json and corrected a json mistake there 2015-08-18 12:26:10 +02:00
Tim Kuipers
77778742b9 JSOn: refactor: renamed fill_... to infill_... 2015-08-18 11:51:42 +02:00
Tim Kuipers
9d9e6c5cf0 JSON: moved platform adhesion category below support 2015-08-18 11:39:49 +02:00
Tim Kuipers
8e74fbfff3 renamed wrong setting names in 3rd party machines, removed machine_nozzle_offsets 2015-08-18 11:38:29 +02:00
Tim Kuipers
1684b9c5f1 JSON: extracted dual extrusion settings and renamed categories Fixes and Line Dimensions to Mesh Fixes and Quality 2015-08-18 11:37:44 +02:00
Jaime van Kessel
c20b3bc2d5 Fixed crash 2015-08-18 10:50:54 +02:00
Jaime van Kessel
2454f78e2d Made machine wizard more dynamic 2015-08-18 10:46:56 +02:00
Tim Kuipers
bed540e912 JSON: default top/bottom layers back to 6 2015-08-17 17:09:57 +02:00
Tim Kuipers
5b5b02f599 JSON: bugfix: turn off infill overlap when infill is dense 2015-08-17 17:00:02 +02:00
Tim Kuipers
6b98cea003 JSONs: implemented overrides block for all [printer].json files: 3rd party and UMO 2015-08-17 16:24:44 +02:00
Arjen Hiemstra
f9bf27c148 Replace category stuff with the new setting overrides
As a test for the new functionality. Also cleans up the file a little.
2015-08-17 15:07:19 +02:00
Tamara Hogenhout
82e4f04e27 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 14:34:11 +02:00
Tim Kuipers
88f95d1357 JSON bugfix: UMO primed less at start thean retracted at end gcode 2015-08-17 13:39:08 +02:00
Tamara Hogenhout
178622a666 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 14:04:11 +02:00
Tamara Hogenhout
3a1e6333cc cleanup 2015-08-13 14:03:03 +02:00
Tim Kuipers
eba71a2516 JSON: removed machine_nozzle_offset_x_1 2015-08-13 12:30:06 +02:00
Tim Kuipers
5a0bf6189d Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 11:51:52 +02:00
Tim Kuipers
62acbb0dad JSON bugfix: parent had same name as child, for switch_extruder_retraction_speed 2015-08-13 11:51:06 +02:00
Tamara Hogenhout
41ee464879 Small changes to settingsfiles
changed the manufacturer of the grr Neo and deleted visibility of the 3D Starter because that inherits from fdmprinter.json
2015-08-13 10:51:09 +02:00
Tim Kuipers
196cf2bf51 renamed extruder_switch_retract settings and support_extruder_nr_layer_0 2015-08-13 10:31:25 +02:00
Tim Kuipers
bdc1ec9047 JSON: introduced machine_heat_zone_length also in UMO and UM2 2015-08-13 10:04:00 +02:00
Tim Kuipers
2ef951ba0b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 09:53:24 +02:00
Tim Kuipers
d92757ff6f JSON: moved retraction settings, introduced extrtuder switch position settings, introduced machine_heat_zone_length 2015-08-13 09:53:04 +02:00
Tim Kuipers
0514f290bd JSON: moved print_sequence to special_modes 2015-08-13 09:09:40 +02:00
Tim Kuipers
e5c87e7ad8 JSON: changed some defaults; disabled coasting! 2015-08-13 09:04:44 +02:00
Tamara Hogenhout
04ecce3070 Added version, manufacturer, author and others to it.
Adds to #239
2015-08-12 18:20:06 +02:00
awhiemstra
7d14888610 Merge pull request #239 from tvlgiao/master
Add profile for machine 3DMaker Starter
2015-08-11 11:11:51 +02:00
Giao Trinh
4843c21735 rename profile 3dmaker_starter and correct id 2015-08-11 15:22:24 +07:00
Giao Trinh
b45c46f7e8 Update profile file for 3DMaker Starter machine 2015-08-11 15:13:40 +07:00
KJHamblin
0a7e7b0702 Add RigidBot & RigidBotBig Profiles
This adds the RigidBot & RigidBotBig .json and .stl necessary for
support in Cura 15.06
2015-08-10 21:33:34 +02:00
Giao Trinh
a34031d319 Add profile for machine 3DMaker Starter 2015-08-10 21:54:38 +07:00
Tim Kuipers
0aa83c172e bugfix: old UMs use nozzle offset in gcode, not in machine 2015-08-10 16:10:36 +02:00
Tim Kuipers
1980862f53 new settings: support_conical_min_width, support_conical_angle 2015-08-10 16:09:45 +02:00
Tim Kuipers
d2d9be26bc feat: disable xy-shifted gcode: machine_use_extruder_offset_to_offset_coords 2015-08-10 15:20:55 +02:00
Tim Kuipers
f035a11902 natural language syntax error 2015-08-10 14:13:04 +02:00
Tim Kuipers
35dd4e0193 JSON: feat: support expansion offset 2015-08-10 14:12:03 +02:00
Tim Kuipers
17347da91d JSON: feat: conical support (experimental) 2015-08-10 14:11:26 +02:00
Tim Kuipers
7253531002 JSON bugfix: moved extruder train setting to specific JSONs 2015-08-06 17:05:56 +02:00
Tim Kuipers
b718627e81 JSON: moved extruder train specific settings to its own category 2015-08-06 16:43:05 +02:00
Tim Kuipers
513d4ed426 JSON: moved back statically defined extruder settings 2015-08-06 15:42:23 +02:00
Arjen Hiemstra
1ff3a30ede Move the machine definition files to the new location 2015-08-05 20:11:37 +02:00
Tim Kuipers
d4e69fd4db feature: json: extruder switch positions 2015-08-05 14:18:27 +02:00
Tim Kuipers
559780e268 removed statically defined extruder settings 2015-08-05 09:50:19 +02:00