jspijker
|
d072942eb8
|
ensure that the latest is removed
(cherry picked from commit 840aada83d46fae87793d8b630a1add79b87fa5a)
|
2023-02-28 13:34:09 +01:00 |
|
jspijker
|
840aada83d
|
ensure that the latest is removed
|
2023-02-28 13:32:29 +01:00 |
|
jspijker
|
3ac3308e20
|
Double backslashes
|
2023-02-28 13:23:10 +01:00 |
|
jspijker
|
f101d0494f
|
Use raw string
|
2023-02-28 13:13:41 +01:00 |
|
jspijker
|
87ce8a8871
|
Use raw string
|
2023-02-28 13:04:50 +01:00 |
|
jspijker
|
c985614896
|
cast pre to str
(cherry picked from commit ed2db086c0557bf3d4c8ef5c7354aa6e3c551b94)
|
2023-02-28 12:51:46 +01:00 |
|
jspijker
|
ed2db086c0
|
cast pre to str
|
2023-02-28 12:51:17 +01:00 |
|
jspijker
|
b521e7795a
|
Only cast pre to str
(cherry picked from commit dd866c4bb8c668b6d8954cb22c6cd2a045171903)
|
2023-02-28 12:48:42 +01:00 |
|
jspijker
|
dd866c4bb8
|
Only cast pre to str
|
2023-02-28 12:48:10 +01:00 |
|
jspijker
|
44667c4b07
|
Sync workflows with main
This should also trigger a new conan package, with the correct latest
|
2023-02-28 12:45:30 +01:00 |
|
jspijker
|
7912a6cc4f
|
Add escape characters
|
2023-02-28 12:41:02 +01:00 |
|
jspijker
|
87ddb134a4
|
Write to GITHUB_STEP_SUMMARY
|
2023-02-28 11:56:26 +01:00 |
|
Jaime van Kessel
|
99bf6883d7
|
Set defaultExtruderIndex to activeExtruderIndex
This doesn't fix the problem in it's entirety, but it does make the behavior
to be the same as it was in the previous releases
CURA-10342
|
2023-02-28 11:50:54 +01:00 |
|
jspijker
|
76a7e667de
|
Use env
|
2023-02-28 11:44:33 +01:00 |
|
Jelle Spijker
|
e9d481e32f
|
Update cura-installer.yml
|
2023-02-28 11:32:35 +01:00 |
|
jspijker
|
f656bbf710
|
Use output of step
|
2023-02-28 11:17:57 +01:00 |
|
jspijker
|
3ab8be94bc
|
Summarize the use dependencies
|
2023-02-28 11:06:51 +01:00 |
|
Jaime van Kessel
|
1ada1b04df
|
Remove unneeded whitespace
Boyscouting CURA-10342
|
2023-02-28 10:35:02 +01:00 |
|
Casper Lamboo
|
6cefb9cb55
|
Merge pull request #14651 from Ultimaker/CURA-10299_data_share_slice_time
[CURA-10299] Put slice-time in slice-data-sharing.
|
2023-02-27 17:06:42 +01:00 |
|
jspijker
|
5f6a3a44ff
|
Revert "Use cura_10317 channel"
This reverts commit 004213723eb8f1f4cafe8de00fdc3d163458741e.
|
2023-02-27 16:33:11 +01:00 |
|
jspijker
|
8d20626fd4
|
Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds
|
2023-02-27 16:32:38 +01:00 |
|
MariMakes
|
b5b8222439
|
Include more Modix Printers
Correctly reflect https://github.com/Ultimaker/Cura/pull/12056 by updating the list of all included printers.
As mentioned here https://github.com/Ultimaker/Cura/discussions/14637#discussioncomment-5102476
|
2023-02-27 16:06:18 +01:00 |
|
jspijker
|
004213723e
|
Use cura_10317 channel
Revert after merge to main
Contribute to CURA-10317
|
2023-02-27 15:21:10 +01:00 |
|
jspijker
|
fdc515b356
|
cast versions to str before casting to int
Contribute to CURA-10317
|
2023-02-27 14:49:16 +01:00 |
|
jspijker
|
cca312712a
|
cast pre to str to check for .
Contribute to CURA-10317
|
2023-02-27 14:46:34 +01:00 |
|
jspijker
|
50c338982e
|
prerelease is deprecated in favor of pre
Contribute to CURA-10317
|
2023-02-27 14:43:31 +01:00 |
|
jspijker
|
7ea0c41c9c
|
Only create tags below 6.0.0
The firmware tags are messing with the versioning system as well
Contribute to CURA-10317
|
2023-02-27 14:21:53 +01:00 |
|
jspijker
|
ac618b7b9e
|
Merge remote-tracking branch 'origin/main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds
|
2023-02-27 11:52:07 +01:00 |
|
jspijker
|
396c7a23cd
|
Fix for conan 2.0
|
2023-02-27 11:50:08 +01:00 |
|
Casper Lamboo
|
4b43677086
|
Reset last slice dat in resetAndReturnLastSliceTimeStats
CURA-10299
|
2023-02-27 11:03:36 +01:00 |
|
Casper Lamboo
|
422e39f9f9
|
Use correct file header
CURA-10299
|
2023-02-27 11:01:44 +01:00 |
|
Hao Xu
|
62ada23836
|
Update snapmaker2_A250_dual.def.json
|
2023-02-24 15:36:30 -08:00 |
|
jspijker
|
93564ac008
|
deploy cura resources
Contributes to CURA-10317 Inconsitent material profiles in internal builds
|
2023-02-24 14:42:00 +01:00 |
|
c.lamboo
|
c60c322b11
|
Add resize handle to recommended window
CURA-10076
|
2023-02-24 14:28:13 +01:00 |
|
jspijker
|
a7a26c5670
|
Clear the info as you would clear a header only lib
Contributes to CURA-10317 Inconsitent material profiles in internal builds
|
2023-02-24 11:38:53 +01:00 |
|
jspijker
|
74e17d3178
|
Merge remote-tracking branch 'origin/5.3' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds
# Conflicts:
# conanfile.py
|
2023-02-24 11:36:47 +01:00 |
|
jspijker
|
a6ede540e8
|
Move staging urls out-of conanfile
Contributes to CURA-10317 Inconsitent material profiles in internal builds
|
2023-02-24 11:35:46 +01:00 |
|
Jelle Spijker
|
b896a7231e
|
Merge branch '5.3'
# Conflicts:
# conanfile.py
|
2023-02-23 17:12:21 +01:00 |
|
Jelle Spijker
|
de51e02fe6
|
Revert "Revert "Use latest stable packages""
This reverts commit 9140553e70249b30dcccf9b31b3d6c17d22d43c2.
|
2023-02-23 17:10:09 +01:00 |
|
Jelle Spijker
|
9140553e70
|
Revert "Use latest stable packages"
This reverts commit 6c7223f92b13bf54e3a5a7f72dae37313503abe8.
|
2023-02-23 16:41:24 +01:00 |
|
Jelle Spijker
|
b0cc2f2822
|
clear the info
|
2023-02-23 16:41:01 +01:00 |
|
Rijk van Manen
|
132e7b7a6e
|
the new setting is not a child setting
CURA-8890
|
2023-02-23 16:29:45 +01:00 |
|
Rijk van Manen
|
26a8d4790e
|
Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter
|
2023-02-23 16:22:03 +01:00 |
|
Remco Burema
|
4efa8e3ab4
|
Put slice-time in slice-data-sharing.
part of CURA-10299
|
2023-02-23 16:03:20 +01:00 |
|
jspijker
|
16a3c3715e
|
Don't build with conan higher then 1.56
|
2023-02-23 15:39:17 +01:00 |
|
jspijker
|
6c7223f92b
|
Use latest stable packages
- uranium
- curaengine
- fdm_materials
|
2023-02-23 15:38:28 +01:00 |
|
jspijker
|
2853d71af8
|
Pin conan version to 1.56.0 or lower
|
2023-02-23 15:31:33 +01:00 |
|
jspijker
|
28ab2a98c6
|
Merge branch '5.3'
|
2023-02-23 15:26:19 +01:00 |
|
Joey de l'Arago
|
6d96d69078
|
Merge pull request #14436 from Ultimaker/CURA_update_translations_with_new_empty_strings
Cura update translations with new empty strings
5.3.0-beta.2
|
2023-02-23 14:23:38 +01:00 |
|
Remco Burema
|
5970524b3a
|
Merge branch '5.3'
|
2023-02-23 13:41:00 +01:00 |
|