3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22028 commits 306 branches 270 tags 779 MiB
Commit graph

9560 commits

Author SHA1 Message Date
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
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
maukcc
c5224a5b91 HMS434 update 
getting rid of materials
setting quality as material based
added build volume
changed travel speeds
 2019-09-10 12:43:51 +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
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 
CURA-6599
 2019-09-10 10:57:25 +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
Lipu Fei
3f3aac7ce5
Merge pull request #6289 from Ultimaker/feature_intent_interface 
Feature intent interface
 2019-09-09 16:53:37 +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
13011e375b Fix quality layer label alignment 
CURA-6598
 2019-09-05 09:01:00 +02:00
Lipu Fei
bb11c695e2 Update S3 definition 
CURA-6742
 2019-09-04 17:40:04 +02:00
Jaime van Kessel
423b4ad869
Fix binding loop 
CURA-6598
 2019-09-04 17:16:07 +02:00
Jaime van Kessel
994e0e53cc
Switch the anchors to paddings 
Otherwise the bottomb button would extend from the popup.

CURA-6598
 2019-09-04 16:54:35 +02:00
Jaime van Kessel
7f3b55a286
Remove unknown reference 
CURA-6598
 2019-09-04 16:48:06 +02:00
Jaime van Kessel
53aaaab891
Add a topMargin for the qualities menu 
CURA-6598
 2019-09-04 16:43:59 +02:00
Jaime van Kessel
2dbfbecd12
Ensure that show/hide behavior of the qualities intent menu is correct 
It would previously blink if you pressed the button, as a click outside would hide it
due to close policy, but a mouse release would show it again (as it's hidden and that's what the
on clicked of the button did)

CURA-6598
 2019-09-04 16:37:10 +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