GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,538 Commits 294 Branches 267 Tags
Commit Graph

30538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
9645f66df7 Removed Appdata and desktop config 
No longer used since our current files reside
reside in the packaging folder

Contribute to CURA-9482
 2022-09-07 15:51:08 +02:00
Jelle Spijker
55dfe5a380 Merge branch 'main' into CURA-9483_clean_up_CICD 2022-09-07 15:46:40 +02:00
Jaime van Kessel
094d176c45
Fix LayerPolygon 2022-09-07 15:32:51 +02:00
Jelle Spijker
6aa68ddb33 Improved readability of changelog 5.1.1 2022-09-07 11:05:39 +02:00
Jelle Spijker
b69eb0180e Use conf to obtain configuration 
Contributes to CURA-8831
 2022-09-07 10:34:04 +02:00
Jaime van Kessel
a8f0e330ad
Fix logspam in layerpolygon 2022-09-07 09:55:19 +02:00
Jaime van Kessel
b446730d9b
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-07 09:54:07 +02:00
Jaime van Kessel
0fcbcf6a5f
Fix crash on layer polygon 2022-09-07 09:52:57 +02:00
jelle Spijker
25aabfb031 Allow specifying version with conan conf 
By setting the `user.cura:version` in the
configuration of Conan that version string
is used preferred over the actual version

This should be usefully for releases

Contributes to CURA-8831
 2022-09-07 07:49:38 +02:00
jelle Spijker
770307d53a Allow specifying version with conan conf 
By setting the `user.cura:version` in the
configuration of Conan that version string
is used preferred over the actual version

This should be usefully for releases

Contributes to CURA-8831
 2022-09-07 07:49:21 +02:00
Remco Burema
5866560540 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 23:33:45 +02:00
Maël Kerbiriou
4b7f18c08c SceneNode settings use native python types 2022-09-06 18:06:31 +02:00
Jelle Spijker
5f2256f2d9
allow conan 1.52.0 to be used 2022-09-06 17:33:09 +02:00
jelle Spijker
656238d5f2 Updated changelog with new features 
Closes CURA-9525
 2022-09-06 16:54:49 +02:00
Jaime van Kessel
8f2dc5c6e0
Fix mistake with abax printers 
They weren't using the machine specific settings.
 2022-09-06 16:31:25 +02:00
Jaime van Kessel
f3b742d26a
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-06 16:20:55 +02:00
Jaime van Kessel
3aa2ae27bb
Remove global settings from extruder profiles 2022-09-06 16:20:31 +02:00
Jordan
1a0acb25f7 Changed the material_print_temperature 2022-09-06 16:14:38 +02:00
jelle Spijker
cc403a9a49 Bump up patch version on release branch 2022-09-06 15:38:42 +02:00
Jaime van Kessel
f348249333
Merge branch 'fix/renkforcerf100xl' of github.com:imakecodes/Cura 
CURA-9609
 2022-09-06 15:29:38 +02:00
j.spijker@ultimaker.com
2086bbfc49 Use workflow fixes from main 2022-09-06 15:25:18 +02:00
j.spijker@ultimaker.com
e164efeca4 Use conanfile fixes from main 2022-09-06 15:16:17 +02:00
Jaime van Kessel
6afdd86cc4
Merge pull request #13215 from digitalfrost/050922 
PrintInformation.py Use warning method with Logger
 2022-09-06 15:07:56 +02:00
Jaime van Kessel
48c6eb076c
Merge pull request #12959 from digitalfrost/050822 
LayerPolygon.py: Refactor check for unknown line types
 2022-09-06 15:06:13 +02:00
Jaime van Kessel
0944e63808
Merge pull request #12947 from digitalfrost/040822 
MachineErrorChecker.py: Use one line conditional assignment
 2022-09-06 15:04:10 +02:00
