880 Commits

Author SHA1 Message Date
Tamara Hogenhout
42fd35a8c2 15.10 Placement of the buttons in the contentArea
Contributes to: issue CURA-60
2015-08-17 17:22:58 +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
Jaime van Kessel
a7f33ea5e7 Updated other wizard pages to fit the changed wizard.qml 2015-08-17 15:24:24 +02:00
Jaime van Kessel
d69ca6fa41 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 15:18:56 +02:00
Jaime van Kessel
2b5627234a Changed selectupgradeparts 2015-08-17 15:18:46 +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
Tamara Hogenhout
6a097aaded put wizardcontant in a scrollview 2015-08-17 14:33:48 +02:00
Tim Kuipers
502a86705b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 13:39:18 +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
Jaime van Kessel
fa2aaaf021 Merge pull request #258 from thopiekar/patch-1
Correcting icon path
2015-08-17 09:36:46 +02:00
Thomas-Karl Pietrowski
97f67927e5 Correcting icon path 2015-08-16 02:05:57 +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
Jaime van Kessel
60294154e2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 13:36:39 +02:00
Jaime van Kessel
ddc34eaa3a Fixed bug that caused crash when object was entirely below platform 2015-08-13 13:35:51 +02:00
Tim Kuipers
38c9d6d847 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 12:30:15 +02:00
Tim Kuipers
eba71a2516 JSON: removed machine_nozzle_offset_x_1 2015-08-13 12:30:06 +02:00
Jaime van Kessel
a63d08288a Ignored runtime exception for usb thread 2015-08-13 12:14:47 +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
Jaime van Kessel
0989c8345e Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-13 11:25:45 +02:00
Jaime van Kessel
49e39d637c Added cutoff distance 2015-08-13 11:25:34 +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
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
Jaime van Kessel
377d43942a Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-12 15:21:02 +02:00
Jaime van Kessel
04b8961297 Updates to ensure that usb printing now works via output device API 2015-08-12 15:19:20 +02:00
Arjen Hiemstra
ae79139cc4 Handle Open File events on Mac OSX 2015-08-11 16:48:50 +02:00
Jaime van Kessel
a47c8f7ef6 Updated documentation 2015-08-11 16:01:12 +02:00
Jaime van Kessel
102b2e7fa0 Fixed crash when no transformation was provided in 3mf file 2015-08-11 15:09:00 +02:00
Jaime van Kessel
cfe538c4b7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-11 15:00:04 +02:00
Jaime van Kessel
d0769f0ac9 Fixes for 3mf multiple object loading 2015-08-11 14:59:39 +02:00
Jaime van Kessel
2119d76ab2 Changes to meshreading, which now returns node instead of mesh 2015-08-11 11:35:25 +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
Jaime van Kessel
0d14e830f2 Merge pull request #241 from KJHamblin/master
Add RigidBot & RigidBotBig Profiles
2015-08-11 09:32:56 +02:00