3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
21370 commits 312 branches 275 tags 718 MiB
Commit graph

9287 commits

Author SHA1 Message Date
Jaime van Kessel
84e5114566
Fix minor review comments 
CURA-6598
 2019-09-18 14:17:26 +02:00
Jaime van Kessel
fade8d3644
No longer make border width hardcoded 
CURA-6598
 2019-09-18 14:10:52 +02:00
Nino van Hooff
9fa2b26897 Styling: do not use thick_lining for selected tool icons. 
Affects Per Object Settings and rotate Lay Flat

CURA-6683
 2019-09-18 11:23:10 +02:00
Jaime van Kessel
75c7a6fa62
Change default font for numericTextfield to default instead of medium 2019-09-18 10:55:18 +02:00
maukcc
b5ba673ffb HMS434 quality updates 2 2019-09-17 16:51:35 +02:00
maukcc
b652035696 HMS434 quality updates 2019-09-17 16:48:34 +02:00
Diego Prado Gesto
4dd6c5b03a Merge branch 'master' into CURA--6683_icons_per_object_settings 2019-09-17 14:16:51 +02:00
Diego Prado Gesto
b9ed619c9a Reuse the Cura ToolTip while showing long object item 
It will only show the tooltip when the text is longer than the elided text.

Contributes to CURA-6666.
 2019-09-17 13:52:37 +02:00
Ghostkeeper
fd452e74b3
Merge branch 'mb-fix-small-feature-blurb-spello' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-small-feature-blurb-spello 2019-09-17 13:15:57 +02:00
Ghostkeeper
d0b7a52ef5
Remove unused definition ID field 2019-09-17 13:10:25 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Ghostkeeper
cd4f6ff3f4
Add tooltip to object list 
Contributes to issue CURA-6666.
 2019-09-17 10:42:36 +02:00
Diego Prado Gesto
f2fa8fd1f5
Merge pull request #6362 from radfahrer/master 
Correction for build volume.
 2019-09-17 10:37:43 +02:00
Diego Prado Gesto
b4d4a0e291 Add the Trimesh Reader to the list of bundled plugins 2019-09-16 16:49:12 +02:00
Diego Prado Gesto
0085660153 Use non-abbreviated names in the configurations list 2019-09-16 15:59:21 +02:00
Diego Prado Gesto
021a04c427 Show the printer types list when we show the label every time or when only show the label for the active printer. 2019-09-16 15:29:34 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +02:00
Ghostkeeper
9b341cf604
Remove UM2 upgrade selection machine action 
Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with.

Contributes to issue CURA-6775.
 2019-09-16 15:19:47 +02:00
Ghostkeeper
bda7a6ce0a
Shorten name of UM2E with Olsson 
This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura.

Contributes to issue CURA-6775.
 2019-09-16 15:15:17 +02:00
Ghostkeeper
3b5716a64a
Add definition for Ultimaker 2 Extended with Olsson Block 
Only the name is now too long by default. I have to shorten it.

Contributes to issue CURA-6775.
 2019-09-16 15:07:04 +02:00
Ellecross
28310e03f2 Revert "Only show printerTypes for active machine" 
This reverts commit 2395567f1e.
 2019-09-16 15:05:09 +02:00
Ghostkeeper
c6a57a0ab7
Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 
This way, the user's profiles should remain intact after the upgrade.

Contributes to issue CURA-6775.
 2019-09-16 15:00:05 +02:00
Ghostkeeper
3c9d191a6e
Add separate definition for Ultimaker 2 with Olsson block 
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.

By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.

Contributes to issue CURA-6775.
 2019-09-16 14:57:45 +02:00
Daniel Green
57a50c9c3d Correction for build volume. 2019-09-15 09:56:21 -07:00
Mark Burton
fb5ec97cb8 Fix spelling. 2019-09-14 20:19:52 +01:00
maukcc
d514b324fb HMS434 update 
HMS434 update on material and quality profiles
 2019-09-13 11:38:42 +02:00
Lipu Fei
5631e94a48 Fix creality variant versions 2019-09-13 10:53:10 +02:00
Jaime van Kessel
2395567f1e
Only show printerTypes for active machine 2019-09-13 10:49:35 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Ghostkeeper
2d0a122c2d
Display list of custom quality profiles 
If you activate any of them from here though, it'll crash.

Contributes to issue CURA-6598.
 2019-09-12 15:13:02 +02:00
Jaime van Kessel
5db122aff6
Merge branch 'master' of github.com:Ultimaker/Cura into CURA--6683_icons_per_object_settings 2019-09-12 15:01:11 +02:00
Jaime van Kessel
a6a106b526
Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura 2019-09-12 14:09:46 +02:00
HUNIBEST
67aa37b13d Add Cubicon plus A15 and A30 
Add Cubicon devices profile
- Style Plus-A15
- Dual Pro-A30

CURA-6771
 2019-09-12 14:05:13 +02:00
Jaime van Kessel
5e4f673ec2
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-11 16:10:12 +02:00
Jaime van Kessel
112c2266f8
Merge branch '4.3' of github.com:Ultimaker/Cura into 4.3 2019-09-11 15:15:48 +02:00
Jaime van Kessel
ab910c2a37
Disable retraction min travel 
It's broken right now, so we should enable it again once it's fixed

CURA-6675
 2019-09-11 15:12:49 +02:00
Ian Paschal
d370a69073 Add some theme values 
CS-158
 2019-09-11 14:49:36 +02:00
Ghostkeeper
61cedb8385
Merge branch '4.3' 2019-09-10 17:33:47 +02:00
Ghostkeeper
8126cdc051
Update translation headers for Cura 4.3 
Contributes to issue CURA-6768.
 2019-09-10 17:33:30 +02:00
Ghostkeeper
6643bf5083
Update translation files per language for Cura 4.3 
The translators can now fill these in with their translations.

Contributes to issue CURA-6768.
 2019-09-10 17:33:29 +02:00
Ghostkeeper
b877717fde
Update translation template files for Cura 4.3 
These are the new strings in Cura 4.3.

Contributes to issue CURA-6768.
 2019-09-10 17:33:29 +02:00
Diego Prado Gesto
c6f5f4fb33
Merge pull request #6308 from smartavionics/mb-fix-legacy-glsl-issue 
Remove gl_PrimitiveID from shader when it's not available.
 2019-09-10 17:33:02 +02:00
Jaime van Kessel
626cd7e85b
Update version numbers of quality files 2019-09-10 15:08:59 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +02:00
Ghostkeeper
47e1dbe38d
Remove usage of Quality Manager 
This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest.

Contributes to issue CURA-6600.
 2019-09-10 14:55:32 +02:00
Ghostkeeper
0d68381e61
Code style: brackets on new line 
Contributes to issue CURA-6600.
 2019-09-10 14:52:51 +02:00
Diego Prado Gesto
190984462b Merge branch '4.3' 2019-09-10 14:17:31 +02:00
Lipu Fei
cfeefe365d
Merge pull request #6328 from Ultimaker/fix_select_face 
CURA-6754 / CURA-6761 Fix Select Face
 2019-09-10 14:05:41 +02:00