2050 Commits

Author SHA1 Message Date
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
Ghostkeeper
a3115bc548
Also take points on Z=0 with convex hull
Contributes to issue CURA-1009.
2016-03-03 16:14:59 +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
Arjen Hiemstra
66a9c63048 Add not using numpy.insert explanation to ProcessSlicedObjectJob
Contributes to CURA-708
2016-03-03 11:52:56 +01:00
Jaime van Kessel
ef206f5ab7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 11:36:54 +01:00
Jaime van Kessel
c4c5ba6c22 Top layers are now correctly updated when object is selected
CURA-992
2016-03-03 11:36:28 +01:00
Ghostkeeper
f6fc5fea06 Fix slicing not interrupting first layer processing job
The layer processing job that was triggered by switching to layer view was not stored in the field. The field is where the start of slicing looks for jobs to abort.

Contributes to issue CURA-864.
2016-03-03 11:31:59 +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
fieldOfView
90fda4cb3d Remove defaults section from current settings before adding it to a gcode file.
Contributes to CURA-936
2016-03-02 21:18:16 +01:00
Tim Kuipers
05a9b449af Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-02 18:24:08 +01:00
Tim Kuipers
35fce68797 JSON: less warnings foor max retraction count (CURA-998) 2016-03-02 18:23:59 +01:00
Ghostkeeper
7a913bf99a Fix comment
It had some variable name pasted into it by accident.

Contributes to issue CURA-936.
2016-03-02 17:31:58 +01:00
Tim Kuipers
2ca2581915 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-02 17:15:47 +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
Jaime van Kessel
9661d893fc Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-02 16:13:08 +01:00
Jaime van Kessel
6a1f04f54b Removed unusued import 2016-03-02 16:12:27 +01:00
Tim Kuipers
98652fea50 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-02 15:14:33 +01:00
Tim Kuipers
6411168fc9 profiles: regenerated abs and pce profiles for UM2+ (CURA-987) 2016-03-02 15:14:23 +01:00
Jaime van Kessel
a04a470794 Fixed order of one at a time printing
CURA-900
2016-03-02 14:49:54 +01:00
Jaime van Kessel
a50ef02d81 Code cleanup 2016-03-02 14:49:41 +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
Jaime van Kessel
9c9aed5442 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-02 10:46:49 +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
Jaime van Kessel
9c5e169f2b Loaded profiles are now marked as dirty so they are saved correctly
CURA-936
2016-03-01 16:24:43 +01:00
Jaime van Kessel
e90fd95495 Profile importing now checks if it's the right file type
Contributes to CURA-936
2016-03-01 15:16:50 +01:00
Ghostkeeper
d27d4df8ff
Move file open queue handling later
At the point where the file open queue was processed, the events weren't handled yet. Here's to hoping that they will be handled at this point (but I must commit before testing...).

Contributes to issue CURA-730.
2016-03-01 13:35:46 +01:00
Ghostkeeper
232713a019 Catch file open events before file loaders are loaded
The event is essentially delayed. The filename is put in a list by the event handler. The list of files is then loaded after all plug-ins are loaded.

Contributes to issue CURA-730.
2016-03-01 13:17:15 +01:00
Tim Kuipers
7b9ecd4aba Revert "Make conical support invisible by default"
This reverts commit d54b24ac86439fe9ae9d9915e70848e66dec99fb.
2016-03-01 12:16:55 +01:00
Jaime van Kessel
a72180ebf2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 11:35:28 +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
Ghostkeeper
5a3e67238e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 11:23:39 +01:00
Ghostkeeper
935596d603 Add log entry when opening a file via Qt event
This helps debugging CURA-730, and might also help debugging similar issues in the future. It's a user-triggered event so this warrants an info-level log entry.

Contributes to issue CURA-730.
2016-03-01 11:23:20 +01:00
Jaime van Kessel
f05eaf6d9c Too high objects (in one at a time) are now greyed out
CURA-972
2016-03-01 11:04:59 +01:00