j.spijker@ultimaker.com
e704d4db42 Add 5.1.1 entry to conan_data 2022-09-06 15:02:54 +02:00
Jaime van Kessel
5b9ff198f4
Merge branch '030822' of github.com:digitalfrost/Cura 2022-09-06 15:02:32 +02:00
Jaime van Kessel
2734005f36 Add extra BOM numbers to UMs3 and UMs5 2022-09-06 15:01:32 +02:00
Jaime van Kessel
7d836e3874
Merge pull request #12844 from digitalfrost/patch-4 
LayerPolygon.py: Shorten excessively long lines
 2022-09-06 15:00:52 +02:00
Jaime van Kessel
a49919d106
Merge pull request #12887 from digitalfrost/patch-7 
Add link to style guide
 2022-09-06 14:59:47 +02:00
Jaime van Kessel
2f1325259c
Fix 3mf workspace reader crashing on certain invalid files 
CURA-4DP (Sentry crash)
 2022-09-06 14:47:32 +02:00
Jaime van Kessel
7d3a617824
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-06 14:44:01 +02:00
Jaime van Kessel
6c0d76807e
Add trycatch around whatsnew & changelog pages 
Fixes CURA-4DX (sentry crash)
 2022-09-06 14:43:38 +02:00
Joey de l'Arago
e95ed93021
Merge pull request #13210 from Ultimaker/CURA-9277_ 
Various fixes for the cloud printer types feature
 2022-09-06 13:57:03 +02:00
Jaime van Kessel
f2edc1ac49
Fix typo 2022-09-06 13:56:24 +02:00
c.lamboo
148263a068 Move hasNetworkedConnection to GlobalStack 
From code review

CURA-9277
Co-authored-by: Joey <j.delarago@ultimaker.com>
 2022-09-06 13:52:10 +02:00
Jaime van Kessel
370d0bcf03
Add extra BOM numbers to UMs3 and UMs5 2022-09-06 13:43:14 +02:00
NOVAXIM
a234c0117e
Update anycubic_mega_zero.def.json 
Line 79: This value (0.3) is the default in firmware.
Line 80: The default setting (5) may be too small if you are using Linear Advance.
 2022-09-06 13:39:06 +02:00
Casper Lamboo
6253fb2fdc
Add typing to function argument 
CURA-9277

Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-09-06 13:19:50 +02:00
j.spijker@ultimaker.com
7eb47d450f Also use gcc12 for the unittest 
in case curaengine isn't build
 2022-09-06 13:00:45 +02:00
j.spijker@ultimaker.com
bc7db5ffa7 Always run 2022-09-06 13:00:44 +02:00
Remco Burema
6baf14a516 Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog 2022-09-06 12:08:05 +02:00
Jaime van Kessel
d097b7d030
Minor codestyle changes to fdmprinter 2022-09-06 11:52:33 +02:00
Jaime van Kessel
a5f23939f5
Fix a few more typos 2022-09-06 11:47:33 +02:00
Jaime van Kessel
e2e1926c3c
Merge branch '180822' of github.com:digitalfrost/Cura 2022-09-06 11:43:57 +02:00
Jaime van Kessel
543598a200
Fix typo 2022-09-06 11:43:45 +02:00
digitalfrost
250c038e03
CuraContainerStack.py: iterate directly over IndexTypeMap (#12988) 
* CuraContainerStack.py: iterate directly over IndexTypeMap

There is no need for range(len

Co-authored-by: Jelle Spijker <spijker.jelle@gmail.com>
 2022-09-06 11:41:50 +02:00
Jaime van Kessel
e30b85fc18
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-06 11:39:57 +02:00
Jaime van Kessel
2c331604e8
Clean up a lot of duplicate settings from machine profiles 
These were errors that were copy pasted from other definitions. So leaving them as is would
continue to decrease the quality of third party profiles.
 2022-09-06 11:39:08 +02:00
jelle Spijker
59d9bfde99 Use umbase 0.1.7 
This will now set the version by default if not
defined at the cmd line to the first entry in the
conandata.yml
 2022-09-06 11:33:18 +02:00