Commit graph

3518 commits

Author SHA1 Message Date
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0b.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff6093.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a5.
2021-06-28 17:16:56 +02:00
Ghostkeeper
1ccff0e3eb
Merge branch '4.10' 2021-06-25 16:42:11 +02:00
Ghostkeeper
914f4bbebe
Show Minimum Support Area setting also when there are only support meshes
The setting influences support meshes. If support was disabled but there was a support mesh, this setting would influence the slice result even if it was invisible.

Fixes #10002.
2021-06-25 16:41:59 +02:00
Ghostkeeper
4b7646e736
Do away with stylized caps
No preferential treatments.

Contributes to issue CURA-8350.
2021-06-25 16:23:50 +02:00
Ghostkeeper
6275f32840
Merge branch 'jg-voron-v0' of https://github.com/jgehrig/Cura into jgehrig-jg-voron-v0 2021-06-25 16:22:17 +02:00
Konstantinos Karmas
2e694ff834
Merge pull request #9866 from oducceu/master
Fix Power-loss Recovery and update G-codes for Flying Bear Base
2021-06-25 09:47:36 +02:00
ivovk9
16e2ebd489 moved files to folders
moved files to folders
2021-06-25 09:01:06 +02:00
Ghostkeeper
879f44a776
Merge branch 'update-Liquid-printer' of https://github.com/liquid-printer/Cura into liquid-printer-update-Liquid-printer 2021-06-24 17:32:30 +02:00
Ghostkeeper
668d51c16b
Improve description of steps per mm (E) setting
Technically, moving the feeder wheel by 1mm doesn't guarantee that the filament gets extruded by 1mm, since there might be slip.

Reported in issue #9924.
2021-06-24 17:01:35 +02:00
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
Ghostkeeper
ec8d55f6bf
Merge branch 'libArachne_rebased' into CURA-8109_option_centre_walls_last 2021-06-18 11:06:42 +02:00
Ghostkeeper
0b1d963d86
Perform version upgrade on newer profiles
Should've done this in the merge, but I just increased the setting_version for these.
I also removed a deleted setting from the advanced visibility. We don't have tests that ensure that these visibility presets are good. Lucky I found it then, with a Ctrl+Shift+F search.
2021-06-18 11:06:26 +02:00
Ghostkeeper
3300192abc
Change outer_before_inner setting to an enum
We'll offer the option to print from outside to inside, from inside to outside, or from inside to outside except that the very innermost centre wall is printed last.

Contributes to issue CURA-8109.
2021-06-17 17:57:51 +02:00
Ghostkeeper
611208368c
Merge branch 'master' into libArachne_rebased
Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes
2021-06-16 18:04:54 +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
mixware011
47afddea1a
Update mixware_hyper_s.def.json
Delete some "default_value"
2021-06-07 09:11:56 +08: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
mixware011
abd15cd6ad
Update mixware_hyper_s.def.json 2021-05-29 16:30:31 +08:00
mixware011
fe2fe9d6a3
Update mixware_hyper_s.def.json 2021-05-29 16:23:18 +08: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