3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30197 commits 313 branches 275 tags 719 MiB
Commit graph

30197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
bdcbaeb65c
Merge pull request #11690 from jimduchek/usbprint_exception_fix 
USBPrinterOutputDevice.py: Convert estimated time to int
 2022-09-08 14:23:07 +02:00
Jaime van Kessel
38496da592
Merge branch 'master' of github.com:jianshu-du/Cura 2022-09-08 14:21:44 +02:00
Jaime van Kessel
be9d480af4
Reduce filesize for vzbot 2022-09-08 13:49:54 +02:00
Christian Kvasny
018952a921
VzBot (#13181) 
* Add VzBot printer

* remove exclude_materials

* Update vzbot_base.def.json

remove Unnecessary default_values

* rename duplicate profile ids

* Adjusted speed for TPU. Retract switched off

* update start/end gcode

* set retraction_amount to 0.65

* update gantry_height

* add custom overrides
 2022-09-08 13:49:32 +02:00
Jaime van Kessel
e2cef9b5b3
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-08 13:16:14 +02:00
Jaime van Kessel
178b615c15
Re-add pytest.ini 
This was removed on accident
 2022-09-08 13:15:37 +02:00
Jaime van Kessel
54b85a995b
Merge pull request #13239 from Ultimaker/PP-242-cleanup-retract_at_layer_change 
these settings are already default
 2022-09-08 13:04:37 +02:00
Jaime van Kessel
c1b13c4eb5
Merge branch 'main' of github.com:Ultimaker/Cura 2022-09-08 13:01:19 +02:00
Jaime van Kessel
242f8264da
Merge pull request #11573 from fieldOfView/feature_tray_icon_preference 
Add a preference to make tray icon optional
 2022-09-08 13:01:04 +02:00
Jelle Spijker
01e3823d4d Bump minor version on main 2022-09-07 17:09:59 +02:00
Rijk van Manen
25ef399595 these settings are already default 
PP-242
 2022-09-07 16:55:18 +02:00
Jaime van Kessel
261302462f
Remove duplicate default value from profile 2022-09-07 16:21:36 +02:00
Jaime van Kessel
aaadff28e4
Merge pull request #13211 from Ultimaker/PP-232_Disable_monotonic_ordering 
Only enable monotonic ordering for the roof layer
 2022-09-07 16:21:06 +02:00
Jaime van Kessel
a51b3add80
Merge branch 'PP-202_autogenerate_intent_profiles' of github.com:Ultimaker/Cura 2022-09-07 16:12:28 +02:00
Jelle Spijker
777993a521
Merge pull request #13185 from Ultimaker/CURA-9483_clean_up_CICD 
[CURA-9483] Remove unused files
 2022-09-07 15:51:27 +02:00
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
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
5f2256f2d9
allow conan 1.52.0 to be used 2022-09-06 17:33:09 +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
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
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
Jaime van Kessel
5b9ff198f4
Merge branch '030822' of github.com:digitalfrost/Cura 2022-09-06 15:02: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
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
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