Tim Kuipers
1608f06c6c
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-15 10:00:50 +01:00
Tim Kuipers
69997587e9
JSON: introduced Outer Wall Inset (CURA-1098)
2016-03-15 10:00:41 +01:00
fieldOfView
4e803a0815
Fix errors starting Cura with no machine selected
...
Contributes to CURA-855
2016-03-14 17:42:29 +01:00
fieldOfView
eb8a1bea8d
Add styling for disabled controls
...
Contributes to CURA-573
2016-03-14 15:58:25 +01:00
Tim Kuipers
d668438d1f
JSON: merge fix: support_minimal-diameter was double..
2016-03-14 13:57:13 +01:00
fieldOfView
83e4385e7e
Revert "Reimport default profiles from 15.04.04" because I did not oversee
...
the implications at the time
This reverts commit ce562713c3
.
2016-03-10 13:45:00 +01:00
fieldOfView
d8b082071d
Merge branch 'feature_profilesorting'
2016-03-10 13:44:38 +01:00
fieldOfView
cdc9ece474
Show separator between readonly profiles and custom profiles in profiles menu and sidebar profiles dropdown
...
Contributes to CURA-855
2016-03-10 11:57:47 +01:00
Ghostkeeper
ca1e9f6e52
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-09 09:38:18 +01:00
Ghostkeeper
ae0cb70d25
Tweak infill wipe distance
...
This wasn't taken over correctly from Paul's spreadsheet.
Contributes to issue CURA-892.
2016-03-09 09:38:02 +01:00
fieldOfView
48a181d0b5
Add weights to standard profiles for sorting
...
Contributes to CURA-1059
2016-03-08 17:45:00 +01:00
fieldOfView
81a015015d
Add "star" icon to profile dropdown when there are customised settings
...
Contributes to CURA-909
2016-03-08 12:06:21 +01:00
fieldOfView
00afebbc0d
Add translate icon
...
Contributes to CURA-838
2016-03-08 12:04:39 +01:00
fieldOfView
06445ef3bb
Add link to troubleshooting guide to simple mode
...
Fixes CURA-536
2016-03-07 15:19:27 +01:00
Jaime van Kessel
2ab999851c
Toolbar correctly shows location of toolpanel when not triggered through QML
...
Contributes to CURA-838
2016-03-07 14:12:44 +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
317706bbeb
Rename inventor_platform.stl to match the rest
2016-03-03 17:21:00 +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
22fadf396a
Fix 2 pixel space between save button and device selection menu button
2016-03-03 16:43:39 +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
ff3cd59ed0
added prusai3_xl_platform.stl
2016-03-03 12:27:06 +01:00
Tim Kuipers
7c8e08401b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 11:58:47 +01:00
Tim Kuipers
fc15b9e0b0
profiles: removed superfluous top_thickness and bottom_thickness from ABS and CPE profiles (CURA-1004)
2016-03-03 11:58:37 +01:00
fieldOfView
5cb1e9e2a6
Tweak layer slider appearance
2016-03-03 09:00:52 +01:00
fieldOfView
bc24a3c95b
Add sensible maximum length to machine name and job name entry
2016-03-02 22:39:15 +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
6411168fc9
profiles: regenerated abs and pce profiles for UM2+ (CURA-987)
2016-03-02 15:14:23 +01:00
Tim Kuipers
4cc3d03bae
prefoles: fix: platform_adhesion settings were spelled with capitals (CURA-983)
2016-03-02 14:10:22 +01:00
Tim Kuipers
777163cb1a
profiles: removed zhop=0 cause that was already default (CURA-983)
2016-03-02 12:23:02 +01:00
Tim Kuipers
fadb282cc6
profiles: fix: retraction_combing was All instead of true, but that was already the default (CURA-983)
2016-03-02 11:26:25 +01:00
Tim Kuipers
f1999db640
preofiles: fix: removed magic_mesh_surface_mode = False (CURA-983)
...
it is an enum, not a boolean!
it is already set to Normal by default
2016-03-02 11:13:34 +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
Tim Kuipers
b225cb5c34
profiles: fix: skin_no_small_skin_heuristic not set anymore in profiles, but now defaults to fdmPrinter default (TRUE) (CURA-983)
2016-03-02 11:02:13 +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
fieldOfView
bec897843d
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 17:24:06 +01:00
fieldOfView
f8681ed401
Use Open Sans font instead of Proxima Nova
...
Also removes unused Roboto font
Contributes to CURA-953
2016-03-01 17:22:25 +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
Jaime van Kessel
ff3bca19ac
Renamed getdefaultsavepath
2016-03-01 10:40:35 +01:00