GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 00:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,408 Commits 291 Branches 260 Tags
Commit Graph

30408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remco Burema
ce6f7c20ca Abstract printer types: Sort newer ones on top. 
Partial (manual) revert of initial implementatio of CURA-9748 -- that first commit deleted the 'reverse = True' needed to make sure (read hack) the most recent abstract printer types on top, instead of the other way around.
 2022-10-12 16:14:32 +02:00
Casper Lamboo
c625d35f33
Merge pull request #13546 from Ultimaker/CURA-9746_recommened_intent_tooltips 
[CURA-9746] Re-add tooltips for intent profile selection in recommended.
 2022-10-12 15:31:36 +02:00
c.lamboo
e25048d88a Add width to intent tool tips 
CURA-9746
 2022-10-12 15:29:08 +02:00
Remco Burema
7e2062feec
Merge pull request #13542 from Ultimaker/CURA-9670 
Fix correct version number in uninstaller for patch releases
 2022-10-12 15:01:50 +02:00
Remco Burema
db54c95d88
Merge pull request #13541 from Ultimaker/CURA-9526 
Ensure the complete install folder is removed
 2022-10-12 15:01:41 +02:00
Remco Burema
e9b268bc06
Review suggestion; best practices; javascript. 
done as part of CURA-9746

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-10-12 14:54:33 +02:00
Remco Burema
8db3f02a4f Re-add tooltips for intent profile selection in recommended. 
They where skipped over when transferring the radio bar to the current large button based setup.

CURA-9746
 2022-10-12 14:43:55 +02:00
c.lamboo
9bacbb5825 Sort cloud printers in printer selection dropdown menu 
CURA-9748
 2022-10-12 14:37:26 +02:00
Casper Lamboo
a5445111a4
Merge pull request #13544 from Ultimaker/CURA-9689_filter_config_list 
[CURA-9689] Filter material lists for compatible printers.
 2022-10-12 13:57:55 +02:00
Remco Burema
7dd37c6a53 Filter material lists for compatible printers. 
So that only one identical entry shows up per material, per extruder (per printer).

CURA-9689
 2022-10-12 12:02:20 +02:00
Jelle Spijker
547d801209 Add VERSION to REG_APP_PATH and UNINSTALL_PATH 
This should ensure that updating a patch doesn't override
the uninstaller in the settings->Installed apps

Fixes: #13337

CURA-9670 Correct the version number in the uninstaller
 2022-10-12 11:48:10 +02:00
Jelle Spijker
e28e25281c Ensure the complete install folder is removed 
Fixes: CURA-9526 Uninstalling main build doesn't remove all files
 2022-10-12 10:42:44 +02:00
Jelle Spijker
74f864e285
Merge pull request #13538 from Ultimaker/CURA-7800_wall_count_when_tree 
[CURA-7800] For tree support default should be support wall count 1.
 2022-10-12 07:47:31 +02:00
Tim
a51b03b9f4 Fix startup on Zorin OS 
First unset QT_STYLE_OVERRIDE then start Cura

(cherry picked from commit 6989aabff5d9902e9587a26bd0d2c037c2ee22af)
 2022-10-11 16:30:45 +02:00
Jelle Spijker
7faf2f63da Remove 5.3.0-alpha from the conandata 
When the `conan install . ` command is run without a version specifier it would take the dependencies for 5.3.0-alpha
on the 5.2 branch.
 2022-10-11 15:05:46 +02:00
Casper Lamboo
60e3e50253
Merge pull request #13486 from Ultimaker/CURA-9714_crash_double_loading_file 
[CURA-9714] Crash double 3mf that contains printer with no extruders
 2022-10-07 10:13:58 +02:00
Casper Lamboo
d9ed7c0386
Merge pull request #13489 from Ultimaker/CURA-9696_fix_windows_uninstall 
[CURA-9696] Fix windows uninstall.
 2022-10-07 10:09:56 +02:00
Remco Burema
1e1ec7c6e5 For tree support default should be support wall count 1. 
part of CURA-7800
 2022-10-06 22:23:24 +02:00
c.lamboo
efe3014d55 Merge branch '5.2' of github.com:Ultimaker/Cura into 5.2 
# Conflicts:
#	plugins/UFPWriter/UFPWriter.py
 2022-10-06 16:05:59 +02:00
c.lamboo
598e093b5e Revert "Flatten equation in UFP settings export" 
This reverts commit ccf9a47f085ac66bf57ec04e99a04bd984770641.
 2022-10-06 16:05:53 +02:00
c.lamboo
ccf9a47f08 Flatten equation in UFP settings export 2022-10-06 15:49:51 +02:00
Remco Burema
e2e626f530 Windows: Registry root should be the local machine one. 
So that uninstall is properly linked in the 'programs and features' again.

CURA-9696
 2022-10-06 12:46:56 +02:00
