3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
6705 commits 306 branches 270 tags 779 MiB
Commit graph

6705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
ccaca9d788 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-19 13:05:12 +01:00
Jaime van Kessel
c25c4c1d77 Moved conflict boxes to be aligned with "headers" 
CURA-1263
 2016-12-19 13:04:55 +01:00
Ghostkeeper
5caa1b9b58 Allow floating point values higher than 9.9999 
It would allow only one digit before the radix.

Contributes to issue CURA-3157.
 2016-12-19 12:25:49 +01:00
Ghostkeeper
45bc603c84
Allow floating point values higher than 9.9999 
It would allow only one digit before the radix.

Contributes to issue CURA-3157.
 2016-12-19 11:55:58 +01:00
Ghostkeeper
8fadc41ac8
Fix prime tower position limits w.r.t. the origin of its placement 
The origin of the prime tower's coordinates are on the front-right side of the prime tower. We should adjust the minimum and maximum values of the position of the prime tower to account for that, rather than having the limits be based on the centre of the prime tower.
 2016-12-19 11:33:57 +01:00
Jaime van Kessel
9fe0ccac23 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-19 10:21:29 +01:00
Jaime van Kessel
ac216494e4 Default of don't show again checkobx is now true 
CURA-1263
 2016-12-19 09:52:51 +01:00
Ghostkeeper
958187eb5d
Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-16 17:17:44 +01:00
Ghostkeeper
76c2e87749
Fix more plural forms 
Forgot these ones.

Contributes to issue CURA-1263.
 2016-12-16 17:17:10 +01:00
Ghostkeeper
5b82098afc
Fix more plural forms 
Forgot these ones.

Contributes to issue CURA-1263.
 2016-12-16 17:15:32 +01:00
Ghostkeeper
33c79245ac
Fix plural form for number of overrides 
Contributes to issue CURA-1263.
 2016-12-16 17:08:57 +01:00
Ghostkeeper
263b084714
Remove commented material names repeater 
Nallath intended to remove this, he says.

Contributes to issue CURA-1263.
 2016-12-16 16:55:03 +01:00
Ghostkeeper
67d2d74f75
Merge branch '2.4' 2016-12-16 16:17:51 +01:00
Ghostkeeper
39c0a367b6
Update documentation of this stack description I found 
Not really related, but doesn't hurt.

So... does not contribute to issue CURA-3157.
 2016-12-16 16:17:14 +01:00
Ghostkeeper
0e31de3ed9
No longer crash when numeric settings are empty strings 
They may temporarily be empty strings while the user is typing, but that currently makes the setting red. However, if we crash during the build plate updating, the front-end gets in some half-updated state in which settings get reset to their previous state every time the user changes anything. So don't crash here.

Contributes to issue CURA-3157.
 2016-12-16 16:17:14 +01:00
Ghostkeeper
0c212d01b9
Tighten regex for floats 
You're no longer allowed to type multiple radices, for instance.

Contributes to issue CURA-3157.
 2016-12-16 16:17:14 +01:00
Jaime van Kessel
c4e061be60 Changed margins on save & load workspace dialog 
CURA-1263
 2016-12-16 14:38:31 +01:00
Jaime van Kessel
f598a49c4b Order of extruders is now sorted by position 
CURA-1263
 2016-12-16 13:29:51 +01:00
Jaime van Kessel
ff18a314ef Added extruder information to workspace summary dialog 
CURA-1263
 2016-12-16 13:16:11 +01:00
Jaime van Kessel
8391a7971b Added machine type to workspace summary dialog 
CURA-1263
 2016-12-16 12:40:59 +01:00
Jaime van Kessel
0e09de195b Added num user settings to save project dialog 2016-12-16 11:50:50 +01:00
Jaime van Kessel
4431241a51 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-16 11:35:51 +01:00
Jaime van Kessel
fa3f473b61 Changed order of buttons 2016-12-16 11:35:08 +01:00
Ghostkeeper
490654c061
Merge branch '2.4' 2016-12-16 11:12:52 +01:00
Ghostkeeper
0ca157518e
Update current item when importing new material 
Since we select the newly imported material, we need to update the current item so that the window on the right also gets updated.

