GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,526 Commits 290 Branches 260 Tags
Commit Graph

30526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rijk van Manen
9f6a47f04a
Merge branch 'main' into PP-42_improved_initial_layer_settings 2022-10-17 13:51:20 +02:00
Jelle Spijker
35a62af035
Merge branch '5.2' 2022-10-16 18:00:57 +02:00
jelle Spijker
a18d3b909d
use new master/s-line as tip 2022-10-16 18:00:31 +02:00
c.lamboo
4a30bbaf2b Merge branch '5.2' 2022-10-14 16:39:05 +02:00
Casper Lamboo
c5ee307393
Merge pull request #13551 from Ultimaker/5.2_translations 
5.2 translations
 2022-10-14 16:17:09 +02:00
Casper Lamboo
722e659ec0
Merge pull request #13520 from sustmi/5.2_translations-cs_CZ 
Czech translations for v5.2
 2022-10-14 16:01:21 +02:00
c.lamboo
cfaa3ffe8e Update translations 2022-10-14 15:57:32 +02:00
Remco Burema
e505396fe7 More updates for the changelog for 5.2 2022-10-14 15:40:58 +02:00
Remco Burema
be3c312c32 Update changelog for 5.2 2022-10-14 15:23:17 +02:00
jelle spijker
5c284cd094 Fix nightly builds 2022-10-13 13:00:08 +02:00
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
Remco Burema
d3305585fc Merge branch '5.2' 2022-10-12 15:33:26 +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
Remco Burema
c46e5e430e Merge branch '5.2' 2022-10-12 09:10:32 +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
e8cf55c5c2
Merge pull request #13525 from Tim453/master 
Fix startup on Zorin OS
 2022-10-11 16:29:14 +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
Tim
6989aabff5 Fix startup on Zorin OS 
First unset QT_STYLE_OVERRIDE then start Cura
 2022-10-11 14:43:34 +02:00
Miroslav Sustek
51a90bc837 Czech translations for v5.2 2022-10-10 20:16:31 +02:00
Jelle Spijker
bbda089ae9
Add quotes around ref_name 2022-10-10 15:46:52 +02:00
Jelle Spijker
fce7df29e0
remove debugging statement 2022-10-10 15:44:46 +02:00
Jelle Spijker
2cc923761d
Fix missing quote 2022-10-10 14:58:46 +02:00
Jelle Spijker
48ea4cee9f Merge branch '5.2' 
# Conflicts:
#	conanfile.py
 2022-10-10 10:23:01 +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
Rijk van Manen
c90c7e688a fix cool fan mistake 
PP-42
 2022-10-06 16:23:31 +02:00
Rijk van Manen
27d56d378e improve initial layer settings 
ultimaker.def.json is also cleaned and put in alphabetic order.
Ultimaker 2 and original are kept mostly as they were, since they are not tested. PP-42
 2022-10-06 16:11:04 +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
Jaime van Kessel
3bb448c483
Merge pull request #13480 from Ultimaker/PP-260-notify-on-print-profile-change 
Notify PP&M on Print Profile Change
 2022-10-06 10:29:52 +02:00
Joey de l'Arago
1f7679b331
Default to creating the installer 2022-10-06 10:01:06 +02:00
Paul Kuiper
f3b9c73d0f Create a resolve function on the "support_enable" setting such that underlying extruders (and thus also intent profiles) can enable support. 
Relates to PP-251
 2022-10-05 21:03:17 +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