Commit graph

34691 commits

Author SHA1 Message Date
Christian Kunis
fe23f07ca7
Merge branch 'Ultimaker:main' into voron-nozzles 2024-06-03 13:34:22 -04:00
Erwan MATHIEU
59771d0ddc Revert "Set dependencies version .."
This reverts commit a4178e8377.
2024-05-30 12:48:03 +02:00
github-actions
a4178e8377 Set dependencies version .. 2024-05-30 10:45:04 +00:00
Erwan MATHIEU
d9adc5dc56
Merge pull request #19154 from Ultimaker/fix-printer-linter-injection
Self-merging to test the script
2024-05-28 09:22:16 +02:00
Erwan MATHIEU
22bcb452eb Merge remote-tracking branch 'origin/main' into fix-printer-linter-injection 2024-05-28 09:19:04 +02:00
Erwan MATHIEU
6b5ae61ae0 Merge remote-tracking branch 'origin/fix-printer-linter-injection' into fix-printer-linter-injection 2024-05-28 09:18:59 +02:00
Erwan MATHIEU
dca3cb2cca Fix wrong variable given to script 2024-05-28 09:18:46 +02:00
Erwan MATHIEU
ef610de6c5
Merge pull request #19153 from Ultimaker/fix-printer-linter-injection
Self-merging in order to test the script
2024-05-28 09:06:08 +02:00
Erwan MATHIEU
cb65d54591
Merge branch 'main' into fix-printer-linter-injection 2024-05-28 09:05:33 +02:00
Erwan MATHIEU
8a170ae5f9 Merge remote-tracking branch 'origin/fix-printer-linter-injection' into fix-printer-linter-injection 2024-05-28 09:04:05 +02:00
Erwan MATHIEU
f4349be84a Fix diagnose script to match post script 2024-05-28 09:03:46 +02:00
Erwan MATHIEU
251c707cb1
Merge pull request #19152 from Ultimaker/fix-printer-linter-injection
Auto-merging to actually test the script
2024-05-28 08:56:57 +02:00
Erwan MATHIEU
f64129ac69
Merge branch 'main' into fix-printer-linter-injection 2024-05-28 08:56:37 +02:00
Erwan MATHIEU
7dd114fbd5 Merge remote-tracking branch 'origin/fix-printer-linter-injection' into fix-printer-linter-injection 2024-05-28 08:53:42 +02:00
Erwan MATHIEU
5681bf6507 Fix wrong file path 2024-05-28 08:53:19 +02:00
Erwan MATHIEU
df1f4e078a
Merge pull request #19151 from Ultimaker/fix-printer-linter-injection
Merging myself, this is the only way to actually test
2024-05-28 08:47:51 +02:00
Erwan MATHIEU
be114fb9df
Merge branch 'main' into fix-printer-linter-injection 2024-05-28 08:47:05 +02:00
Erwan MATHIEU
811c859fc5 Fix indentation 2024-05-28 08:43:48 +02:00
Erwan MATHIEU
6ec5447936
Merge pull request #19141 from Ultimaker/fix-printer-linter-injection
CURA-11929 Update the printer-linter post actions to use the last version of inner sub-script
2024-05-28 08:29:20 +02:00
Erwan MATHIEU
32cac847b4 Update the printer-linter post actions to use the last version of inner action
This is actually required to fix an issue where it was possible to inject malicious code into the environment variables when using a PR that changed the diagnose script. At the same time, it is also good practice to use the last version of the called clang-tidy-pr-comments action.
2024-05-27 09:00:40 +02:00
Jelle Spijker
8390505efd
Merge pull request #19124 from Ultimaker/reduce-printer-linter-access-rights
Reduce permissions on printer-linter GitHub actions
2024-05-23 14:21:59 +02:00
Erwan MATHIEU
170c511568 Reduce permissions on printer-linter GitHub actions
Previously they had no permission set, so by default all write access. We now specify only the required permissions for each of them.
2024-05-23 11:49:35 +02:00
HellAholic
1e69f4740b
Merge pull request #19089 from Ultimaker/CURA-11912
Change `value` to `resolve`
2024-05-23 10:43:54 +02:00
Christian Kunis
b7488be8b7
Merge branch 'main' into voron-nozzles 2024-05-17 11:45:41 -04:00
HellAholic
328af077e5
Merge pull request #19029 from Ultimaker/CURA-11777-yeet-sketch-to-makerbot
Cura 11777 yeet sketch to makerbot
2024-05-17 10:43:55 +02:00
c.lamboo
0d017f725a Change value to resolve
CURA-11912
2024-05-17 09:56:49 +02:00
c.lamboo
21b8694289 Add comment explaining workaround
CURA-11777
2024-05-15 17:49:44 +02:00
Casper Lamboo
f3811854d4
Merge pull request #19043 from Ultimaker/PP-484_Create_Factor4_fast_quality
[PP-484] Create Factor 4 "fast" global quality
2024-05-14 09:58:37 +02:00
Jelle Spijker
5d030578ca
Merge pull request #19072 from Ultimaker/CURA-11897_decoupled_resources
fix wrong channel
2024-05-13 12:04:08 +02:00
Jelle Spijker
52e850b847
fix wrong channel 2024-05-13 11:58:58 +02:00
Jelle Spijker
16a2fc3360
fix wrong channel 2024-05-13 10:09:37 +02:00
Jelle Spijker
5e731b8575
Merge pull request #19039 from Ultimaker/NP-186_seperate_cura_resources
Np 186 seperate cura resources
2024-05-10 13:31:08 +02:00
Jelle Spijker
e1603f3efd
Use testing for cura_resources
Contribute to NP-186
2024-05-10 13:30:49 +02:00
Jelle Spijker
52cf75ae99
Don't use conandata
Contribute to NP-186
2024-05-10 11:39:50 +02:00
Jelle Spijker
3d4dd19c33
Merge branch 'refs/heads/main' into NP-186_seperate_cura_resources 2024-05-10 11:34:21 +02:00
Jelle Spijker
9e1d6b1537
Addressed code-review comments
Contribute to NP-186
2024-05-10 11:33:55 +02:00
Jelle Spijker
3323d85ab0
Add paths to CURA_ENGINE_SEARCH_PATH in conanfile.py
Added new paths to CURA_ENGINE_SEARCH_PATH, specifically under "definitions" and "extruders". This ensures these directories are properly detected and searched in the Cura Engine.

