3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 03:37:48 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
7424 commits 305 branches 270 tags 779 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 0f9b989ae8.
 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
Jaime van Kessel
357f1186da Added logging to start of uploading 
CURA-2295
 2016-09-07 13:05:11 +02:00
Jaime van Kessel
d0823fda11 If a timeout lasted to long without update, we only re-create network interface once 
CURA-2295
 2016-09-07 12:58:48 +02:00
Jaime van Kessel
93cc25b408 Added exception handling for when wrapped reply object is already deleted 
CURA-2295
 2016-09-07 11:56:19 +02:00
Jaime van Kessel
f2e93bfd97 Added time spent in timeout to re-check connection log 
CURA-2295
 2016-09-07 11:46:55 +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
b5d0b32bce Variant is now matched by name instead of ID 
CURA-2285
 2016-09-07 09:48:18 +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
Jaime van Kessel
d76927ef5d Added warning messages for mismatch / not enough material 
CURA-2285
 2016-09-07 09:18:52 +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
Jaime van Kessel
ef667c7ec7 If there is no material or correct cartridges inserted into printer, the job is refused 
CURA-2285
 2016-09-06 14:44:53 +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
Jaime van Kessel
71e6733c8e Firmware update logging now uses correct path 
CURA-955
 2016-09-06 09:08:46 +02:00
fieldOfView
fcf89b79c6 Update wording of error messages 2016-09-06 08:55:32 +02:00
fieldOfView
2380614bd8 Update wording of error messages 
Clearly list problem first, followed by possible resolvement.
 2016-09-06 08:43:00 +02:00
fieldOfView
46acc4d351 Update wording 
CURA-2236
 2016-09-06 08:32:51 +02:00
Thomas Karl Pietrowski
3c5d797179 Merge pull request #923 from thopiekar/master-CURA-1696 
[CURA-1696] Using Uranium's translation tools
 2016-09-05 22:48:54 +02:00
Thomas Karl Pietrowski
aa2ba26a82 Merge remote-tracking branch 'upstream/master' into master-CURA-1696 2016-09-05 22:15:18 +02:00
fieldOfView
b735d46e90 Show sidebar tooltips above messagestack 2016-09-05 20:35:20 +02:00
Thomas Karl Pietrowski
cf55178a11 Removing unused code 
We are collecting here a lot of data, which doesn't get submitted.
 2016-09-05 19:05:26 +02:00
Thomas Karl Pietrowski
dd02243790 SliceInfo: Adding log message and pass exception 
* removes unused "e"
* Using logException correctly

Conflicts:
	plugins/SliceInfoPlugin/SliceInfo.py
 2016-09-05 18:54:52 +02:00