Commit graph

34356 commits

Author SHA1 Message Date
Jelle Spijker
38133980fc
Merge branch 'main' into CURA-10475_engineplugin
# Conflicts:
#	.github/workflows/installers.yml
2023-09-11 12:18:12 +02:00
Erwan MATHIEU
03d8c61a98 Merge remote-tracking branch 'origin/main' into CURA-10972_fix_hang_serial 2023-09-11 11:23:24 +02:00
Erwan MATHIEU
8f4dec2c9d Fix possible hang at startup/add printer
Remove the ISP leaving part which is *probably* unnecessary 99.99% of the times but may cause a hang when some USB devices are connected.

CURA-10972
2023-09-11 10:31:04 +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
GregValiant
099cfe8294 Add 'Print Finish Time' estimate as a message
Get the current print time estimate, adjust it by the Fudge Factor, and add it to the current time +10 minutes (to actually start the print.)

Update DisplayInfoOnLCD.py

Change message format for Finish Time Estimate.
2023-09-10 09:20:04 -04: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
saumya.jain
8d90ee88ee name fixed for correct property handling
CURA-10906
2023-09-07 16:27:24 +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
saumya.jain
652e8fbe77 printjob icon
CURA-10997
2023-09-05 16:05:18 +02:00
wawanbreton
1bdd4a67bd Applied printer-linter format 2023-09-05 11:20:34 +00:00
Erwan MATHIEU
f7814874ee Merge remote-tracking branch 'origin-wawanbreton/master' into optimized-prime-tower 2023-09-05 13:19:20 +02:00
Erwan MATHIEU
bac112063c
Merge branch 'Ultimaker:main' into master 2023-09-05 13:15:37 +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
Jelle Spijker
c29fcd7dce
Skip the AppImage test
Contributes CURA-10951
2023-09-05 07:24:14 +02:00
Jelle Spijker
05cf1c9ad6
Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-09-05 07:06:30 +02:00
Jelle Spijker
43322ff249
Merge branch 'main' into CURA-10475_engineplugin 2023-09-05 07:05:57 +02:00
Jelle Spijker
e558b11ebd
Minor fixes
Contributes CURA-10951
2023-09-05 06:32:06 +02:00
Jelle Spijker
c5e3821116
Fix the AppImage-builder scripts
Contributes CURA-10951
2023-09-05 06:12:47 +02:00
Jelle Spijker
f1df7f67d5
deploy packaging scripts
Contributes CURA-10951
2023-09-05 05:20:34 +02:00