Joey de l'Arago
8e883cf546 This fixes a crash when loading a 3mf with a printer that has no extruders while the current global stack also has no extruders. 
This was caused by trying to compare "extruders_enabled_count" which was None with an integer.

CURA-9714
 2022-10-06 11:44:30 +02:00
Casper Lamboo
cb6c19c1c6
Merge pull request #13481 from Ultimaker/CURA-9714_crash_loading_abstract_machine_3mf 
[CURA-9714] Crash loading abstract machine 3mf
 2022-10-05 16:37:58 +02:00
Joey de l'Arago
04ff78c704
Merge pull request #13471 from Ultimaker/CURA-9719 
Add intent and quality fields to slice metadata
 2022-10-05 16:11:31 +02:00
Joey de l'Arago
8e56631972 3mf project files saved with an abstract printer would crash on loading when selecting a non abstract printer to load the project with. 
This was because the metadata "is_abstract_machine" was being loaded into the non abstract machine. This caused a crash in MachineListModel.py by trying to delete this non abstract machine from a list where it didn't exist.

The solution is to ignore the "is_abstract_machine" metadata when loading settings from saved machines in 3mf files.

CURA-9711
 2022-10-05 15:27:39 +02:00
jelle spijker
6ae88f1181 Also set build tag if not internal 
Contributes to CURA-9711
 2022-10-05 14:43:31 +02:00
jelle spijker
67e99cd4ce Set version number for CuraVersion.py 
If you want custom version use the Conan Configuration:
`user.cura:version`

Contributes to CURA-9711
 2022-10-05 14:33:05 +02:00
c.lamboo
728daec6af Wrap material name in Compatible Printer List 
CURA-9690
 2022-10-05 14:19:38 +02:00
jelle spijker
8cf475694f Filter on specific extensions 
Contributes to CURA-9711
 2022-10-05 13:47:09 +02:00
c.lamboo
2079bd5a6e Sort "other printers" list 
CURA-9687
 2022-10-05 13:26:12 +02:00
Jelle Spijker
c94ccf24ce
Merge pull request #13472 from Ultimaker/CURA-9711_libspdlog_missing 
[CURA-9711] fix spdlog binaries missing in linux bulids
 2022-10-05 12:38:52 +02:00
jelle Spijker
e2cf889f7f Don't check for shared 
Contributes to CURA-9711
 2022-10-05 11:08:53 +02:00
jelle Spijker
ad65ffa76c Fix check if option exist 
Contributes to CURA-9711
 2022-10-05 10:56:53 +02:00
jelle Spijker
ca90ac7787 Fix adding all shared libs managed by Conan to pyinstaller 
Closes #13422

Contributes to CURA-9711
 2022-10-05 10:47:34 +02:00
jspijker
73c8bf5c66 Merge branch '5.2' into CURA-9711_libspdlog_missing 2022-10-05 10:22:37 +02:00
jspijker
9bb1383da2 revert changes to tag script 2022-10-05 09:34:56 +02:00
Casper Lamboo
d9d2488501
Merge pull request #13473 from Piezoid/fix-ufpwriter 
UFPWriter: fix serialization of SettingFunctions
 2022-10-05 08:48:56 +02:00
Maël Kerbiriou
058824d2f4 UFPWriter: fix settings serialization 2022-10-04 23:35:15 +02:00
jspijker
4cdf4e607d update conandata.yml 5.2.0-beta.1 2022-10-04 16:38:01 +02:00
jspijker
c00135bfac make sure prerelease tag triggers conan-package 2022-10-04 16:36:13 +02:00
Joey de l'Arago
1287dffe22 Add fmt binaries to list. 
CURA-9711
 2022-10-04 15:45:37 +02:00
Casper Lamboo
bef3eb8703
Update conandata.yml 2022-10-04 15:27:41 +02:00
Casper Lamboo
566cbba111
Update conandata.yml 2022-10-04 15:23:58 +02:00
Joey de l'Arago
ccea542280 Add spdlog to binaries list. 
Add warning for missing binary

Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before.

CURA-9711
 2022-10-04 14:40:13 +02:00
c.lamboo
a1a2784ef9 Add intent and quality fields to slice metadata 
CURA-9719
 2022-10-04 11:47:53 +02:00
MariskaMaas
d0ddb5fafe [CURA-9688] Fix View Printers in Digital Factory 
Send the user to the welcome page instead of the printjobs page to get a more comprehensive overview coming from the monitor page.
 2022-10-03 14:37:41 +02:00
c.lamboo
b33cff33f5 Disable "Remove Raft Inside Corners" setting by default 2022-10-03 11:28:22 +02:00
Joey de l'Arago
6da52b1d59
Update conandata.yml 2022-09-30 15:50:35 +02:00
c.lamboo
75ca7babaf Add a circle to the background of the refresh button 
Be more consistent with rest of UI.

CURA-9677
 2022-09-30 13:46:57 +02:00