2540 Commits

Author SHA1 Message Date
Ghostkeeper
0161a1eca5
Fix dual extrusion for Magna Dual
Contributes to issue CURA-6813.
2019-09-26 11:14:01 +02:00
Ghostkeeper
541bd3811e
Fix whitespace
Contributes to issue CURA-6813.
2019-09-26 10:33:44 +02:00
Ghostkeeper
d670ec7266
Merge branch 'master' of https://github.com/F-Fischer/Cura into F-Fischer-master 2019-09-26 10:30:16 +02:00
F-Fischer
8b321bc398 Pull Request Requested changes 2019-09-25 13:52:42 -03:00
Ghostkeeper
23cc73a78f
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2019-09-25 11:53:44 +02:00
Ghostkeeper
0c873d1757
Fix inheritance of support interface line direction settings
Fixes #6412.
2019-09-25 11:42:34 +02:00
Ghostkeeper
9f1b434a7e
Don't show support brim width if support brim is disabled 2019-09-25 11:15:21 +02:00
maukcc
31a78975ec HMS434 update and material exclusion 2019-09-25 10:23:20 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Lipu Fei
bd314a765f Update setting_version
CURA-6799
2019-09-24 11:19:03 +02:00
Lipu Fei
a6218179a9
Merge pull request #6329 from maukcc/master
HMS434 change
2019-09-24 11:04:50 +02:00
maukcc
184116995c HMS434 outside wall 2019-09-23 16:35:41 +02:00
maukcc
250402142a HMS434 add ironing 2019-09-20 09:33:41 +02:00
maukcc
a1d8fd8743 HMS434 quality deleted
HMS434 quality deleted in favor of .package types
2019-09-19 15:35:58 +02:00
Jaime van Kessel
7016e791c8
Fix containertree for machines without materials but with specific qualities
CURA-6775
2019-09-19 15:33:19 +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
DragonJe
00676e3878
Create key3d_tyro.def.json 2019-09-16 17:53:13 -05:00
SAMSECTOR
e946eb1b5c
Creat Original_Prusa_i3_MK3S_MK3.def.json
This is the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with minor modification to fit in Prusa folder under "add printer"
reference :
https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611
2019-09-16 22:29:58 +03:00
F-Fischer
3606ac8bd6 Hellbot printers definitions added 2019-09-16 16:23:35 -03: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
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
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
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
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
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
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
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
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
Lipu Fei
c7c859f02c Revert "Update S3 definition"
CURA-6742

This reverts commit bb11c695e24b3df92e388ecaf28dba9fb9e90c88.
2019-09-05 09:14:52 +02:00