Commit graph

9127 commits

Author SHA1 Message Date
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
Ellecross
28310e03f2 Revert "Only show printerTypes for active machine"
This reverts commit 2395567f1e.
2019-09-16 15:05:09 +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
Jaime van Kessel
2395567f1e
Only show printerTypes for active machine 2019-09-13 10:49:35 +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
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
Nino van Hooff
80569c2f51 Update Per Object Settings Overhangs icon 2019-09-10 13:37:05 +02:00
Nino van Hooff
3052438177 Add Per Object Settings icons 2019-09-10 13:37:05 +02:00
Ellecross
8e37255242 Add Z Seam Position in Expert View
As discussed in CCB, we will add the Z Seam Position setting in expert view so that it's shown together with Z Seam X and Z Seam Y settings.
2019-09-10 13:36:10 +02:00
Remco Burema
e5a690e605 Wrap up 'lay flat by face' feature for 4.3-BETA.
Icon thanks to Yi-An Lai.
part of CURA-6754
2019-09-10 12:37:59 +02:00
Ghostkeeper
f561218346
Merge branch '4.3' 2019-09-09 17:37:12 +02:00
Ghostkeeper
8c817e041e
Reduce size of print head without fans for one-at-a-time mode
This allows you to place models more compactly.

According to the discussion at #5590, this was tested to work well.

Fixes #5590.
2019-09-09 17:37:01 +02:00
Ghostkeeper
a43de19113
Reduce size of print head without fans for one-at-a-time mode
This allows you to place models more compactly.

According to the discussion at #5590, this was tested to work well.

Fixes #5590.
2019-09-09 17:36:14 +02:00
Diego Prado Gesto
ddcd8e40cc
Merge pull request #6292 from samirabaza/patch-7
Update printrbot_simple.def.json
2019-09-09 16:26:51 +02:00
Ghostkeeper
354729b621
Only show support flow if support is enabled 2019-09-07 23:19:59 +02:00
Ghostkeeper
5e302c6a67
Fix display of Z Hop After Extruder Switch Height on single extruder
If the setting is enabled on a single extruder printer, it'll show the Z Hop Height setting anyway even though it has no effect.
2019-09-07 23:18:02 +02:00
Ian Paschal
dfc23d994f
Add bom_numbers field to definitions
CS-171
2019-09-06 16:03:26 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Ian Paschal
b7cc48131c Add bom_numbers field to definitions
CS-171
2019-09-06 11:23:02 +02:00
Ghostkeeper
bff9f2fb82
Merge branch 'patch-5' of https://github.com/samirabaza/Cura into samirabaza-patch-5 2019-09-05 14:38:47 +02:00
Mark Burton
dffaf2f6c3 Exclude code that uses gl_PrimitiveID from shader when GLSL version < 150. 2019-09-05 10:53:15 +01:00
Lipu Fei
c7c859f02c Revert "Update S3 definition"
CURA-6742

This reverts commit bb11c695e2.
2019-09-05 09:14:52 +02:00
Lipu Fei
bb11c695e2 Update S3 definition
CURA-6742
2019-09-04 17:40:04 +02:00
Diego Prado Gesto
ebd3b4b9bf Change the URL to check for new firmware
Contributes to CURA-6742.
2019-09-04 10:26:48 +02:00
Ghostkeeper
52cb68fdb3
Commit actual files instead of my symlinks
I've been having this profile added via a symlink so that it would update itself. I didn't know that symlinks were possible in Git.

Contributes to issue CURA-6742.
2019-09-04 09:23:27 +02:00
Ghostkeeper
de7915688a
Move profiles from pr-data to main Cura repository
Don't look too deeply into this, please.

Contributes to issue CURA-6742.
2019-09-04 09:16:22 +02:00
Lipu Fei
d154c98476
Merge pull request #6288 from Ultimaker/feature_bottom_face
Align Face To Build-Plate
2019-09-03 16:14:48 +02:00
Remco Burema
5b48e13337 Remove 'align face to bottom' from context-menu.
part of CURA-6745
2019-09-03 14:25:10 +02:00