3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
31715 commits 305 branches 272 tags 787 MiB
Commit graph

31715 commits

This branch
This branch
All branches
Author SHA1 Message Date
jspijker
7912a6cc4f Add escape characters 2023-02-28 12:41:02 +01:00
jspijker
87ddb134a4 Write to GITHUB_STEP_SUMMARY 2023-02-28 11:56:26 +01:00
jspijker
76a7e667de Use env 2023-02-28 11:44:33 +01:00
Jelle Spijker
e9d481e32f
Update cura-installer.yml 2023-02-28 11:32:35 +01:00
jspijker
f656bbf710 Use output of step 2023-02-28 11:17:57 +01:00
jspijker
3ab8be94bc Summarize the use dependencies 2023-02-28 11:06:51 +01:00
Casper Lamboo
6cefb9cb55
Merge pull request #14651 from Ultimaker/CURA-10299_data_share_slice_time 
[CURA-10299] Put slice-time in slice-data-sharing.
 2023-02-27 17:06:42 +01:00
jspijker
5f6a3a44ff Revert "Use cura_10317 channel" 
This reverts commit 004213723e.
 2023-02-27 16:33:11 +01:00
jspijker
004213723e Use cura_10317 channel 
Revert after merge to main

Contribute to CURA-10317
 2023-02-27 15:21:10 +01:00
jspijker
fdc515b356 cast versions to str before casting to int 
Contribute to CURA-10317
 2023-02-27 14:49:16 +01:00
jspijker
cca312712a cast pre to str to check for . 
Contribute to CURA-10317
 2023-02-27 14:46:34 +01:00
jspijker
50c338982e prerelease is deprecated in favor of pre 
Contribute to CURA-10317
 2023-02-27 14:43:31 +01:00
jspijker
7ea0c41c9c Only create tags below 6.0.0 
The firmware tags are messing with the versioning system as well

Contribute to CURA-10317
 2023-02-27 14:21:53 +01:00
jspijker
396c7a23cd Fix for conan 2.0 2023-02-27 11:50:08 +01:00
Casper Lamboo
4b43677086
Reset last slice dat in resetAndReturnLastSliceTimeStats 
CURA-10299
 2023-02-27 11:03:36 +01:00
Casper Lamboo
422e39f9f9
Use correct file header 
CURA-10299
 2023-02-27 11:01:44 +01:00
Jelle Spijker
b896a7231e Merge branch '5.3' 
# Conflicts:
#	conanfile.py
 2023-02-23 17:12:21 +01:00
Jelle Spijker
de51e02fe6 Revert "Revert "Use latest stable packages"" 
This reverts commit 9140553e70.
 2023-02-23 17:10:09 +01:00
Jelle Spijker
9140553e70 Revert "Use latest stable packages" 
This reverts commit 6c7223f92b.
 2023-02-23 16:41:24 +01:00
Jelle Spijker
b0cc2f2822 clear the info 2023-02-23 16:41:01 +01:00
Remco Burema
4efa8e3ab4 Put slice-time in slice-data-sharing. 
part of CURA-10299
 2023-02-23 16:03:20 +01:00
jspijker
16a3c3715e Don't build with conan higher then 1.56 2023-02-23 15:39:17 +01:00
jspijker
6c7223f92b Use latest stable packages 
- uranium
- curaengine
- fdm_materials
 2023-02-23 15:38:28 +01:00
jspijker
2853d71af8 Pin conan version to 1.56.0 or lower 2023-02-23 15:31:33 +01:00
jspijker
28ab2a98c6 Merge branch '5.3' 2023-02-23 15:26:19 +01:00
Joey de l'Arago
6d96d69078
Merge pull request #14436 from Ultimaker/CURA_update_translations_with_new_empty_strings 
Cura update translations with new empty strings
 2023-02-23 14:23:38 +01:00
Remco Burema
5970524b3a Merge branch '5.3' 2023-02-23 13:41:00 +01:00
Jelle Spijker
466297d06e Bumped up pyinstaller version 2023-02-23 13:24:30 +01:00
Jelle Spijker
096bdc43e5 Fixed typo 2023-02-23 13:24:30 +01:00
Remco Burema
48c2506492 Data stuck in cache causes grub issues. 
grub issues -- hopefully temporary, until github fixed this -- disk (partition)used from last time is cached, but since this runs in the cloud, that's of course no longer valid on the next run
 2023-02-23 13:16:31 +01:00
Remco Burema
310e27dc70 Data stuck in cache causes grub issues. 
grub issues -- hopefully temporary, until github fixed this -- disk (partition)used from last time is cached, but since this runs in the cloud, that's of course no longer valid on the next run
 2023-02-23 12:57:29 +01:00
jspijker
945fbbe474 add efibootmgr 2023-02-23 11:45:43 +01:00
jspijker
04f5aa04b8 Only update po on Windows 2023-02-23 10:57:20 +01:00
Remco Burema
53eda4f1cc
Merge pull request #14636 from Ultimaker/CURA-10183_fix_gcode 
[CURA-10183] Fix G-Code reader crash
 2023-02-23 10:02:11 +01:00
jspijker
422fd1a00b Add po files 2023-02-23 02:07:36 +01:00
jspijker
e3a347f47c build mo to LC_MESSAGES 2023-02-23 01:41:46 +01:00
jspijker
eec81bf027 using package folder during deploy 2023-02-23 00:57:44 +01:00
jspijker
e03888fd47 don't copy the cura_app during deplo 2023-02-23 00:38:42 +01:00
jspijker
b93c2ce56f copy cura_appy.py during generation to Script/bin 2023-02-22 23:56:27 +01:00
jspijker
818a00d4b4 copy cura_appy.py during generation to Script/bin 2023-02-22 23:33:09 +01:00
jspijker
adac0c52a2 copy cura_appy.py during generation to bin 2023-02-22 23:20:49 +01:00
jspijker
f2649bc7ce fix install path 2023-02-22 23:06:47 +01:00
jspijker
5ae711e7c8 change indent 2023-02-22 22:16:05 +01:00
jspijker
4a3c3df892 Fixed mo generating location 2023-02-22 22:14:03 +01:00
jspijker
88da5300ef Fixed paths 2023-02-22 21:52:25 +01:00
jspijker
4675ef8784 No log storing needed 2023-02-22 21:43:40 +01:00
jspijker
065e785e90 Fixing Paths 
To custom for it
 2023-02-22 21:43:28 +01:00
jelle Spijker
132fbe0e17 Fix building translations 2023-02-22 21:05:05 +01:00
jspijker
657e747d86 Revert "create the packages instead of install" 
This reverts commit 47912789fd.
 2023-02-22 20:21:05 +01:00
jelle Spijker
ed49a01fdc Move requirements out of conan_data 
(cherry picked from commit 89ee82fa82)
 2023-02-22 20:20:21 +01:00