Commit graph

34789 commits

Author SHA1 Message Date
Jelle Spijker
ae2e1ec314 Merge branch 'main' into CURA-10475_engineplugin
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
2023-08-29 17:44:50 +02:00
Erwan MATHIEU
0450a3b09c Fixed possibly wrong error message
CURA-10180
2023-08-29 16:45:13 +02:00
Jelle Spijker
d3809f8bd7 Still a header only
Contributes to CURA-10951
2023-08-29 16:18:47 +02:00
Jelle Spijker
87b6ad63a7 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage
# Conflicts:
#	conanfile.py
2023-08-29 16:13:39 +02:00
saumya.jain
d80e349f0b source_folder as root for materials
conan build fix
2023-08-29 15:27:47 +02:00
Jelle Spijker
2f2b88fd24 Use the source_folder as a rootfor materials
Contributes to CURA-10951
2023-08-29 15:25:32 +02:00
saumya.jain
0397095789 pyarcus pynest2d and pysavitar version changed
conan build fix
2023-08-29 15:18:59 +02:00
c.lamboo
6e045e8b37 Put back getAnyExtruderPositionWithOrDefault api function
CURA-10685
2023-08-29 14:11:36 +02:00
GregValiant
8f0fb5ef12 Update LimitXYAccelJerk.py
Changes made per Rburema requests.
2023-08-29 07:51:58 -04:00
Saumya Jain
81c44d8709
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support 2023-08-29 13:36:05 +02:00
saumyaj3
ef4665a55f Applied printer-linter format 2023-08-29 11:12:17 +00:00
Saumya Jain
577f34782b
Merge pull request #16159 from randyzwitch/main
Definition: Pulse XE E444M
2023-08-29 13:10:58 +02:00
Jelle Spijker
89fe3d2777 Don't use the import method
This will be deprecated, since we are also using self.dependencies we
should do this in the generate.

Contributes to CURA-10951
2023-08-29 13:07:23 +02:00
Casper Lamboo
f3b2a05f49
Merge pull request #16589 from Ultimaker/CURA-10685_improve_ui_performance
CURA-10685_improve_ui_performance
2023-08-29 10:55:41 +02:00
Saumya Jain
70e858ecb6
Merge pull request #16592 from Ultimaker/CURA-10446_modify_gcode_path
Add slot for gcode path modify
2023-08-29 10:30:43 +02:00
Jelle Spijker
df9e4564d2 Merge branch 'CURA-10446_modify_gcode_path' into CURA-10951_gh_build_curapackage
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
2023-08-29 10:17:41 +02:00
Jelle Spijker
8a4dd000f1 Use pysavitar from CURA-10951
Contributes to CURA-10951 and CURA-10446
2023-08-29 09:26:08 +02:00
Jelle Spijker
ea43f61ae4 Use pynest from CURA-10951
Contributes to CURA-10951 and CURA-10446
2023-08-29 09:03:39 +02:00
Jelle Spijker
2f166a545c Use pyarcus from CURA-10951
Contributes to CURA-10951 and CURA-10446
2023-08-29 08:25:35 +02:00
Jelle Spijker
7cb2e96b63 Use pyarcus 10951
Contributes to CURA-10951 and CURA-10446
2023-08-29 08:24:01 +02:00
Jelle Spijker
3d48e51ac2
Update requirements-conan-package.txt 2023-08-29 07:53:35 +02:00
Jelle Spijker
b648eddfd7
Update requirements-conan-package.txt 2023-08-28 17:33:15 +02:00
Jelle Spijker
72db652aec
Update requirements-conan-package.txt 2023-08-28 17:32:45 +02:00
Jelle Spijker
d70b209288
Update requirements-conan-package.txt 2023-08-28 17:32:03 +02:00
Jelle Spijker
c335447292
Update requirements-conan-package.txt 2023-08-28 16:37:09 +02:00
Jelle Spijker
7671705c16
Update requirements-conan-package.txt 2023-08-28 16:35:27 +02:00
fieldOfView
eecdceffdb Fix available height when adding modifier mesh in One at a Time printing
Cura lowers the available build volume height when more than 1 model is loaded. This count should include grouped nodes as one (since they will be slice as one and thus not affect the gantry), and should not include modifier meshes or support meshes (since support-meshes are always printed with the first model anyway).

