GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,859 Commits 288 Branches 260 Tags
Commit Graph

32859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
d0b91cb297
Update translations 
Contributes to CURA-10953
 2023-09-12 17:12:19 +02:00
Jelle Spijker
1a12e9f553
Update translations 
Contributes to CURA-10953
 2023-09-12 17:10:21 +02:00
Jelle Spijker
66ebdae825
Use the correct plugin name 
Contributes to CURA-10953
 2023-09-12 17:09:16 +02:00
Jelle Spijker
6ecb1c6b79
Applied code-review comments 
Contributes to CURA-10988
 2023-09-12 16:46:54 +02:00
Jelle Spijker
5693577f60
Merge branch 'main' into CURA-10953_introduce_any_color_material 2023-09-12 15:13:31 +02:00
Saumya Jain
a31f5c5246
Merge pull request #15943 from Ultimaker/PP-350_cleanup_print_temperature 
PP-350 cleanup print temperature
 2023-09-12 12:33:19 +02:00
Saumya Jain
0eae40bacd
Update cura.pot 2023-09-12 11:43:23 +02:00
saumya.jain
66318d63dc Merge branch 'main' into PP-350_cleanup_print_temperature 2023-09-12 10:21:21 +02:00
Jelle Spijker
c526ef6fb7
Use lowercase cura_conan_version 
Contributes to CURA-10988
 2023-09-12 08:00:36 +02:00
Jelle Spijker
bbf480d4a3
Disabled MacOS ARM64 
Runner is offline for maintenance.

Contributes to CURA-10988
 2023-09-11 19:31:40 +02:00
Jelle Spijker
570d6ae916
Merge branch 'main' into CURA-10953_introduce_any_color_material 2023-09-11 15:52:13 +02:00
Jelle Spijker
86aaaf4677
Removed time-outs 
They will cancel running jobs not idle waiting

Contributes to CURA-10475 and CURA-10591
 2023-09-11 15:29:55 +02:00
Jelle Spijker
69bdcfa52f
Simplified All Installer workflow 
No need to make exceptions in this workflow for different OSes
it's called the **All** Installer for a reason.

If people need a specific OS installer run the linux, macos or windows installer itself.

Added a time-out to the macos workflow if the self-hosted isn't online.
Moved the ARM64 jobs to the end and added an `always()` condition to the update of the release, such that the
GH hosted runners will at least update.

Add missing download for MacOS X64

Contributes to CURA-10475 and CURA-10591
 2023-09-11 13:29:02 +02:00
Jelle Spijker
8126b9a6f6
Use testing package from Uranium and CuraEngine 
Contributes to CURA-10475 and CURA-10591
 2023-09-11 12:24:37 +02:00
Jelle Spijker
38133980fc
Merge branch 'main' into CURA-10475_engineplugin 
# Conflicts:
#	.github/workflows/installers.yml
 2023-09-11 12:18:12 +02:00
Jelle Spijker
312c2a5bb2
github.event.inputs are strings 
Contributes to CURA-10998
 2023-09-11 10:20:43 +02:00
Jelle Spijker
7a3d852d41
fixed syntax erros 
Contributes to CURA-10998
 2023-09-11 10:18:32 +02:00
Jelle Spijker
d1e4e018b9
fixed missing start of context 
Contributes to CURA-10998
 2023-09-11 10:13:54 +02:00
Jelle Spijker
4c8f8c8a00
fixed missing start of context 
Contributes to CURA-10998
 2023-09-11 10:12:48 +02:00
Jelle Spijker
c9bc1963e4
Use github.event.inputs 
Contributes to CURA-10998
 2023-09-11 10:11:21 +02:00
Jelle Spijker
e586fca22e
Use github.event.inputs 
Contributes to CURA-10998
 2023-09-11 10:08:33 +02:00
Jelle Spijker
965a30775d
Use github.event.inputs 
Contributes to CURA-10998
 2023-09-11 10:07:09 +02:00
Jelle Spijker
553ce41d01
Use default values for nightlies 
Contributes to CURA-10998
 2023-09-11 10:01:11 +02:00
Jelle Spijker
038a8358b1
Pin pyArcus, pySavitar and pynestd2d to released 5.3.0 
Contributes CURA-10951 and CURA-10475
 2023-09-11 08:23:43 +02:00
Remco Burema
9a768acfa4
Merge pull request #16607 from Ultimaker/CURA-10951_gh_build_curapackage 
CURA-10951 build plugin as bundled plugin on the GH runners
 2023-09-08 23:05:33 +02:00
