3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 11:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
29118 commits 305 branches 270 tags 779 MiB
Commit graph

29118 commits

This branch
This branch
All branches
Author SHA1 Message Date
j.spijker@ultimaker.com
377fdf27e8 Add a notify reusable workflow 
For now it just contains a slack hook
but in the future, it could contain
other channels.

Contributes to CURA-9365
 2022-06-16 07:04:47 +02:00
j.spijker@ultimaker.com
81b3cc44ce Also build latest on CURA-8160 
Contributes to CURA-9365
 2022-06-16 06:39:03 +02:00
j.spijker@ultimaker.com
215f487978 Workaround for no remote atm 
Our Free tier server has reached it's limit.
This should ensure that we don't use or
ultimaker server. Once the new infrastructure
is in place we should revert this

Contributes to CURA-9365
 2022-06-16 06:36:50 +02:00
Jelle Spijker
09a52d93d6 Revert "Allow for a bool to only build from local cache" 
This reverts commit e1fcca3d9c.
 2022-06-16 06:23:05 +02:00
Jelle Spijker
5b143234b5 Revert "Allow for a bool to only build from local cache" 
This reverts commit ce790c9da9.
 2022-06-16 06:23:05 +02:00
j.spijker@ultimaker.com
ce790c9da9 Allow for a bool to only build from local cache 
This is a workaround to allow further development of this Action
until we have the JFrog server up and running.

Contributes to CURA-9365
 2022-06-16 06:18:47 +02:00
j.spijker@ultimaker.com
e1fcca3d9c Allow for a bool to only build from local cache 
This is a workaround to allow further development of this Action
until we have the JFrog server up and running.

Contributes to CURA-9365
 2022-06-16 06:14:05 +02:00
j.spijker@ultimaker.com
d64e20c71d No need to check hash on build tool 
Contributes to CURA-9365
 2022-06-15 19:58:34 +02:00
j.spijker@ultimaker.com
e717c6572c Fixed wrong word seperator 
Contributes to CURA-9365
 2022-06-15 19:55:55 +02:00
j.spijker@ultimaker.com
ae7df9fbaa Add reusable workflow for conan create 
This workflow should be reused on all our repo's

Contributes to CURA-9365
 2022-06-15 19:23:28 +02:00
j.spijker@ultimaker.com
9a19da97ce Use inputs namespace for input 
Contributes to CURA-9365
 2022-06-15 19:22:13 +02:00
j.spijker@ultimaker.com
22b3290748 recipe-export doesn't have any output 
Contributes to CURA-9365
 2022-06-15 19:18:20 +02:00
j.spijker@ultimaker.com
dcb376fd43 Add a reusable workflow to export the conan recipe 
This workflow will be used by all our repo's

Contributes to CURA-9365
 2022-06-15 18:07:31 +02:00
j.spijker@ultimaker.com
d3c151d415 Add a reusable worrflow to determine the Version and id 
This workflow will be used by all our repo's

Contributes to CURA-9365
 2022-06-15 18:06:49 +02:00
Jelle Spijker
80a2c12bc1 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-15 18:05:34 +02:00
j.delarago
cd34294914 Revert "disable travel_avoid_supports" 
This reverts commit 8f2dff712e.
 2022-06-15 17:19:03 +02:00
Jaime van Kessel
1a0b095f8d
Merge pull request #11721 from Haxk20/patch-1 
voron2_base.def.json: Do not limit travel speeds to 300mm/s
 2022-06-15 16:08:09 +02:00
Remco Burema
188b63703b
Merge pull request #12531 from Ultimaker/CURA-8555_link_ufp_to_3mf_in_digital_library 
Cura 8555 link ufp to 3mf in digital library
 2022-06-15 15:16:11 +02:00
Ghostkeeper
bb058d18cb
Merge branch 'main' of github.com:Ultimaker/Cura 2022-06-15 14:40:42 +02:00
Ghostkeeper
20607b219a
Merge branch 'split-removable-output-write-function' of https://github.com/zxc8027/Cura into zxc8027-split-removable-output-write-function 2022-06-15 14:37:39 +02:00
Remco Burema
a82b90fd96
Merge pull request #12488 from Ultimaker/PP-108_Improved_support_settings 
PP-108 improved support settings
 2022-06-15 14:24:09 +02:00
Jelle Spijker
73b4e47e2b Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-15 14:17:37 +02:00
Ghostkeeper
68fde8d051
Merge branch 'PP-166-DD-core-variant-files' 2022-06-15 14:08:13 +02:00
Ghostkeeper
4b6995bf24
Correct description for Enable Travel Jerk 
Done as a 5 minute fix.
 2022-06-15 14:04:22 +02:00
c.lamboo
854607a725 Provide source_file_id with print file 
Had to implement this a bit differently as stated in the ticket. This field is returned when uploading the project file.

Logic needed a bit of a change as the new behavior dictates a sequence (we can only upload the print file after the project file is uploaded, and we know the correct `file_id`/`source_file_id`) where before these two api calls were done in parallel.

