Commit graph

3136 commits

Author SHA1 Message Date
Ghostkeeper
f82384d93c
Revert "Revert CURA-8055 in the 4.10 branch. This should not have been merged in there."
This reverts commit 4d29de4579.
Effectively this re-applies the changes for CURA-8055 / #9957.
2021-06-24 14:20:38 +02:00
Ghostkeeper
84b5b19584
Merge branch '4.10' 2021-06-24 14:19:40 +02:00
Ghostkeeper
4d29de4579
Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.
Revert "Change file extension to .umm"

This reverts commit 56db7f7144.

Revert "Re-enable compression"

This reverts commit 62bc9be22b.

Revert "Add documentation"

This reverts commit e9031f1aff.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a66.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664b.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b.
2021-06-24 14:15:54 +02:00
saliery999
0a40ceb72f
add Farm 2 and Farm 2CE printer, extruder profiles, variants, quality, meshes and images. (#9574)
* Add files via upload

* Add files via upload

* Add files via upload (#1)

* Delete farm2_ce_normal.inst.cfg

* Delete farm2_normal.inst.cfg

* Update farm2.def.json

* Update farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Rename farm2.def.json to resources/definitions/farm2.def.json

* Delete farm2_platform.stl

* Add files via upload

* Rename farm2_CE.def.json to resources/definitions/farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Add files via upload

* Delete farm2CEplate.png.png

* Delete farm2_platform.3mf

* Delete farm2plate.png

* Add files via upload

* Add files via upload

* Delete farm2_ce_extruder_1.def.json

* Delete farm2_extruder_1.def.json

* Delete farm2_ce_printhead_0.2.inst.cfg

* Delete farm2_ce_printhead_0.3.inst.cfg

* Delete farm2_ce_printhead_0.4.inst.cfg

* Delete farm2_ce_printhead_0.5.inst.cfg

* Delete farm2_printhead_0.2.inst.cfg

* Delete farm2_printhead_0.3.inst.cfg

* Delete farm2_printhead_0.4.inst.cfg

* Delete farm2_printhead_0.5.inst.cfg

* Add files via upload

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Rename farm2_CE.def.json to farm2_ce.def.json

* Delete farm2CEplate.png

* Add files via upload

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Delete farm2plate.png

* Delete farm2ceplate.png

* Add files via upload

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2.def.json

* Update farm2_ce.def.json
2021-06-22 16:54:21 +02:00
freejoe
5a5e913f57 Change adhesion_type to 'raft';
Change travel_speed to 65mm/s for LKx printers;
2021-06-21 13:45:28 +02:00
Konstantinos Karmas
61b4dd3efc
Merge pull request #9987 from lowkeyjoe/master
Update LONGER printer profiles
2021-06-21 13:43:38 +02:00
freejoe
f7ece0e580 Change adhesion_type to 'raft';
Change travel_speed to 65mm/s for LKx printers;
2021-06-15 16:44:38 +08:00
Ghostkeeper
1d23f47ed6
Merge branch '4.10' 2021-06-14 15:27:13 +02:00
Ghostkeeper
dc09465afe
Standardise capitalisation of printer names
Some contributors seem to have a shift key stuck here or there. Many 'stylised' capitalisations weren't reflected even on the manufacturer's websites, or were also stylising words like 'pro' and 'dual' or even actual chemical names like 'nylon'. Normalising the caps makes it more fair for everyone, since all of these are written in the same font.

As discussed with the Cura team.
2021-06-11 13:49:35 +02:00
Ghostkeeper
f815d15b10
Merge branch '4.10' 2021-06-10 17:37:35 +02:00
ChronosTech
f8725d13cf remove material_print_temperature_maximum_value 2021-06-09 17:24:53 +02:00
Remco Burema
54478758df
Merge pull request #9775 from SynDaverCO/SynDaverStartGcodeCorrection
edit start gcode
2021-06-08 16:52:46 +02:00
Ghostkeeper
f436cb8e7b
Add notion of whether printers support the material export archive
Contributes to issue CURA-8055.
2021-06-08 16:50:03 +02:00
Ghostkeeper
0ae1e958f9
Merge branch 'master' of https://github.com/VOLUMIC/Cura into VOLUMIC-master 2021-06-08 16:00:46 +02:00
Jaime van Kessel
66f57d4d58
Merge branch 'master' of github.com:Ultimaker/Cura 2021-06-07 14:17:27 +02:00
Jaime van Kessel
89c2c94cc5
Merge branch 'PETG-for-UM3' of github.com:Ultimaker/Cura 2021-06-07 14:04:19 +02:00
VOLUMIC
ddd2e844cb
fix machine width (265) 2021-06-07 13:36:11 +02:00
VOLUMIC
230a0cd607
machine height correction to 310mm 2021-06-07 12:33:02 +02:00
Ghostkeeper
cc6191a141
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2021-06-02 15:24:23 +02:00
Ghostkeeper
867b3ba31e
Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master 2021-06-01 15:58:09 +02:00
StijnArntz
605e1d1b2f PETG for UM3
Removed Generic and UM PETG from exclude material list.
Add quality files for PETG on UM3.
2021-05-31 09:20:00 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054, reversing
changes made to 95652556fe.
2021-05-27 16:06:20 +02:00
ChronosTech
535026d0d3 edit start gcode 2021-05-25 10:40:56 +02:00
Gabriele Rossetti
ec7b3ea8f9 Most recent updates
- Travel avoid supports
- Dual Extrusion : switch_extruder_retraction_amount = 10
- PETg updates
- Reduced infill jerk in "quick" intent and removed useless first layer jerk
- Removed no more used 1.2x material_flow_layer_0 in order to compensate a bad bed leveling
- Rewiewed forced PLA and PETg temperatures
2021-05-20 22:20:46 +02:00
Gabriele Rossetti
69beba448c
Merge pull request #5 from Ultimaker/master
Update from master CURA Repo
2021-05-20 17:00:57 +02:00
grigorasalex
3f7cbdb54b Support usb connection and modified cooling fan and retraction settings 2021-05-20 15:00:31 +03:00
Jaime van Kessel
87fe4555ce
Merge branch 'inat_defs_fixes' of https://github.com/MarkINAT/Cura 2021-05-19 15:32:40 +02:00
oducceu
db7ea4149e Fix Power-loss Recovery and update G-codes for Flying Bear Base
Remove start G-code from Flying Bear Ghost 5 because it was causing positioning problems during Power-loss Recovery

Update machine_start_gcode and machine_end_gcode for Flying Bear Base

Update machine_height for Flying Bear Ghost 4S / 5 to a safe value
2021-05-18 16:57:34 +03:00
NilsRo
c89e186671 Mega X: Fixed Layer Mesh, Optimized qualities 2021-05-17 20:23:51 +02:00
Ghostkeeper
28a7facd1b
Merge branch 'CURA-8212_Add_version_upgrader_for_two_trees_definitions' 2021-05-17 09:55:56 +02:00
Ghostkeeper
1cab9cb567
Clarify description of Max Comb Distance With No Retract
It wasn't really clear that a value of 0 essentially equates to not having any maximum (like setting it to infinity).
2021-05-11 15:35:14 +02:00
Kostas Karmas
3741fd59fe Delete the old twotrees_bluer definition
Since it is being replaced by the new two_trees_bluer

CURA-8212
2021-05-10 17:41:15 +02:00
Kostas Karmas
2645dc880e Update setting version to 17 for 4.10
CURA-8212
2021-05-10 17:39:33 +02:00
Konstantinos Karmas
86d84d14e1
Merge pull request #9114 from Lester3DGadgets/master
Adding Twotrees Full range printer profiles
2021-05-10 17:23:10 +02:00
Ghostkeeper
e86ae7c7c1
Keep Z Hop Speed visible
It's also used as the speed at which layer changes are made, so technically it should be kept visible since the setting does indeed affect the g-code.
In practice, it won't affect the print though. Using a reasonable Z hop speed of 10mm/s and the default acceleration of 100mm/s/s, it would take 0.1s to reach the Z hop speed. With the formula for acceleration, 1/2att+vt+c, you can see that it needs 0.5mm to get up to speed, and another 0.5mm to get back to 0. So this speed is only attained with layer heights of more than 1mm which is very unrealistic. For this reason we won't document this in the setting description or its name. The Z hop speed is only used for layer changes because it needs a sensible default for extreme cases, not because it needs to be configurable as such.

But we'll keep it visible to give a less-than-expert user a feeling of control, a placebo effect that they are actually making print quality improvements even if their firmware forbids it from making an actual difference.

Fixes Ultimaker/CuraEngine#1446.
2021-05-10 13:38:38 +02:00
ChronosTech
8b52836c64 Update temperatures and remove duplicate temperature declarations 2021-05-10 12:33:29 +02:00
ChronosTech
e9e5327bc5 Create definitons and HT0.4 quality for strateo3d. 2021-05-10 11:07:32 +02:00
Ghostkeeper
34ba341115
Merge branch '4.9' 2021-05-06 16:48:20 +02:00
NilsRo
d1fd07007b Added Mega X 2021-05-06 16:45:43 +02:00
Jaime van Kessel
88660699eb
Fix stupid copypaste error 2021-05-06 16:33:28 +02:00
Jaime van Kessel
cab92952d3
Also add PETG to excluded materials of Dual UMO
CURA-8220
2021-05-06 16:22:54 +02:00
Jaime van Kessel
948977f28f
Merge branch 'master' of https://github.com/balacij/Cura 2021-05-06 13:21:05 +02:00
Jaime van Kessel
4cba960783
Fix incorrect value for anycubic profile
This was done as part of merging the printer. Since the issue is so small
I decided to fix it right away instead of bouncing it back & forth with the
original author

CURA-8221
2021-05-06 12:49:54 +02:00
Jaime van Kessel
f07e2bf799
Merge branch 'master' of https://github.com/NilsRo/Cura 2021-05-06 12:42:38 +02:00
Jaime van Kessel
59ed8e129d
Merge branch '4.9' of github.com:Ultimaker/Cura 2021-05-06 11:54:26 +02:00
Jaime van Kessel
974d04a423
Also add red petg to exclude list for UM3 & UMO
Forgot to add them last time. Whoops.

CURA-8220
2021-05-06 11:52:03 +02:00
synsuiter
84d04a4d6d edit start gcode
syndaver axi start gcode edit
2021-05-05 11:03:06 -06:00
VOLUMIC
b662237a63
fix parameters 2021-05-05 15:22:55 +02:00
VOLUMIC
ac7a733179
Add files via upload 2021-05-05 14:17:37 +02:00
VOLUMIC
5e8348e90f
Add files via upload 2021-05-05 13:55:12 +02:00