Tim Kuipers
69997587e9
JSON: introduced Outer Wall Inset (CURA-1098)
2016-03-15 10:00:41 +01:00
Tim Kuipers
d668438d1f
JSON: merge fix: support_minimal-diameter was double..
2016-03-14 13:57:13 +01:00
Ghostkeeper
a785c9a205
Fix merge conflict resolution
...
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a
Merge branch '2.1' of https://github.com/Ultimaker/Cura
2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585
JSOn/profiles: changed infill overlap to mm (CURA-786)
2016-03-03 17:28:45 +01:00
fieldOfView
2c2640f38b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 17:18:02 +01:00
fieldOfView
2f9d505fdc
Fix and move Innovo INVENTOR machine definition to machines folder
2016-03-03 17:17:36 +01:00
Tim Kuipers
b0befb6309
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 17:11:12 +01:00
Tim Kuipers
ff1cf02470
JSON: fix: magic surface mode had wrong default
2016-03-03 17:10:59 +01:00
fieldOfView
6d1a848e40
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 16:44:49 +01:00
fieldOfView
dfef811821
Update UM2+, UM2Ex and UM2Ex+ backplates
2016-03-03 16:19:24 +01:00
Tim Kuipers
884de2a8ce
JSON: fix: min_value should be a string also for third party printers :P
2016-03-03 13:09:28 +01:00
Tim Kuipers
b4b2267890
JSON: fix: rigidbot printers had duplicate id
2016-03-03 12:29:39 +01:00
Tim Kuipers
35fce68797
JSON: less warnings foor max retraction count (CURA-998)
2016-03-02 18:23:59 +01:00
Tim Kuipers
645139fcc8
JSON: made support default to false (CURA-983)
2016-03-02 17:14:06 +01:00
Tim Kuipers
411b8b0502
profiles: removed brim_line_count and let brim_width just use the default 8mm (CURA-983)
2016-03-02 17:13:04 +01:00
Tim Kuipers
0d142a03d0
JSON: changed support placement from buildplate to eveerywhere (CURA-983)
2016-03-02 17:11:32 +01:00
Tim Kuipers
4bde5c176f
JSON/profiles: fix: made travel_compensate_overlapping_walls_enabled always true (CURA-983)
2016-03-02 11:10:22 +01:00
fieldOfView
5cd1a760e7
Fix saving Gcode for UM2 with Olsson printers
...
Add file_format parameter to ultimaker2 with olsson block machine definitions. Also removes some machine overrides that were also removed from um2+ profiles.
Fixes CURA-980
2016-03-01 18:08:06 +01:00
Tim Kuipers
7b9ecd4aba
Revert "Make conical support invisible by default"
...
This reverts commit d54b24ac86
.
2016-03-01 12:16:55 +01:00
Jaime van Kessel
e3a12919f0
Slightly increased size of head for um2+
...
Discussed this with HW department, size of um2+ head is slightly bigger.
CURA-900
2016-03-01 11:34:36 +01:00
Tim Kuipers
98693e7a80
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-02-29 17:54:16 +01:00
Tim Kuipers
804af3cdda
JSON: fix global_only problems (CURA-458)
...
draft shield, support, coasting, auto temp, combing, platform adhesion, speed slowdown layers, travel speed
2016-02-29 17:41:19 +01:00
Tim Kuipers
451e3bd377
JSON: fix more dual extrusion global_only (CURA-458)
2016-02-29 17:39:37 +01:00
Tim Kuipers
f276dd0282
JSON: fix dual extrusion global_only (CURA-458)
2016-02-29 17:21:26 +01:00
Tim Kuipers
36f8bb5553
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-02-29 16:40:11 +01:00
Tim Kuipers
f8d7b9ddfa
JSON: wall line count should be 1 for magic spiralize (CURA-961)
2016-02-29 16:14:46 +01:00
Ghostkeeper
b9786e5208
Fix for infill overlap
...
Turns out it was only a distance on the master branch and should still be a percentage on 2.1. Sorry! The dependency on infill density still remains superfluous though.
Contributes to issue CURA-892.
2016-02-29 15:38:33 +01:00
Ghostkeeper
94314a7c2c
Make infill overlap depend on line width
...
Paul said this way was a better default for all our profiles.
Contributes to issue CURA-892.
2016-02-29 15:09:51 +01:00
Ghostkeeper
d54b24ac86
Make conical support invisible by default
...
It is considered an 'expert setting' since it is fairly experimental.
Contributes to issue CURA-942.
2016-02-29 10:43:25 +01:00
Ghostkeeper
c1385f5e4a
Merge pull request #643 from guigashm/master
...
prusa i3 filament diameter to 1.75
Conflicts:
resources/machines/prusa_i3_xl.json
2016-02-26 10:55:10 +01:00
guigas
614a52425d
filament diameter to 1.75
...
filament diameter to 1.75
2016-02-25 16:03:19 +00:00
guigas
bcfc20014e
add prusa I3 XL machine profile and STL
...
add prusa I3 XL machine profile and STL
2016-02-24 21:05:14 +00:00
Jaime van Kessel
dc1ee1d73b
Merge pull request #636 from Ultimaker/feature_um2upgrades
...
Support UM2 with Olsson block
2016-02-24 12:07:35 +01:00
Ghostkeeper
9233813768
Remove override settings from UM2+ machine settings
...
A lot of these settings were just normal tweaks, such as speed, which should be set in the profiles rather than the machine definition.
Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Tim Kuipers
88ddf714c4
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-02-23 15:20:48 +01:00
Tim Kuipers
3c7beac515
JSON: fix: all platform adhesion settings are not settable per object (CURA-458)
2016-02-23 13:45:18 +01:00
Tim Kuipers
ce99ab8630
JSON: fix: global_only not depending on print_sequence (CURA-923)
...
because there is a bug in the frontend which causes the per-meshgroup settings not to be sent to the meshgroup, but instead sends them to the object itself, no setting which are not editable per object should be editable per meshgroup.
2016-02-23 13:24:39 +01:00
Ghostkeeper
0989f8ced7
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-02-23 09:31:15 +01:00
Tim Kuipers
a168eab140
JSON: fix: cone angle sign inverted compared to description (CURA-869)
2016-02-22 16:51:56 +01:00
Ghostkeeper
cbcbf3c971
Improve default support settings
...
These were found by Paul to be better. I agree on the Touching Buildplate option being the one that the user most likely would use most often, and I am inclined to take his word on the support angle.
2016-02-22 15:45:21 +01:00
Ghostkeeper
2aac62f55b
Remove variant setting overrides from machine settings
...
These will be implemented by the new profiles.
Contributes to issue CURA-892.
2016-02-22 14:20:35 +01:00
Tim Kuipers
40e2593d01
infill overlap % ==> mm (CURA-786)
2016-02-22 14:07:16 +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
fieldOfView
e4d44acefb
Add support for Ultimaker 2 Extended with Olsson Block upgrade
2016-02-19 20:39:32 +01:00
fieldOfView
bcf0f507ad
Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block
2016-02-19 20:39:32 +01:00
Tim Kuipers
7425c32aa4
JSON: moved Standby Temp to dual_extrusion_settings (CURA-868)
2016-02-19 16:08:40 +01:00
Tim Kuipers
f0e60d65ff
JSON: disable Extrusion Cool Down Speed Modifier when no auto temp or single extrusion (CURA-868)
2016-02-19 15:56:14 +01:00
Tim Kuipers
765185364f
JSON: quickfix: made Auto Temp always not displayed (CURA-868)
2016-02-17 10:36:30 +01:00
fieldOfView
09c04d7c68
Add sidebar header icon for "machine" category
2016-02-16 22:43:36 +01:00