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

32026 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jelle Spijker
f6ca16a053
parse tuple not string 2022-07-01 00:44:21 +02:00
Jelle Spijker
7dc4266b09
single qoutes 2022-07-01 00:29:15 +02:00
Jelle Spijker
36bcb97dbb
place qoutes around path 2022-07-01 00:09:22 +02:00
j.spijker@ultimaker.com
6047c101ed map binaries to root 
Contributes to CURA-9365
 2022-06-30 23:50:10 +02:00
j.spijker@ultimaker.com
d1b3e25440 Fixed path for pyinstaller spec file 
Contributes to CURA-9365
 2022-06-30 23:43:41 +02:00
j.spijker@ultimaker.com
44bda180f3 Fixed path for activation script 
Contributes to CURA-9365
 2022-06-30 23:41:26 +02:00
j.spijker@ultimaker.com
c4aee2a6b6 Fixed Ultimaker-Cura spec 
Contributes to CURA-9365
 2022-06-30 23:26:22 +02:00
j.spijker@ultimaker.com
79508b552e Use correct paths and extension for activation script 
Contributes to CURA-9365
 2022-06-30 23:16:02 +02:00
j.spijker@ultimaker.com
c04511d433 run at 3:25 UTC 
Contributes to CURA-9365
 2022-06-30 23:02:48 +02:00
j.spijker@ultimaker.com
21e69a8c67 Use bindirs instead of paths 
Contributes to CURA-9365
 2022-06-30 22:55:42 +02:00
j.spijker@ultimaker.com
839554ce02 Add runner pip requirements 
Contributes to CURA-9365
 2022-06-30 22:44:46 +02:00
j.spijker@ultimaker.com
df09a6824c default conan config should not be required 
Contributes to CURA-9365
 2022-06-30 22:41:45 +02:00
j.spijker@ultimaker.com
94af0ad906 repurposed old cura-build-env workflow 
Contributes to CURA-9365
 2022-06-30 22:38:23 +02:00
Jelle Spijker
52294dbc38
Create cura-installer.yml 
Manually trigger workflow which will create an installer
 2022-06-30 18:46:06 +02:00
j.spijker@ultimaker.com
cf1e2bd7af Add conan_binaries to pyinstaller 
Contributes to CURA-9365
 2022-06-30 17:57:42 +02:00
Ghostkeeper
83bad98ea3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1 2022-06-30 17:48:38 +02:00
Ghostkeeper
e069946c24
Merge branch 'CURA-9365_fix_building_cura_main' of github.com:Ultimaker/Cura into CURA-9365_fix_building_cura_main 2022-06-30 17:48:19 +02:00
Ghostkeeper
585834970d
Update branches of Conan config files to 5.1 
We'll want to have it test/build those next.

Contributes to issue CURA-9365.
 2022-06-30 17:47:33 +02:00
j.delarago
c08aa5b765 Move icons to icons folder 
Update dmg building script

CURA-9365
 2022-06-30 17:41:38 +02:00
j.spijker@ultimaker.com
77a72fce25 Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:55:56 +02:00
j.spijker@ultimaker.com
b4f3d5cbab Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:40:24 +02:00
Jaime van Kessel
12379b15cd Use correct key for serialized setting to keep 
'recommend cleaning after n prints' instead of 'recommended cleaning after n prints'

CURA-9432
 2022-06-30 16:37:26 +02:00
j.spijker@ultimaker.com
2739057a97 Copy all shared libs 
Contributes to CURA-9365
 2022-06-30 16:36:09 +02:00
Jaime van Kessel
5c0f416536
Merge pull request #12638 from Ultimaker/CURA-9432_add_extra_material_settings 
Add two recently introduced material settings
 2022-06-30 16:31:40 +02:00
j.spijker@ultimaker.com
724f2ab079 Create tcl and tk paths 
Needed by the dist

Contributes to CURA-9365
 2022-06-30 15:37:24 +02:00
j.delarago
afa899cf21 Add dmg building script 😎 
CURA-9365
 2022-06-30 15:08:46 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata 
Contributes to CURA-9365
 2022-06-30 14:49:07 +02:00
Ghostkeeper
72b1097c9a
Add auxiliary files needed for AppImage 
AppRun is the file that gets packaged inside of the AppImage that bootstraps the application.
The AppImage can only have one icon, so we use the largest sample we have available.
The appdata.xml contains some metadata.

Contributes to issue CURA-9409.
 2022-06-30 14:43:52 +02:00