Remco Burema
2de0a9711a Require packages from main branches instead of from CURA-10915. 2023-09-08 22:52:41 +02:00
Remco Burema
fbd5569089 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage 2023-09-08 18:39:27 +02:00
Jaime van Kessel
bcd9f9cbf9
Add all changed materials to version upgrade regex 
CURA-10953
 2023-09-08 13:02:32 +02:00
Jaime van Kessel
0141b750f5
Add version upgrader 
CURA-10953
 2023-09-08 11:04:13 +02:00
Remco Burema
e3f8c8d2ae Put scheduled build back to early morning. 2023-09-08 08:54:33 +02:00
Remco Burema
bb57220756 Fix scheduled build. 
... but skip mac for now. Try out in about 15 minutes, after that I'll put it back to 5 o'clock.

related to CURA-9494
 2023-09-08 08:07:34 +02:00
Remco Burema
4dbae3dea6
Merge pull request #16523 from Ultimaker/CURA-9494_nightly 
CURA 9494 nightly builds
 2023-09-07 22:55:50 +02:00
Remco Burema
13962a563e Make sure there is at least one run-info. 
part of CURA-9494
 2023-09-07 22:38:11 +02:00
Remco Burema
e1f2424f0e Should run nightly part even if some OS is skipped. 
part of CURA-9494
 2023-09-07 22:15:30 +02:00
Remco Burema
e9fe6b9831 Partial revert of unneeded code. 
It doesn't work out this way, and, due to the if-clause further on, it should work even if the 'need's aren't all met.

part of CURA-9494
 2023-09-07 21:10:46 +02:00
Remco Burema
566fdfce1c Whitespace can be important. 
part of CURA-9494
 2023-09-07 20:51:56 +02:00
Remco Burema
a35ce3d652 Use single quotes or 'if' doesn't work. 
part of CURA-9494
 2023-09-07 20:48:33 +02:00
Remco Burema
13af77b4f6 Nightlies workflow: Enable skipping OS's 
part of CURA-9494
 2023-09-07 20:34:54 +02:00
Jaime van Kessel
e899b9987c
Merge branch 'PP-245-high-speed-profiles' of github.com:Ultimaker/Cura into CURA-10953_introduce_any_color_material 2023-09-07 15:03:27 +02:00
Jaime van Kessel
fd887a877a
Don't sync invisible materials 
CURA-10953
 2023-09-07 13:48:36 +02:00
Jaime van Kessel
1a41f2650a
Don't show invisible materials in material selection 
CURA-10953
 2023-09-07 13:24:40 +02:00
Remco Burema
c716ff8dfe Merge branch 'main' into CURA-9494_nightly 2023-09-07 13:09:49 +02:00
Remco Burema
5765f398a3 Add clarifying comments: Why .sh 'on' Windows? 
part of CURA-9494
 2023-09-07 13:03:56 +02:00
Remco Burema
c7356ccb4a Pass 'all' exceptions. 
part of CURA-10942
 2023-09-06 21:17:15 +02:00
Remco Burema
40cc6c7cde
Merge pull request #15954 from GregValiant/LimitXYAccel 
Create LimitXYAccelJerk.py
 2023-09-06 21:06:48 +02:00
c.lamboo
71dc8e22a6
Allow objects to be placed near border 
Issue before was the following: when placing objects within a grid cell there is a margin around the object. This margin comes from both the integer rounding of the cell and the defined min distance between objects. When trying to place object near the buildplate border we marked any cell that is not fully within the buildplate area as an invalid cell to place objects in. This was however too strict; there is the aforementioned margin around the object, and if only this margin would be outside the buildplate it is perfectly fine to place object in that cell.

CURA-7951
 2023-09-06 16:53:02 +02:00
Jaime van Kessel
331ff75315
Insert "generic color same brand" logic for qualities 
So instead of always falling back to generic brand and generic color,
we first try to fall back to generic color with the same brand for qualities

CURA-10953
 2023-09-06 12:55:36 +02:00
Jelle Spijker
2bc3079af5 Only exclude Cura and CuraEngine 
still ship other executables

Contributes to CURA-10951
 2023-09-06 11:38:54 +02:00
Remco Burema
95530b5779
Merge pull request #16637 from Ultimaker/CURA-7951 
Allow objects to be placed near border for grid arrange
 2023-09-05 12:32:00 +02:00
Jelle Spijker
7eedcac62f
Add includes for apt packages 
Based on: https://github.com/AppImageCrafters/appimage-builder/blob/main/recipes/hello-world-qt6/AppImageBuilder.yml

Contributes CURA-10951
 2023-09-05 08:37:24 +02:00