Jelle Spijker
bbda089ae9
Add quotes around ref_name
2022-10-10 15:46:52 +02:00
Jelle Spijker
fce7df29e0
remove debugging statement
2022-10-10 15:44:46 +02:00
Jelle Spijker
2cc923761d
Fix missing quote
2022-10-10 14:58:46 +02:00
Jelle Spijker
48ea4cee9f
Merge branch '5.2'
...
# Conflicts:
# conanfile.py
2022-10-10 10:23:01 +02:00
Casper Lamboo
60e3e50253
Merge pull request #13486 from Ultimaker/CURA-9714_crash_double_loading_file
...
[CURA-9714] Crash double 3mf that contains printer with no extruders
2022-10-07 10:13:58 +02:00
Casper Lamboo
d9ed7c0386
Merge pull request #13489 from Ultimaker/CURA-9696_fix_windows_uninstall
...
[CURA-9696] Fix windows uninstall.
2022-10-07 10:09:56 +02:00
c.lamboo
efe3014d55
Merge branch '5.2' of github.com:Ultimaker/Cura into 5.2
...
# Conflicts:
# plugins/UFPWriter/UFPWriter.py
2022-10-06 16:05:59 +02:00
c.lamboo
598e093b5e
Revert "Flatten equation in UFP settings export"
...
This reverts commit ccf9a47f085ac66bf57ec04e99a04bd984770641.
2022-10-06 16:05:53 +02:00
c.lamboo
ccf9a47f08
Flatten equation in UFP settings export
2022-10-06 15:49:51 +02:00
Remco Burema
e2e626f530
Windows: Registry root should be the local machine one.
...
So that uninstall is properly linked in the 'programs and features' again.
CURA-9696
2022-10-06 12:46:56 +02:00
Joey de l'Arago
8e883cf546
This fixes a crash when loading a 3mf with a printer that has no extruders while the current global stack also has no extruders.
...
This was caused by trying to compare "extruders_enabled_count" which was None with an integer.
CURA-9714
2022-10-06 11:44:30 +02:00
Jaime van Kessel
3bb448c483
Merge pull request #13480 from Ultimaker/PP-260-notify-on-print-profile-change
...
Notify PP&M on Print Profile Change
2022-10-06 10:29:52 +02:00
Joey de l'Arago
1f7679b331
Default to creating the installer
2022-10-06 10:01:06 +02:00
Casper Lamboo
cb6c19c1c6
Merge pull request #13481 from Ultimaker/CURA-9714_crash_loading_abstract_machine_3mf
...
[CURA-9714] Crash loading abstract machine 3mf
2022-10-05 16:37:58 +02:00
Joey de l'Arago
04ff78c704
Merge pull request #13471 from Ultimaker/CURA-9719
...
Add intent and quality fields to slice metadata
2022-10-05 16:11:31 +02:00
Joey de l'Arago
8e56631972
3mf project files saved with an abstract printer would crash on loading when selecting a non abstract printer to load the project with.
...
This was because the metadata "is_abstract_machine" was being loaded into the non abstract machine. This caused a crash in MachineListModel.py by trying to delete this non abstract machine from a list where it didn't exist.
The solution is to ignore the "is_abstract_machine" metadata when loading settings from saved machines in 3mf files.
CURA-9711
2022-10-05 15:27:39 +02:00
Rijk van Manen
d6d7eef054
Notify PP&M on Print Profile Change
...
To avoid print profile changes for ultimaker printers going unnoticed a github action is set up.
PP-260
2022-10-05 14:55:49 +02:00
jelle spijker
6ae88f1181
Also set build tag if not internal
...
Contributes to CURA-9711
2022-10-05 14:43:31 +02:00
jelle spijker
67e99cd4ce
Set version number for CuraVersion.py
...
If you want custom version use the Conan Configuration:
`user.cura:version`
Contributes to CURA-9711
2022-10-05 14:33:05 +02:00
c.lamboo
728daec6af
Wrap material name in Compatible Printer List
...
CURA-9690
2022-10-05 14:19:38 +02:00
jelle spijker
8cf475694f
Filter on specific extensions
...
Contributes to CURA-9711
2022-10-05 13:47:09 +02:00
c.lamboo
2079bd5a6e
Sort "other printers" list
...
CURA-9687
2022-10-05 13:26:12 +02:00
Jelle Spijker
c94ccf24ce
Merge pull request #13472 from Ultimaker/CURA-9711_libspdlog_missing
...
[CURA-9711] fix spdlog binaries missing in linux bulids
2022-10-05 12:38:52 +02:00
jelle Spijker
e2cf889f7f
Don't check for shared
...
Contributes to CURA-9711
2022-10-05 11:08:53 +02:00
jelle Spijker
ad65ffa76c
Fix check if option exist
...
Contributes to CURA-9711
2022-10-05 10:56:53 +02:00
jelle Spijker
ca90ac7787
Fix adding all shared libs managed by Conan to pyinstaller
...
Closes #13422
Contributes to CURA-9711
2022-10-05 10:47:34 +02:00
jspijker
73c8bf5c66
Merge branch '5.2' into CURA-9711_libspdlog_missing
2022-10-05 10:22:37 +02:00
jspijker
9bb1383da2
revert changes to tag script
2022-10-05 09:34:56 +02:00
Casper Lamboo
d9d2488501
Merge pull request #13473 from Piezoid/fix-ufpwriter
...
UFPWriter: fix serialization of SettingFunctions
2022-10-05 08:48:56 +02:00
Jelle Spijker
6a03ae9e9c
Use run-name to show version and actor
...
New functionality which should help clarify which run is which.
https://github.blog/changelog/2022-09-26-github-actions-dynamic-names-for-workflow-runs/
2022-10-05 07:43:25 +02:00
Maël Kerbiriou
058824d2f4
UFPWriter: fix settings serialization
2022-10-04 23:35:15 +02:00
jspijker
4cdf4e607d
update conandata.yml
2022-10-04 16:38:01 +02:00
jspijker
c00135bfac
make sure prerelease tag triggers conan-package
2022-10-04 16:36:13 +02:00
Joey de l'Arago
1287dffe22
Add fmt binaries to list.
...
CURA-9711
2022-10-04 15:45:37 +02:00
Casper Lamboo
bef3eb8703
Update conandata.yml
2022-10-04 15:27:41 +02:00
Casper Lamboo
566cbba111
Update conandata.yml
2022-10-04 15:23:58 +02:00
Joey de l'Arago
ccea542280
Add spdlog to binaries list.
...
Add warning for missing binary
Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before.
CURA-9711
2022-10-04 14:40:13 +02:00
jelle Spijker
9ef927d747
Fix bump up version
2022-10-04 13:38:19 +02:00
jelle Spijker
c98614e2e1
Fix release is pushed to branch and not tagged
2022-10-04 13:11:07 +02:00
jelle Spijker
95faab7eb9
Fix release is pushed to branch and not tagged
2022-10-04 12:58:45 +02:00
jelle Spijker
328cff594a
Also bump up version after beta release
2022-10-04 12:36:10 +02:00
jelle Spijker
01357dd7fe
PR's a tagged with 5.3.0-alpha
2022-10-04 12:01:08 +02:00
jelle Spijker
3dd2d146e7
Make sure a tag is a release version
2022-10-04 12:00:09 +02:00
c.lamboo
a1a2784ef9
Add intent and quality fields to slice metadata
...
CURA-9719
2022-10-04 11:47:53 +02:00
MariskaMaas
d0ddb5fafe
[CURA-9688] Fix View Printers in Digital Factory
...
Send the user to the welcome page instead of the printjobs page to get a more comprehensive overview coming from the monitor page.
2022-10-03 14:37:41 +02:00
Joey de l'Arago
e854ee6a3c
Fix reference to version properties that don't exist.
...
version.prerelease does not exist, swapped this out for version.pre.
There is no "+" inside prerelease (ie "-alpha"), this was probably being confused with the build version ( ie. +testing_120). Both "+" and "-" are removed from these values so I have prepended "_internal" to the build number instead.
2022-10-03 11:35:46 +02:00
c.lamboo
b33cff33f5
Disable "Remove Raft Inside Corners" setting by default
2022-10-03 11:28:22 +02:00
Joey de l'Arago
ed48fd2e82
Update conanfile.py
2022-10-03 10:58:50 +02:00
Joey de l'Arago
6da52b1d59
Update conandata.yml
2022-09-30 15:50:35 +02:00
Joey de l'Arago
d505e6980c
Update conan-recipe-version.yml
2022-09-30 13:49:45 +02:00
