GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 23:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,489 Commits 290 Branches 260 Tags
Commit Graph

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
41d00af345 Moved timer back again, as arjen fixed the real issue 2016-03-01 10:57:29 +01:00
Jaime van Kessel
7ca3c39ec0 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 10:41:04 +01:00
Jaime van Kessel
ff3bca19ac Renamed getdefaultsavepath 2016-03-01 10:40:35 +01:00
fieldOfView
51ad894711 Properly disable Per Object Settings toolbutton on first start 
On an empty profile, the cura/active_mode preference is not set so the code disabling the button was not called.

Fixes CURA-901
 2016-03-01 10:34:00 +01:00
Jaime van Kessel
7985a961c4 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 09:31:05 +01:00
Jaime van Kessel
fa59416dc4 Added warning to logging if no one at a time print is possible 
CURA-972
 2016-03-01 09:30:33 +01:00
Arjen Hiemstra
3afd3f2209 Use the right style for the layer view slider and add a busy indicator to the current layer field 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
363fb0c4dd Remove layer view slider style from Cura theme's style file 
Since it is a plugin, it should not be in the main theme.

Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
110c3fa754 Do not react to all Scene changes in LayerView but just childrenChanged 
When the layer data is updated, a new node is attached to the scene
root. We can thus watch for only children changes since everything else
can be ignored.

Contributes to CURA-938
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
f2d98cfba3 Do not show a message when processing top layers but rather leave it up to QML 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
c684e96ef1 Expose the new busy property to QML 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
e0afc1535a Add a busy property to LayerView that indicates whether we are currently building top layers 
Contributes to CURA-957
 2016-03-01 02:11:46 +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