Contribute to NP-186
2024-05-10 10:01:29 +02:00
Frederic Meeuwissen
6215a65af6 Create um_f4_global_Fast_Quality.inst.cfg 2024-05-08 16:26:07 +02:00
Saumya Jain
33d95362c9 Fix name of Sketch to display
CURA-11777
2024-05-08 14:16:58 +02:00
Saumya Jain
2f8fc2cabe Updated bounds and meta values in MakerbotWriter
The MakerbotWriter.py file has been adjusted to handle "application/x-makerbot-sketch" files without providing bounding box values. Instead of using the node name for model_counts, it now uses the count of nodes under the name "instance0".
2024-05-08 11:40:30 +02:00
Saumya Jain
fdfc5dcc67 added machine bounds
CURA-11777
2024-05-07 12:51:03 +02:00
Jelle Spijker
d0da9b72eb
Use correct resource folder
Contribute to NP-186
2024-05-07 11:56:37 +02:00
saumyaj3
d8c852b74a Applied printer-linter format 2024-05-07 08:56:45 +00:00
Saumya Jain
7a52cd3cd5 Update Ultimaker Sketch definitions and refactor PNG formats in MakerbotWriter
CURA-11777
2024-05-07 10:55:23 +02:00
Saumya Jain
e33264625a Removed material temperature related settings
CURA-11777
2024-05-06 16:27:20 +02:00
Saumya Jain
0bbde663e4 Update file format and removed 'Sketch' flavor option
The file format 'application/x-makerbotsketch' has been updated to 'application/x-makerbot-sketch' across all instances in the code base. In addition, the 'Sketch' option for gcode flavor has been removed from all printer selection menus in different sections of the code. This should be added again once the code is implemented in gcode for this flavor.
Also, change flavor in ultimaker_sketch.def.json file

CURA-11777
2024-05-06 16:07:48 +02:00
Saumya Jain
4e36c570ed Added support for Makerbot Sketch file format
This commit introduces the ability to export files in the Makerbot Sketch format.Now the file can be saved as in a gcode format as well.
2024-05-06 15:55:49 +02:00
Jelle Spijker
0ae3574b05
use append
Contribute to NP-186
2024-05-06 15:22:07 +02:00
Jelle Spijker
8be474df39
Set CURA_RESOURCES env
Additional paths for Cura resources are appended in the package information, for use in defining the Cura resource directory. This modification enhances the path setup in conanfile.py, offering greater versatility for referencing Cura resources.

Contribute to NP-186
2024-05-06 14:42:49 +02:00
Saumya Jain
f7f56e8766 Add sketch to cloud
CURA-11777
2024-05-06 13:32:52 +02:00