Ghostkeeper
047d7b1b19
Provision desktop file with Jinja to put in version number 
This way the Desktop file for the AppImage knows the version number, and the appimage itself knows it too.

Contributes to issue CURA-9409.
 2022-06-30 14:43:51 +02:00
Ghostkeeper
c2f3161fb6
Allow providing dist_path and version via command line arguments 
Previously you had to call the script from the dist path specifically, using the cwd as a parameter. Now you can provide a different path, allowing you to call this script from any location.
Also the version number used to be hard-coded. Now that can be provided by the caller.

Contributes to issue CURA-9409.
 2022-06-30 14:43:51 +02:00
c.lamboo
394942e2cf Move resources for mac dmg creation 
CURA-9365
 2022-06-30 14:34:22 +02:00
c.lamboo
5c1b665f25 Move resources for mac dmg creation 
CURA-9365
 2022-06-30 14:17:26 +02:00
Remco Burema
fab86be909 Keep settings throughout reserilization process. 
Save some settings Cura doesn't use, but other consumers of the file might in the metadata during deserilization, so they can be properly re-serialized whenever exported.

part of CURA-9432
 2022-06-30 14:14:11 +02:00
c.lamboo
f2717d1906 Add resources for mac dmg creation 
CURA-9365
 2022-06-30 14:08:37 +02:00
Ghostkeeper
f4b3256e3d
Add resolve value for Raft Base Wall Count 
It's also a global setting and there is no particular reason for this to not be settable by a material profile or anything.

Done as a 5 minute fix.
 2022-06-30 13:25:13 +02:00
j.spijker@ultimaker.com
a62e5ec1ad Use package for cura as well 
Still need to fix the mappings and hidden imports

Contributes to CURA-9365
 2022-06-30 12:11:00 +02:00
j.spijker@ultimaker.com
d07c9d64cc Fixed empty source 
Contributes to CURA-9365
 2022-06-30 11:58:57 +02:00
Ghostkeeper
648c1e95db
Add main function to make it easier to call this 
Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
f3fd2d6f80
Fix calling subprocesses 
We shouldn't unpack the list. The first argument is allowed to be a list. If we unpack it, it'll override other arguments to the call function that would be the wrong type then (buffer size).

Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
254edfd3ec
Fix deleting old files if they exist 
Rmdir crashes when it needs to delete just one file, annoyingly.

Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
970e0d8395
Add script to package and sign AppImages 
This has not been tested yet at all.

Contributes to issue CURA-9409.
 2022-06-30 11:48:55 +02:00
j.spijker@ultimaker.com
d20976d459 Moved pyinstaller, cura_version generate function 
This is used both in source, generate and deploy

Contributes to CURA-9365
 2022-06-30 09:49:22 +02:00
Ghostkeeper
795814d50b
Store unmapped settings in a separate set 
We don't want to create actual settings for all of these. Just store them in the profile metadata and restore them.
Serialising and deserialising these is a bit more work than what I could do now in 5 minutes so we'll have to do that a bit later, but at least for now we have the complete list.

Contributes to issue CURA-9432.
 2022-06-30 09:45:45 +02:00
j.spijker@ultimaker.com
6b51753973 Renamed folder structure to venv structure 
Contributes to CURA-9365
 2022-06-30 09:39:21 +02:00
j.spijker@ultimaker.com
d47635c0f9 Removed requirement install from deploy steps. 
I'm gonna repurpose the VirtualPythonEnv for this

Contributes to CURA-9365
 2022-06-30 09:37:17 +02:00
Ghostkeeper
e0c319ed46
Grammar and style 
We use word-capitalisation in these setting labels. And we should put a period after sentences in the description.

Contributes to issue CURA-9432.
 2022-06-30 09:10:24 +02:00
Jaime van Kessel
ddb87656ff Add two recently introduced material settings 
CURA-9432
 2022-06-29 16:24:51 +02:00
j.spijker@ultimaker.com
eae13942f3 Add PyQt6 to hidden imports 
Contributes to CURA-9365
 2022-06-29 16:15:55 +02:00
j.spijker@ultimaker.com
a837827bf3 Added extra Uranium cases 
Contributes to CURA-9365
 2022-06-29 15:56:18 +02:00
j.spijker@ultimaker.com
f745ab7fbc Add PyQt6 sip to hidden_imports 
Contributes to CURA-9365
 2022-06-29 15:52:43 +02:00