3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-04 04:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
4716 commits 311 branches 275 tags 710 MiB
Commit graph

4716 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
895cf40ab0 Only show dual category if there is more than one extruder 2016-09-07 17:31:45 +02:00
Jaime van Kessel
dfece53f3b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-07 17:25:13 +02:00
Jaime van Kessel
5577ff03f6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-07 17:20:11 +02:00
Jaime van Kessel
30e08da8aa Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 17:19:49 +02:00
Jaime van Kessel
9a84deb14e If buildplate has errors, slicing is not possible 
CURA-2234
 2016-09-07 17:19:20 +02:00
Jaime van Kessel
35168ddd5a Prime tower disallowed area is now drawn seperate from others if it colissions with others 
CURA-2234
 2016-09-07 16:54:52 +02:00
fieldOfView
dc282dc263 Fix Per Model Settings crash when switching to multiextrusion printer 
CURA-2228
 2016-09-07 16:51:03 +02:00
fieldOfView
be0e010fd1 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 16:07:21 +02:00
fieldOfView
cab5f4d823 Fix "Reset all model transformations" for groups 
CURA-2291
 2016-09-07 16:06:42 +02:00
Ghostkeeper
b7c2a77277
Code style: Use double quotes for strings 
Contributes to issue CURA-2252.
 2016-09-07 15:59:14 +02:00
fieldOfView
15101ec53d Fix showing material options for 3rd party printers 
CURA-2287
 2016-09-07 15:52:44 +02:00
fieldOfView
89a83221cc Merge branch '2.3' 2016-09-07 15:51:41 +02:00
fieldOfView
c1f3d1944b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-07 15:51:36 +02:00
fieldOfView
1737d6bb56 Fix showing material options for 3rd party printers 
CURA-2287
 2016-09-07 15:51:08 +02:00
Jaime van Kessel
402f1cb8f9 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 15:46:30 +02:00
Jaime van Kessel
ee55e03911 Added max size to prime tower 
CURA-2234
 2016-09-07 15:46:12 +02:00
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
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