29784 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
a88e31eddd Add the slice_uuid to the slice info data
Contributes to CURA-9031
2022-07-27 18:13:09 +02:00
j.spijker@ultimaker.com
a712e7517a Add the received slice_uuid to the print information
Contributes to CURA-9031
2022-07-27 18:12:25 +02:00
j.spijker@ultimaker.com
2e23fe84ff Add missing Python requirements.txt
Somehow these were left out during the merge from the 5.1 to main branch
2022-07-27 14:28:14 +02:00
j.spijker@ultimaker.com
89042f9dd4 Fix failing trimesh 2022-07-27 12:50:30 +02:00
j.spijker@ultimaker.com
89de2b1fae Set the Cura Version also when running from source 2022-07-27 12:03:51 +02:00
Jelle Spijker
9488092e5e
Merge pull request #12709 from Ultimaker/GH-12582_fix_uninstall_by_other
Make it possible for another user to uninstall.
2022-07-21 17:39:44 +02:00
Jelle Spijker
cee219f65b Merge branch 'main' into GH-12582_fix_uninstall_by_other
# Conflicts:
#	packaging/NSIS/Ultimaker-Cura.nsi.jinja
2022-07-21 15:24:57 +02:00
j.spijker@ultimaker.com
dc00625188 Remove pr_version
Contributes to CURA-9430
2022-07-20 17:05:56 +02:00
j.spijker@ultimaker.com
6e7ac62808 actually create the package
Contributes to CURA-9430
2022-07-20 16:54:24 +02:00
j.spijker@ultimaker.com
0676dea789 allow creation from source
Contributes to CURA-9430
2022-07-20 16:24:13 +02:00
j.spijker@ultimaker.com
10b7b7f2c4 Allow package creation from the source folder
normally you won't need this because it is first exported

Contributes to CURA-9430
2022-07-20 16:17:27 +02:00
j.spijker@ultimaker.com
763768e26d Split uploading Artifactory cura and cura-ce
Contributes to CURA-9365
2022-07-20 13:08:23 +02:00
j.spijker@ultimaker.com
61996e5af6 bump up minor instead of patch
Contributes to CURA-9365
2022-07-19 16:55:16 +02:00
jspijker
a4461a618f Merge branch '5.1'
# Conflicts:
#	conandata.yml
2022-07-19 16:52:20 +02:00
j.spijker@ultimaker.com
118dab7cf0 Clean-up 5.1.0-beta from conandata
Contributes to CURA-9365
2022-07-19 16:50:50 +02:00
j.spijker@ultimaker.com
559813c7c6 Bump up minor after release
Contributes to CURA-9365
2022-07-19 16:45:49 +02:00
Ghostkeeper
de39918661
Add contributors to change log 2022-07-19 15:37:09 +02:00
Jaime van Kessel
69d3b4d85a
Merge branch 'master' of github.com:RVillani/Cura 2022-07-19 15:32:57 +02:00
Jaime van Kessel
9bc00b4a53
Merge pull request #12442 from amweiss/patch-1
Rename Ender-3 profile to include v2
2022-07-19 15:02:42 +02:00
Jaime van Kessel
87c6c3649f
Bump version numbers
CURA-9503
2022-07-19 14:59:14 +02:00
Jaime van Kessel
9ee948ded4
Merge branch 'master' of github.com:heed818/Cura 2022-07-19 14:55:06 +02:00
NilsRo
11800f1c49
Update anycubic_i3_mega_s.def.json (#11715)
Added nozzle size
Dynamic wall thickness by nozzle diameter
Added filament costs to standard
First layer speed inheritance
Added maximum temp warnings
Updated FAN
Optimized initial purge of filament
2022-07-19 14:54:23 +02:00
Jaime van Kessel
e6c23c5827
Merge branch 'main' of github.com:Ultimaker/Cura 2022-07-19 14:51:44 +02:00
Jaime van Kessel
aa607ab555
Merge pull request #11637 from 3d-hctech/master
Add profiles and platforms for 3 new printer from HCTECH
2022-07-19 14:49:24 +02:00
Jaime van Kessel
d7f5eeb829
Merge branch 'master' of github.com:3d-hctech/Cura 2022-07-19 14:46:10 +02:00
Jaime van Kessel
6d6058f4f1
BUmp version number for anycubic printers
CURA-9501
2022-07-19 14:44:25 +02:00
Jaime van Kessel
fb9b71a901
Merge branch 'master' of github.com:ANYCUBIC-3D/Cura 2022-07-19 14:41:05 +02:00
Jaime van Kessel
68aec6f064
Bump version number
CURA-9500
2022-07-19 14:37:27 +02:00
Jaime van Kessel
7e811025fb
Merge branch 'feat/ender3s1-profile' of github.com:Sebazzz/Cura 2022-07-19 14:34:42 +02:00
c.lamboo
3dad5d564d Only unquote once in getMaterialFilePackageId 5.1.0 2022-07-19 14:12:35 +02:00
c.lamboo
a6b15d27b7 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-19 13:54:42 +02:00
c.lamboo
1e9e3a8cfb Fix saving materials with spaces 2022-07-19 13:54:32 +02:00
Casper Lamboo
9b5cf07269
Merge pull request #12795 from Ultimaker/CURA-9342_add_missing_openssl_1_1_1l_shared_library
Cura 9342 add missing openssl 1 1 1l shared library
2022-07-19 13:03:29 +02:00
Jelle Spijker
ce8eb1056c
Add Path to the imports 2022-07-19 11:16:34 +02:00
jspijker
ebf7fb000b Merge branch '5.1' 2022-07-19 10:48:03 +02:00
jspijker
ee10141691 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library
# Conflicts:
#	conandata.yml
2022-07-19 10:47:26 +02:00
j.spijker@ultimaker.com
c8ce7bcb9d Use latest for stable channel
Contributes to CURA-9365
2022-07-19 10:44:56 +02:00
jspijker
79fe069d20 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 10:34:45 +02:00
jspijker
1b427ac2a4 Merge branch '5.1' 2022-07-19 10:33:42 +02:00
j.spijker@ultimaker.com
3609871ba6 Use umbase 0.1.5
Contributes to CURA-9365
2022-07-19 10:33:04 +02:00
Ghostkeeper
e92e815226
Add video link for 5.1 2022-07-19 10:09:09 +02:00
jspijker
2b4b110b38 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:54:18 +02:00
jspijker
a8c2a24f14 Merge branch '5.1' 2022-07-19 09:53:45 +02:00
j.spijker@ultimaker.com
1c3a46c9e2 Use empty string for channel if channel is undefined
Contributes to CURA-9365
2022-07-19 09:52:54 +02:00
jspijker
470e56ddaf Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:05:49 +02:00
jspijker
a4065f29d5 Merge branch '5.1' 2022-07-19 09:05:13 +02:00
j.spijker@ultimaker.com
8f87744cd5 Pinned arcus, savitar and pynest2d to release
Contributes to CURA-9365
2022-07-19 09:04:06 +02:00
j.spijker@ultimaker.com
c463f2e9d6 use beta instead of alpha
Contributes to CURA-9365
2022-07-19 08:48:25 +02:00
j.spijker@ultimaker.com
d9cc8ca19b Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:36:17 +02:00
j.spijker@ultimaker.com
0397a95381 Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:36:03 +02:00