GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-16 09:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,136 Commits 295 Branches 268 Tags
Commit Graph

5136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
20c9cb2547 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 15:38:39 +02:00
fieldOfView
a998d59693 Fix setting heated bed upgrade option 
A new variant was created, but the property was set on the old variant.

CURA-2253
 2016-09-07 15:38:27 +02:00
Jaime van Kessel
304b958753 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-07 15:29:38 +02:00
Jaime van Kessel
3457b94f65 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 15:29:26 +02:00
Jaime van Kessel
bbb211b0f6 Saving profile to g-code with empty container no longer results in empty string 2016-09-07 15:28:58 +02:00
fieldOfView
bf394a42d5 Fix UMO-DualExtrusion prime tower location 
CURA-2283
 2016-09-07 15:26:51 +02:00
Jaime van Kessel
097e038700 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-07 15:11:37 +02:00
Ghostkeeper
0794f9f31c Fix grammar in documentation 
Contributes to issue CURA-1601.
 2016-09-07 14:02:03 +02:00
Ghostkeeper
6c258e2214 Update copyright notice 
Today we live in 2016.

Contributes to issue CURA-1601.
 2016-09-07 14:02:02 +02:00
fieldOfView
26a6df4c4d Fix indentation 
CURA-1601
 2016-09-07 14:02:01 +02:00
fieldOfView
5d9e1c2458 Improve depth sorting on layers 
CURA-1601
 2016-09-07 14:02:01 +02:00
fieldOfView
f1b81dfad0 Code style 
CURA-1601
 2016-09-07 14:02:00 +02:00
fieldOfView
4e3f4162c2 Make background color a uniform 
CURA-1601
 2016-09-07 14:02:00 +02:00
fieldOfView
66f8a62e6c Move busy handling into LayerPass and cleanup 
CURA-1601
 2016-09-07 14:01:59 +02:00
fieldOfView
17b12b9048 Move layer data into LayerPass for cleaner access 
CURA-1601
 2016-09-07 14:01:58 +02:00
fieldOfView
2c35f0196d Code cleanup 
CURA-1601
 2016-09-07 14:01:10 +02:00
fieldOfView
b090eab221 Use renderpass to render layers above ghosts 
CURA-1601
 2016-09-07 14:01:09 +02:00
fieldOfView
90a1f5f8ed Revert "Revert "Show "ghosts" for all objects on the buildplate in layerview"" 
This reverts commit 0f9b989ae86fa319269a715d960b533f2a51c09d.
 2016-09-07 14:01:09 +02:00
fieldOfView
8c2a8944e8 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 13:57:21 +02:00
fieldOfView
fe34938bce Update wording 2016-09-07 13:57:09 +02:00
Simon Edwards
caa3ee3d6b Merge branch '2.3' 2016-09-07 11:34:46 +02:00
Simon Edwards
cce94c8043 Added skin_overlap <= infill_overlap mapping. 
Contributes to CURA-844 Profile converter 2.1 ==> 2.2
 2016-09-07 11:32:25 +02:00
Simon Edwards
720cca63bd Added skin_overlap <= infill_overlap mapping. 
Contributes to CURA-844 Profile converter 2.1 ==> 2.2
 2016-09-07 11:31:02 +02:00
Aldo Hoeben
7edf36473d Fix merge mistake 2016-09-07 11:19:21 +02:00
Simon Edwards
21858cf0b7 Merge branch '2.3' 2016-09-07 11:16:12 +02:00
Aldo Hoeben
33d9f94f5c Merge remote-tracking branch 'origin/2.3' 2016-09-07 11:14:42 +02:00
Simon Edwards
86369ce1da Profile import now supports 2.1 profiles and does any needed conversion work. 
Contributes to CURA-2252 Import ini profile fails in 2.3
 2016-09-07 11:13:25 +02:00
Jaime van Kessel
1bafac94bd Value functions are now correcty copied when using per-object settings 
CURA-2224
 2016-09-07 09:55:22 +02:00
Jaime van Kessel
17d8c1e9c1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 09:21:53 +02:00
Jaime van Kessel
e010c90c43 No longer set move_vector when we don't have to 2016-09-07 09:21:19 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles 
CURA-2161
 2016-09-06 17:46:11 +02:00
awhiemstra
16605a3e01 Move the UraniumTranslationTools include into the enabled check 
So that we can still build Cura even if we do not care about translations.
 2016-09-06 17:13:15 +02:00
Jack Ha
9ab0cf9cb3 Merge branch '2.3' 2016-09-06 16:54:04 +02:00
fieldOfView
68ddf90d58 Make behavior of Create Profile consistent between prefs and menu 
CURA-2161
 2016-09-06 15:39:44 +02:00
fieldOfView
a40476eb62 Add distinctive titles to profile rename dialogs 
CURA-2161
 2016-09-06 15:38:27 +02:00
fieldOfView
7a6124f221 Get the overhang angle from the proper multiextrusion stack 
CURA-2289
 2016-09-06 14:58:29 +02:00
fieldOfView
291406fef2 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 13:07:36 +02:00
fieldOfView
fc6e92e10f Fix uploading custom firmware on windows 
The simple string replacement left an extraneous "/" in front of the path, which Windows can't handle. QUrl.toLocalFile() does a proper conversion.

CURA-955
 2016-09-06 13:07:15 +02:00
Jaime van Kessel
1999e587b6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 11:43:27 +02:00
Jaime van Kessel
75c1f12d33 If a group node is outside build area, all it's children are also marked as such 
CURA-403
 2016-09-06 11:42:46 +02:00
fieldOfView
dc01cdbc88 Fix displaying support interface in layerview 
CURA-2049
 2016-09-06 11:30:38 +02:00
fieldOfView
eb3cfd47cd Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 11:22:20 +02:00
Ghostkeeper
7c8e80b751
Properly hide moves and retractions in lower layers 
Not the neatest solution. We might want to make a preference for this? I sorta like to see those travel moves, actually.

Contributes to issue CURA-2049.
 2016-09-06 11:21:48 +02:00
fieldOfView
edd9643703 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 10:56:38 +02:00
Ghostkeeper
c7514dfab9
Fix merge mistake 
I hadn't really figured out PyCharm's merge tool yet.
 2016-09-06 10:47:36 +02:00
Ghostkeeper
fcbf4a93f3
Merge branch '2.3' 
Conflicts:
	resources/qml/MonitorButton.qml
 2016-09-06 10:43:54 +02:00
Ghostkeeper
635f26da8e
Lower warning values for retraction speeds 
As discussed with David, the warning should really be quite a bit lower. No printers actually reach 100.

Contributes to issue CURA-2284.
 2016-09-06 10:30:28 +02:00
Ghostkeeper
6909f88ce6
Increase default limit on feed rate 
There is no real limit by default now. Only light speed (and the limit on the input element's length). The feed rate limit should be set by a machine definition. If there is no limit set, let there be no limit to what the user can input.

Contributes to issue CURA-2284.
 2016-09-06 10:30:27 +02:00
Jaime van Kessel
6db03538a1 Removed capital letter 
CURA-955
 2016-09-06 09:23:20 +02:00
Jaime van Kessel
d1eb8231a1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 09:09:20 +02:00