GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 05:48:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,136 Commits 290 Branches 260 Tags
Commit Graph

5136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kuipers
61d9ee9241 JSON: refine skirt/brim settings warning formulas (CURA-905) 2016-09-30 17:56:56 +02:00
Tim Kuipers
2e24cddbc7 JSON: refine support settings warning formulas (CURA-905) 2016-09-30 17:46:09 +02:00
Tim Kuipers
e12e8e3d2e JSON: refine material settings warning formulas (CURA-905) 2016-09-30 17:20:00 +02:00
Tim Kuipers
bab01b9ca2 JSON: refine infill settings warning formulas (CURA-905) 2016-09-30 16:55:28 +02:00
Tim Kuipers
163b8a4256 JSON: refine shell settings warning formulas (CURA-905) 2016-09-30 16:50:39 +02:00
Tim Kuipers
4ad36e94c5 JSON: refine line width warning formulas (CURA-905) 2016-09-30 16:45:40 +02:00
Tim Kuipers
1cef991082 JSON fix: don't perform Outer Wall inset when printing the outer wall firt (CURA-2446) 2016-09-30 16:35:56 +02:00
Ghostkeeper
257aff7c00
Fix license reference 
This file belongs to Cura.

Contributes to issue CURA-2248.
 2016-09-30 11:43:33 +02:00
Ghostkeeper
9c4c4ebce2
Apply support expansion to platform adhesion and shields 
Platform adhesion and shields all go around the support, the expanded support. Support expansion is almost like an expansion of the mesh itself, except that infill wipe distance and such don't apply to it.

Contributes to issue CURA-2407.
 2016-09-30 11:04:22 +02:00
Simon Edwards
8c8cd86a08 Quality changes didn't have the right extruder ID set in some situations. 
CURA-2414 Quality changes profiles are created incorrectly
 2016-09-29 20:54:09 +02:00
Ghostkeeper
cd120c6be5
Make the hurting stop 
Terugduwen is a mistake. Prime is a printing term and should therefore not be translated.

Contributes to issue CURA-570.
 2016-09-29 20:16:45 +02:00
Ghostkeeper
da63ccef9d
Ignore LC_MESSAGES 
Contributes to issue CURA-570.
 2016-09-29 19:13:07 +02:00
Ghostkeeper
a77c2614a3
Add invisible character to satisfy gettext 
This is a zero-width space. It should be invisible in the interface. It is required, however, because gettext breaks when it sees that the original text has \n and the translation doesn't. In this case, the \n is just our text though, and it is allowed to be in a different place in the translation. So I'm silencing gettext by adding a character in front of it.

Contributes to issue CURA-570.
 2016-09-29 19:13:07 +02:00
Simon Edwards
cd45ef496b Handle materials which don't have any quality profiles of their own. Moved the quality_type computation code into the QualityManager. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-29 16:39:30 +02:00
Ghostkeeper
f909ffca2e
Update translations 
These translations have not been checked yet, but we want them in tomorrow's build. I'll compile them now and then check them.

Contributes to issue CURA-570.
 2016-09-29 16:17:15 +02:00
fieldOfView
3982dc2046 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 16:05:32 +02:00
fieldOfView
4fbd82cb6d Create name that conflicts with neither quality or quality changes 
The same method is used when creating/duplicating profiles
CURA-2478
 2016-09-29 16:05:20 +02:00
Jaime van Kessel
cd265c1136 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:45:16 +02:00
Jaime van Kessel
d4bb0d4a0b Only use profile reader if extension matches with filename 
CURA-2462
 2016-09-29 14:44:34 +02:00
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
Jaime van Kessel
3d8336449f Fixed renaming of quality_changes 
CURA-2479
 2016-09-29 14:07:52 +02:00
Jaime van Kessel
6b323dff01 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 13:56:40 +02:00
Jaime van Kessel
02232f7ca6 Added loging if we could not find profile to rename 
CURA-2479
 2016-09-29 13:56:14 +02:00
fieldOfView
39a005d7e5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 13:48:42 +02:00
fieldOfView
040f49e474 Fix cases where there is no "normal" quality 
CURA-2494
 2016-09-29 13:48:23 +02:00
Ghostkeeper
7d57e90260
Remove debug statements 
Oops.

Contributes to issue CURA-844.
 2016-09-29 13:24:15 +02:00
Ghostkeeper
4ab7ea5c0f
Account for support offset in disallowed border 
It is similar to travel avoid distance.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
47b9fbc447
Add helper function for getting setting from support extruder 
This splits up the helper function we already had, to prevent code duplication.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
d8fe9462dd
Remove property-parameter from calls where it is 'value' 
That is the default value for the argument anyway. Makes the code more legible.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
2e3937dd56
Rename _getSettingProperty to _getSettingFromAdhesionExtruder 
This opens up the way for other methods to get settings from different extruders.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Simon Edwards
2742a4ef65 Show the correct list of qualities and quality change profiles. 
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
 2016-09-29 12:34:46 +02:00
Simon Edwards
4a85ee85c1 Update the model when something changes in the global stack. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-29 12:27:04 +02:00
Tim Kuipers
8206ecbfa8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 12:09:39 +02:00
Tim Kuipers
b7ca569b84 JSON fix: prime_tower_wipe_enabled is now true by default (CURA-2420) 2016-09-29 12:09:31 +02:00
fieldOfView
8f09aa8737 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 12:04:17 +02:00
fieldOfView
bee955327b Fix quality profile selection for printers that should use generic quality 
Fixes CURA-2489, contributes to CURA-2477
 2016-09-29 12:04:05 +02:00
Ghostkeeper
d29c817289
Actually apply translated settings 
Don't know when this changed or why it hasn't propped up until then...

Contributes to issue CURA-844.
 2016-09-29 11:56:46 +02:00
Ghostkeeper
f435dcd896
Document parameters of _offsetHull 
Makes it clear that the input is a Polygon instance, not a Numpy array.

Contributes to issue CURA-2407.
 2016-09-29 09:32:43 +02:00
Jaime van Kessel
b0c20eafbd Prime colission now blocks slicing 
CURA-2375
 2016-09-28 16:50:13 +02:00
Jaime van Kessel
78b052f66c Only start change timer if there is a global stack 2016-09-28 16:41:04 +02:00
Jaime van Kessel
dc6e4f172e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 16:03:58 +02:00
Jaime van Kessel
666cba0566 Merge branch 'master-CURA-1445' of https://github.com/thopiekar/Cura 2016-09-28 15:59:49 +02:00
Simon Edwards
062611a92a Handle the startup situation where there is no global stack. Fixed a bug where the wrong stack was used instead of the first extruder. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:56:10 +02:00
Jaime van Kessel
7b7c161d93 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 15:20:59 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:15:18 +02:00
Jaime van Kessel
3de4d4987c Prime positions now also intersect with oneother 
CURA-2375
 2016-09-28 15:14:38 +02:00
fieldOfView
299d05fa71 Prepend extruder id to extruder quality profiles 
extruder quality profiles are not shown to the user, so the prepended extruder id is never visible. This way imported profiles behave the same way as normally created profiles.

CURA-2478
 2016-09-28 14:23:29 +02:00
fieldOfView
54d07ae29b Fix error when no machine is active 2016-09-28 14:20:58 +02:00
Jaime van Kessel
bf1cfe9e7e Importing profile now works again if profile name already existed 
CURA-2478
 2016-09-28 12:02:33 +02:00