Casper Lamboo
b9f09e1122
Merge pull request #14340 from Ultimaker/CURA-9814_automate_extracting_strings
...
[CURA-9814] automate extracting strings
2023-02-01 15:08:15 +01:00
jspijker
1c465614d8
Revert "Use Conandata directly"
...
This reverts commit b8c9fa3f5186bfe564c1ed3b3c09e89218080fe9.
2023-02-01 11:06:35 +01:00
jspijker
6d22950c18
Use the branched of no commits
2023-02-01 10:55:44 +01:00
jspijker
dc66a4d4ff
split on /
2023-02-01 10:51:55 +01:00
jspijker
81845ab58e
fix typo
2023-02-01 10:36:46 +01:00
jspijker
4ef6af26df
reset the count from the branching of commit
2023-02-01 10:35:26 +01:00
jspijker
e7d7a23be8
Use remotes/origin
2023-02-01 10:27:00 +01:00
jspijker
c3a75fd3d3
Dirty fix
2023-02-01 10:24:27 +01:00
jspijker
cc3664fa6a
Check against refs
2023-02-01 10:18:54 +01:00
jspijker
be057d495d
Check against older versions
2023-02-01 10:10:42 +01:00
jspijker
a4a3296dd2
Bump up minor based on latest release branch
2023-02-01 10:03:55 +01:00
Jelle Spijker
eb12a636cc
Add 5.4.0-alpha to conandata main
2023-02-01 07:55:16 +01:00
Joey de l'Arago
fd76fe2926
Use fuzzy matching
...
CURA-10077
2023-01-31 16:48:23 +01:00
Joey de l'Arago
63cffc6a0b
Revert "Update translations files with empty strings"
...
This reverts commit d11ee86b2d83d143f6cab48331b4ac807040717f.
2023-01-31 16:28:46 +01:00
jspijker
883caea814
Revert "Use Conandata directly"
...
This reverts commit b8c9fa3f5186bfe564c1ed3b3c09e89218080fe9.
2023-01-31 15:08:58 +01:00
Rijk van Manen
6d0be01913
allow bridge speeds to be lower then cool_min_speed
...
With PP-71 the cool_min_speed is increased to a high values in case the lift_head is enabled. This causes the bridge_speeds to be lower then the cool_min_speed. Which is no problem, so the limit can be removed.
PP-71 / CURA-10211
2023-01-31 14:18:52 +01:00
Rijk van Manen
0b1b19f0b1
increase cool_min_temperature
...
By default the cool_min_temperature is 15deg below print temperature. However, for PP and TPU this should be 10deg below print temperature. This is already changed for the other ultimaker printers, but I forget the UM3.
PP-71
2023-01-31 13:49:51 +01:00
jspijker
1c8edec81c
Merge branch '5.3'
2023-01-31 13:31:15 +01:00
jspijker
aa2cb76135
take new minor release branches into account
2023-01-31 13:30:31 +01:00
jspijker
b8c9fa3f51
Use Conandata directly
2023-01-31 12:53:19 +01:00
Joey de l'Arago
d11ee86b2d
Update translations files with empty strings
...
CURA-10077
2023-01-31 12:53:06 +01:00
jspijker
a632d154eb
Move beta as first entry
2023-01-31 12:42:37 +01:00
Jelle Spijker
19340cac20
Update requirements-conan-package.txt
2023-01-31 12:36:33 +01:00
Jelle Spijker
0625958ab3
Update requirements-conan-package.txt
2023-01-31 12:23:51 +01:00
Jelle Spijker
22b33af800
Merge pull request #14432 from Ultimaker/CURA_sort_translation_files
...
sort the translations
2023-01-31 12:03:21 +01:00
Jelle Spijker
365042441f
Merge pull request #14431 from Ultimaker/CURA_sort_translation_files
...
Sort the translations
2023-01-31 12:01:58 +01:00
Joey de l'Arago
c82a78894b
sort the translations
...
CURA-10077
2023-01-31 10:22:39 +01:00
jellespijker
e6e8b58c4f
Applied printer-linter format
2023-01-30 18:01:23 +00:00
jspijker
2e58a38a44
Fix jgaurora_a6_0.28_fast profile
2023-01-30 18:59:22 +01:00
Vandresc
55d7818b9a
Merge pull request #14423 from Ultimaker/CURA-10077
...
CURA 10077 Version upgrader
2023-01-30 17:18:07 +01:00
Joey de l'Arago
d25fd7a35e
Remove references to material_flow_dependant_temperature
...
CURA-10077
2023-01-30 13:27:51 +01:00
Casper Lamboo
6bbf38d26f
Merge pull request #14339 from Ultimaker/CURA-10167_Fix_Typo_Japanese_Extensions
...
[CURA-10167] - Fix Typo in Japanese mention of Extensions
2023-01-30 13:06:02 +01:00
jspijker
d878442b00
Update changelog with 5.2.2
...
Contributes to CURA-10209
2023-01-30 12:28:34 +01:00
jspijker
c261253f8a
Add 5.3.0 and 5.3.0-beta to conandata
...
Contributes to CURA-10209
2023-01-30 12:28:10 +01:00
jspijker
a4cf044825
removed filename mapping
...
Contributes to CURA-10077
2023-01-30 11:41:06 +01:00
jspijker
d2f5d059cb
Bump up the settings version to 21 in profiles/definitions
...
Contributes to CURA-10077
2023-01-30 11:40:04 +01:00
jspijker
2d18482782
Bump up the settings version to 21
...
Contributes to CURA-10077
2023-01-30 11:39:13 +01:00
jspijker
40bdea0716
Map updated profiles
...
Contributes to CURA-10077
2023-01-30 11:19:28 +01:00
jspijker
ab82414a3e
update plugin description
...
Contributes to CURA-10077
2023-01-30 11:18:39 +01:00
jspijker
5aa95a362f
Add the changed profile mappings
...
Contributes to CURA-10077
2023-01-30 10:30:49 +01:00
jspijker
a2fb12eb0f
Remove old settings from resource files
...
Contributes to CURA-10077
2023-01-27 17:15:16 +01:00
jspijker
871017da73
Remove old settings from resource files
...
Contributes to CURA-10077
2023-01-27 17:13:06 +01:00
jspijker
f2fd58454a
Add metadata for version upgrader 5.2 -> 5.3
...
Contributes to CURA-10077
2023-01-27 16:03:17 +01:00
jspijker
91067c0a79
Fixes incorrectmissing metadata for upgrade script 413->50
...
Contributes to CURA-10077
2023-01-27 16:01:24 +01:00
Jelle Spijker
5d9c77e05e
Merge pull request #14389 from Ultimaker/PP-312_make-S7-public
...
make S7 public
2023-01-26 20:31:54 +01:00
rijkvanmanen
7e72a4ee7e
Applied printer-linter format
2023-01-26 18:12:32 +00:00
Rijk van Manen
36d5e75ed0
make S7 public
...
PP-312
2023-01-26 19:11:16 +01:00
Jelle Spijker
c6d8baea12
Merge pull request #14373 from Ultimaker/PP-71_improved-minimum-layer-time-behaviour
...
PP-71_improved-minimum-layer-time-behaviour
2023-01-26 18:01:10 +01:00
jspijker
aed56a489a
Merge remote-tracking branch 'origin/main' into PP-71_improved-minimum-layer-time-behaviour
2023-01-26 17:58:22 +01:00
Remco Burema
36bb016a9b
Merge branch 'CURA-9822_pause_at_height_improvements'
2023-01-26 13:17:32 +01:00