CURA-8555
 2022-06-15 13:36:34 +02:00
c.lamboo
f67d086182 Boyscouting modern python typing 
CURA-8555
 2022-06-15 13:27:47 +02:00
j.delarago
a548e13db3 add bundled paths log 2022-06-15 11:25:47 +02:00
c.lamboo
a7fcc15197 Re-enable regular expression 
CURA-8555
 2022-06-14 16:49:40 +02:00
c.lamboo
0d4c3fa34d Use modern python typing notation 
CURA-8555
 2022-06-14 16:20:38 +02:00
c.lamboo
a315171d7c Replace checkboxes in save project to DL dialog with a combobox 
CURA-8555
 2022-06-14 16:19:56 +02:00
Jelle Spijker
93e58d55fa Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-14 11:44:18 +02:00
j.spijker@ultimaker.com
ffca22971e Use different icon formats depending on OS 
Contributes to CURA-9365
 2022-06-14 11:37:43 +02:00
j.spijker@ultimaker.com
3e67566aad Use relative path for the entrypoint 
Contributes to CURA-9365
 2022-06-14 09:18:08 +02:00
j.spijker@ultimaker.com
ca83874f65 Add sip as dev requirement 
Although net technically needed by Cura, our other Python binding
modules (such as pynest2d, pyArcus, pySavitar) might need it if
the need to be build on the host machine

Contributes to CURA-9365
 2022-06-14 08:42:23 +02:00
j.spijker@ultimaker.com
296dd40da7 Add Shapely and other transitive deps 
Contributes to CURA-9365
 2022-06-14 08:41:01 +02:00
j.spijker@ultimaker.com
4ac4190eae Make VirtualPythonEnv optional 
Contributes to CURA-9365
 2022-06-14 07:41:16 +02:00
j.spijker@ultimaker.com
3ff1dec631 Use dev version as no version is set 
Contributes to CURA-9365
 2022-06-14 07:23:15 +02:00
p.kuiper
808bb9b5fb Merge remote-tracking branch 'origin/PP-108_Improved_support_settings' into PP-108_Improved_support_settings 
# Conflicts:
#	resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
#	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
#	resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
 2022-06-13 21:55:25 +02:00
p.kuiper
bfc25b8350 Processed review comments of Rijk van Manen + cleanup redundant support_z related settings 
Relates to PP-108
 2022-06-13 21:41:46 +02:00
p.kuiper
55f1b9efca Cleanup support_xy_distance_overhang settings in UM2 quality files 
Relates to PP-108
 2022-06-13 21:03:23 +02:00
j.spijker@ultimaker.com
f193a7ce1f Don't use buildmetadata for conandata version 
Contributes to CURA-9365
 2022-06-13 19:15:27 +02:00
j.spijker@ultimaker.com
9ec39a9c7e Moved handling of the sources to the generate function 
When running `conan source .` on ubuntu the `.git` folder
was removed, happens with cona 1.47 ... 1.49
This seems to be a bug in Conan, I will try to reproduce
it and create an issue in their repo.

Contributes to CURA-9365
 2022-06-13 17:03:41 +02:00
j.spijker@ultimaker.com
3a8a04669b Bump-up scipy to version 1.8.1 
We were still using a RC.

Contributes to CURA-9365
 2022-06-13 16:51:03 +02:00
Jaime van Kessel
90bb02acae
Merge pull request #12485 from 4DPrinters/patch-1 
Update PauseAtHeight.py
 2022-06-13 15:50:54 +02:00
j.spijker@ultimaker.com
5190742850 Add relative uranium, libcharon and cura to PYTHONPATH 
Needed because not everything is a conan package yet

Contributes to CURA-9365
 2022-06-13 15:46:10 +02:00
j.spijker@ultimaker.com
22e17dd040 Generate the pyinstaller spec file 
This will be generated if you do a conan install with devtools

It assumes that the projects `cura-binary-data`, `fdm_materials`,
`uranium`, `libcharon` are installed along side the `cura` project.

It will automatically install the fdm_materials when running
conan source.

The pyinstall dist can be created with:

```
# Windows Powershell
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
.\venv\Scripts\Activate.ps1
pyinstaller Ultimaker-Cura.spec
```

```
# bash
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
source venv\bin\activate
pyinstaller Ultimaker-Cura.spec
```

Contributes to CURA-9365
 2022-06-13 15:15:09 +02:00
j.spijker@ultimaker.com
04f16bfcad Use dev as development version 
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`

Contributes to CURA-9365
 2022-06-13 15:08:00 +02:00
Rijk van Manen
82569c14ac these profiles can simply follow the default values 
Looks like these removals have been overlooked. PP-108
 2022-06-13 14:11:28 +02:00
Jaime van Kessel
363d828634 Remove the NoIntentIcon 
CURA-8623
 2022-06-13 13:33:39 +02:00
Jaime van Kessel
525f96db98 Merge branch 'CURA-8610_add_package_metadata' of github.com:Ultimaker/Cura 2022-06-13 13:22:03 +02:00