Contributes to issue CURA-3138.
 2016-12-16 11:12:33 +01:00
Ghostkeeper
4fdaf734fc
Make translation hint a bit more clear for translators 
The old message didn't really say anything useful.

Contributes to issue CURA-3138.
 2016-12-16 10:58:13 +01:00
Ghostkeeper
8e9ca45148
Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-16 10:48:19 +01:00
Jaime van Kessel
a7135a0f5f Added machine type to load menu 
CURA-1263
 2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading 
CURA-1263
 2016-12-16 10:26:30 +01:00
Ghostkeeper
77cc088b64
Correct Prime Tower Wall Thickness for if prime_tower_size == 0 
If the prime tower size was too small, it would try to take the root of a negative number. Now we just clamp that computation to 0, which is the correct behaviour for when the minimum volume doesn't fit in the prime tower.

Contributes to issue CURA-3148.
 2016-12-16 10:22:16 +01:00
Jaime van Kessel
e69747577b Added extra timeout when not detecting baudrate through bootloader 2016-12-16 10:14:58 +01:00
Ghostkeeper
e870dec276 Merge branch '2.4' 2016-12-16 09:54:10 +01:00
Jaime van Kessel
8676f3db40 Added workaround for curaproject.3mf extensions not being handled on osx 
CURA-3130
 2016-12-16 09:36:40 +01:00
Jaime van Kessel
6baff7bbb2 Fixed create profile from settings not working 2016-12-15 17:18:08 +01:00
Arjen Hiemstra
2e894477c8 Make Debug mode a build-time option instead of a hardcoded value 2016-12-15 16:46:13 +01:00
Ghostkeeper
c7a8ffb3c0
Set quality to empty if no profiles for current material type 
This then causes the text 'Not supported' to appear to the user, indicating that for his foreign material we have no known quality profiles.

Contributes to issue CURA-3144.
 2016-12-15 16:41:56 +01:00
Arjen Hiemstra
04692d1093 Ignore polygons with length 0 when updating disallowed areas 
Contributes to CURA-3148
 2016-12-15 16:16:50 +01:00
Arjen Hiemstra
f04dc88d2c Do not use resolve for profile display when source is quality changes 
Fixes CURA-3115
 2016-12-15 15:36:38 +01:00
Jack Ha
4bee3b6fdc Changed 'Changes with your printer' to 'Sync with your printer' 2016-12-15 15:30:57 +01:00
Jack Ha
2cf181080a Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-14 16:53:22 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Ghostkeeper
2fe0bab52d
Inherit gradual infill steps for line distances below 1mm too 
A miscalculation on my part: A negative result of the logarithm would result in a more positive final result for the maximum value, not a negative final result.

Contributes to issue CURA-3137.
 2016-12-14 14:21:16 +01:00
Simon Edwards
22012bdb1c Show the Z seam related settings after upgrade. CURA-2953 2016-12-14 13:52:07 +01:00
Ghostkeeper
f4fa3ac53f
Add translation for UM3 and UM3E from XML profiles 
Otherwise it would remove all spaces and put everything lowercase, but that didn't work for UM3E.

Contributes to issue CURA-2575.
 2016-12-14 13:50:16 +01:00
Simon Edwards
a1f5efbc3a Merge pull request #1246 from fieldOfView/fix_version_upgrade 
Fix version upgrade with user variants
 2016-12-14 13:24:56 +01:00
fieldOfView
9250520628 Fix variant before definition_changes 2016-12-14 13:08:18 +01:00
fieldOfView
dcae7575e4 Fix extraneous empty ("") container being added 2016-12-14 13:07:12 +01:00
fieldOfView
2c79efd8bd Fix [containers] items must be strings 2016-12-14 13:01:32 +01:00
Ghostkeeper
eb5d63e548
Guard against infill density being 0 
Otherwise the logarithm is undefined

Contributes to issue CURA-3137.
 2016-12-14 12:37:52 +01:00
fieldOfView
d145eb1f67
Add label to machine name input field 2016-12-14 12:37:52 +01:00