66 Commits

Author SHA1 Message Date
Remco Burema
667a27e2d2 change setting-version for base definitions as well (5.9 -> 5.10)
part of CURA-12359
2025-02-26 16:49:50 +01:00
Erwan MATHIEU
3b374368c4 Merge remote-tracking branch 'origin/5.9' 2024-10-22 10:43:28 +02:00
Erwan MATHIEU
df4240474c Bump setting_version
It currently doesn't match the version expected in the upgrade script.
2024-10-08 13:43:56 +02:00
Erwan MATHIEU
f0cbd8e802 Restore lost change after an errored merge
This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552.
2024-09-19 11:00:09 +02:00
Erwan MATHIEU
946bf03306 Revert "Merge branch 'main' into 5.8"
This reverts commit fec7637615fd05fb052848bb1cd569840d650ebd, reversing
changes made to 081b9b543b564ac6c2a840916162a06b289c5d94.
2024-08-13 15:56:01 +02:00
TheSin-
d896dd56b5 Applied printer-linter format 2024-08-10 21:24:47 +00:00
Justin F. Hallett
86576c6fbc
Merge branch 'Ultimaker:main' into main 2024-08-10 15:24:02 -06:00
Justin F. Hallett
3bb782fd5f
Add 3 New UI Settings
- Add UI to set `machine_start_gcode_first` so that no gcode is adding infront of the start_gcode.
- Add float input box to set `machine_extruder_change_duration` which added proper extruder change times to the estimated print time.
- Add textbox to set `machine_extruder_prestart_code` to add gcodes that will run pre extruder change, things like heat up so we are at change before with pick up the next extruder.
2024-08-10 12:53:56 -06:00
HellAholic
882c57ec73 Applied printer-linter format 2024-08-05 12:03:32 +00:00
HellAholic
ded8ddde75 Move from fdmprinter to fdmextruder 2024-08-05 13:59:07 +02:00
c.lamboo
8e0127471d Bumb setting version in fdmextruder and fdmprinter
CURA-11526
2024-03-15 14:34:51 +01:00
Casper Lamboo
2c1f0fc58f
Apply suggestions from code review
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
2023-11-14 14:42:44 +01:00
casperlamboo
d56b77db37 Applied printer-linter format 2023-11-13 09:49:14 +00:00
c.lamboo
c4573ba855 Add extruder start/end gcode duration settings
CURA-11099
2023-11-13 10:46:44 +01:00
Jelle Spijker
ee0e55cf97
Bump up fdmprinter and fdmextruder 2023-06-05 11:51:25 +02:00
jspijker
2d18482782 Bump up the settings version to 21
Contributes to CURA-10077
2023-01-30 11:39:13 +01:00
jspijker
53d8e0c730 Applied printer-linter format
To make sure we have uniform diffs with our PR's
2022-12-30 22:05:41 +01:00
Ghostkeeper
d9d90ab4b6
Increment setting_version to 20
We've removed a bunch of settings and transformed others. To allow profiles to be checked for these and edited if necessary, we now need to increment this version number.

Contributes to issue CURA-8466.
2022-03-29 15:03:48 +02:00
Konstantinos Karmas
3e143a012a Change the setting version to 19
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
2021-09-15 16:25:04 +02:00
Ghostkeeper
453b666b1d
Increment setting_version to 18
We now have version 18, where Flsun Super Racer has customised profiles.
Nothing changes in the built-in profiles. It only needs a change in the machine instances.

Contributes to issue CURA-8510.
2021-09-14 16:32:43 +02:00
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 bb20e3307f43edc1ff53cb154d2351ddfe39e158.

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

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

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

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Kostas Karmas
2645dc880e Update setting version to 17 for 4.10
CURA-8212
2021-05-10 17:39:33 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Ghostkeeper
67092e1355
Don't forget to also upgrade fdmextruder
This one doesn't inherit from fdmprinter so it doesn't get the updated version number.

Contributes to issue CURA-7118.
2020-09-02 01:56:12 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15
Once more into the fray.

Contributes to issue CURA-7420.
2020-05-08 09:43:02 +02:00
Kostas Karmas
9bf0255046 Up the setting version to 14 in all the resourses
CURA-7421
2020-05-04 13:13:07 +02:00
Ghostkeeper
565ce0f4b9
Forgot to increment setting version in definitions
Contributes to issue CURA-7282.
2020-04-01 15:51:14 +02:00
Ghostkeeper
8422172000
Increment setting version to 12
This is necessary for the version upgrade to run.

Contributes to issue CURA-7328.
2020-03-30 11:54:18 +02:00
Jaime van Kessel
266f7d1f74
Also bump up the version nr of FDMExtruder & FDMPrinter
CURA-6522
2019-11-20 16:39:38 +01:00
Lipu Fei
bd314a765f Update setting_version
CURA-6799
2019-09-24 11:19:03 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +02:00
Ghostkeeper
a38984dcec
Increment setting_version to 8
This is required for the version upgrade.

Contributes to issue CURA-6311.
2019-06-12 09:09:41 +02:00
Ghostkeeper
f9b91df034
Update setting_version to 7
For these profiles it was somehow outdated.
2019-03-11 11:52:42 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
2019-03-08 13:32:36 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00
Ghostkeeper
f10bd28c4a
Improve grammar and do similar fix for extruder end g-code
Contributes to issue CURA-5906.
2018-11-16 17:25:32 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Mark Burton
b9f1f8c400 Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder. 2018-08-21 19:44:21 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks
CURA-4898
2018-01-31 13:32:45 +01:00
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines
CURA-4812
2018-01-16 15:04:21 +01:00
Lipu Fei
2e4ffc83b5 Add material_diameter to fdmextruder definition
CURA-4708
2018-01-02 10:50:06 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
202f7f87f8
Remove ID from definition files
Sometimes it's out of sync. Sometimes even missing. Let's just not use that any more.

Contributes to issue CURA-4243.
2017-11-02 12:53:06 +01:00
ChrisTerBeke
4701518404 Add default position to fdm extruder definition - CURA-4482 2017-10-31 10:23:30 +01:00
Ghostkeeper
824849a878
Make manufacturer for base fdm- definitions unknown
They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer.

Contributes to issue CURA-4159.
2017-08-11 12:38:34 +02:00
Ghostkeeper
e1266ceb1f Change Ultimaker manufacturer to Ultimaker B.V.
The material profiles are sent to UM3 with a manufacturer that's obtained from the printer definition rather than the material definition. The printer definition was 'Ultimaker' rather than 'Ultimaker B.V.' and the printer checked against this.

Contributes to issue CURA-4159.
2017-08-11 10:24:13 +02:00
Lipu Fei
293c1690c6 Change to use machine_nozzle_id
CURA-3872

We cannot assume that all nozzles will have IDs like "<type> <size>"
such as "AA 0.4", so we should use a complete string as the nozzle IDs.
2017-06-22 14:00:04 +02:00
Lipu Fei
46b6e5b0a1 Add machine_nozzle_type and set them in UM3 and UM3XL variants
CURA-3872

We add a new setting "machine_nozzle_type" to give the engine
information about the nozzle type, such as "AA" and "BB". This is
applicable to UM3 and UM3XL.
2017-06-22 14:00:04 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder
Since it obviously doesn't inherit from fdmprinter.

Contributes to issue CURA-3427.
2017-05-12 14:43:05 +02:00