Fixes https://github.com/Ultimaker/Cura/issues/16566
2023-08-28 15:42:04 +02:00
Jelle Spijker
d7a218b302
Bundle the gradualflow plugin
Contributes CURA-10466
2023-08-28 15:36:46 +02:00
Jelle Spijker
608878d7be
Update macos.yml 2023-08-28 15:21:09 +02:00
Jelle Spijker
2b39c73d56
Update linux.yml 2023-08-28 15:20:17 +02:00
Jelle Spijker
0e67ff38c2
Update windows.yml 2023-08-28 15:19:45 +02:00
c.lamboo
93b10cb770 Revert "Update conan version"
This reverts commit 413aa181ff.
2023-08-28 14:49:51 +02:00
c.lamboo
0362f8abe6 Revert "Update conan version"
This reverts commit 711b440100.
2023-08-28 14:42:04 +02:00
Jelle Spijker
247025ffc4
Use curaengine from cura_10446
Contributes CURA-10466
2023-08-28 13:49:40 +02:00
c.lamboo
711b440100 Update conan version
CURA-10446
2023-08-28 13:00:08 +02:00
c.lamboo
413aa181ff Update conan version
CURA-10446
2023-08-28 12:42:16 +02:00
c.lamboo
ffe6447244 Merge branch 'CURA-10475_engineplugin' into CURA-10446_modify_gcode_path 2023-08-28 10:43:37 +02:00
c.lamboo
2ffcfa37e9 Merge branch 'main' into CURA-10475_engineplugin 2023-08-28 10:42:23 +02:00
Saumya Jain
95aec61de9
Merge pull request #16555 from Ultimaker/CURA-10307_expand-one-at-a-time-shadow
CURA-10307_expand-one-at-a-time-shadow
2023-08-25 17:24:53 +02:00
Casper Lamboo
e3b29b9ad5
Merge pull request #16556 from Ultimaker/CURA-10180-warning_out_of_space
CURA-10180-warning_out_of_space
2023-08-25 17:09:09 +02:00
saumya.jain
ab8b7c3ab5 name changes
CURA-10685
2023-08-25 15:46:30 +02:00
saumya.jain
2c6e3fb813 Merge branch 'CURA-10685_improve_ui_performance' of https://github.com/Ultimaker/Cura into CURA-10685_improve_ui_performance 2023-08-25 11:58:35 +02:00
saumya.jain
9129a526ba improve number of iterations
CURA-10685
2023-08-25 11:58:27 +02:00
Erwan MATHIEU
281e543255 Remove exported file after fail
CURA-10180
2023-08-25 11:27:54 +02:00
saumya.jain
11ea4639c9 Merge branch 'CURA-7951_lock_rotation' of https://github.com/Ultimaker/Cura into CURA-7951_lock_rotation 2023-08-24 16:34:55 +02:00
saumya.jain
e8c06ec783 grid arrange adjusted for disallowed area
CURA-7951
2023-08-24 16:34:34 +02:00
c.lamboo
34aa631531 Re-add arrange to CuraApplication
CURA-7951
2023-08-24 16:13:39 +02:00
Saumya Jain
300f3fa5db
Merge pull request #16547 from Ultimaker/optimal_offset
Find optimal offset for grid arrange
2023-08-24 11:56:31 +02:00
c.lamboo
ac78de1227 Updated comments
CURA-7951
2023-08-24 11:55:25 +02:00
Saumya Jain
1e7c975929
Merge branch 'CURA-7951_lock_rotation' into optimal_offset 2023-08-24 11:54:19 +02:00