3125 Commits

Author SHA1 Message Date
Tamara Hogenhout
6a097aaded put wizardcontant in a scrollview 2015-08-17 14:33:48 +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
Tamara Hogenhout
062df7c512 Changes the styling of the wizardPages
commits to #143
2015-08-13 10:49:24 +02:00
Tamara Hogenhout
b14f3d98bc Adds the styling and wizardPages (more directly) to the generic wizard
contributes to #143
2015-08-13 10:48:33 +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
Arjen Hiemstra
2b6e954caa Add a very simple basic profile 2015-08-13 09:30:38 +02:00
Arjen Hiemstra
7101acb850 Add some metadata to fdmprinter.json since that is now required 2015-08-13 09:30:25 +02:00
Jaime van Kessel
68b00691aa Merge pull request #247 from KJHamblin/master
RigidBot Mesh File Size Reduction
2015-08-13 09:16:07 +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
KJHamblin
6841badd35 RigidBot Mesh File Size Reduction
I did not pay attention to my file sizes when creating and submitting
the the first round of RigidBot meshes.  Oops!  I have decreased the
sizes from 30MB to 1.2MB without noticeable loss in quality.

Those springs hog a lot data.
2015-08-12 23:31:00 +02:00
Tamara Hogenhout
04ecce3070 Added version, manufacturer, author and others to it.
Adds to #239
2015-08-12 18:20:06 +02:00
Arjen Hiemstra
900e733839 Add a combo box and menu entries to select the current machine variant 2015-08-11 17:36:05 +02:00
Arjen Hiemstra
255caf8693 Add a combo box to select active profile 2015-08-11 17:35:36 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +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
Giao Trinh
ad88262345 Add STL platform file of 3DMaker Starter machine 2015-08-11 15:08:57 +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
c187337e8a Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-10 14:12:12 +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
Tamara Hogenhout
29c307f364 Adds the backspace as a schortcut to trigger the delete object action.
This StandardKey only works for MacOS, for more info see http://doc.qt.io/QtVirtualKeyboard/qml-qtquick-enterprise-virtualkeyboard-backspacekey.html

fixes #237
2015-08-10 12:24:24 +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
Arjen Hiemstra
842689d88e Update all uses of the Resources API with the changed API 2015-08-05 17:26:52 +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
Tim Kuipers
b36301347e Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-05 09:48:59 +02:00
Tim Kuipers
5ed7a16c62 removed statically defined extruder settings 2015-08-05 09:48:43 +02:00
Tim Kuipers
ec8ca8c58c extruder train defaults per extruder train in fdmPrinter.json 2015-08-04 16:45:27 +02:00
Arjen Hiemstra
cb06668628 Use OutputDeviceManagerProxy for save menu and button 2015-08-03 17:29:39 +02:00
Tamara Hogenhout
c1b55cc651 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-03 13:21:06 +02:00