Jaime van Kessel
e7c58c49dc
Merge branch 'main' of github.com:Naxecorp/Cura
2022-09-15 13:52:19 +02:00
Jaime van Kessel
3400210f9b
Merge branch 'per-object-autodropdown' of github.com:Piezoid/Cura
2022-09-14 14:46:08 +02:00
Jaime van Kessel
487536c757
Put back the speed_wall_x for UM2+C
2022-09-14 13:58:55 +02:00
Jaime van Kessel
ee551e48b3
Restore incorrectly removed settings
...
Something went wrong here, it removed the wrong defaults...
2022-09-14 13:45:27 +02:00
Jelle Spijker
d410648705
Merge pull request #13288 from Ultimaker/CURA-9535_require_networkx
...
[CURA-9535] Some trimesh operations require networkx
2022-09-14 11:40:56 +02:00
Jordan
37615284e1
changed retraction amount from 0.5 to 0.2
2022-09-14 09:34:31 +02:00
Remco Burema
d0d417c219
Some trimesh operations require networkx, add as required.
...
Seems networkx itself is low on dependencies itself. It does require some optional ones for e.g. it's linalg sub-package, but those are numpy and scipy, which we already have.
Cura part of CURA-9535
2022-09-14 08:54:18 +02:00
Remco Burema
d69819a24e
Merge remote-tracking branch 'origin/5.1'
2022-09-13 19:47:07 +02:00
Jaime van Kessel
ce71cbb57b
Merge pull request #13209 from Ultimaker/CURA-9224_approver_settings_json
...
[CURA-9224] Approver settings json
2022-09-13 14:07:42 +02:00
Jaime van Kessel
4e785c3b61
Merge branch 'CURA-9224_approver_settings_json' of github.com:Ultimaker/Cura into CURA-9224_approver_settings_json
2022-09-13 13:36:49 +02:00
Jaime van Kessel
356da40dde
Remove unused function
...
CURA-9224
2022-09-13 13:36:28 +02:00
Jaime van Kessel
8dc2eaf783
Move CreateFlattendContainerInstance to InstanceContainer
...
It didn't really belong in the stack builder, as it's not a containerstack
CURA-9224
2022-09-13 13:35:37 +02:00
Jaime van Kessel
a27bf8f7ed
Update formatting
...
CURA-9224
2022-09-13 11:16:02 +02:00
Jaime van Kessel
aa28f8abfb
Remove unused import
...
CURA-9224
2022-09-13 11:15:04 +02:00
Jaime van Kessel
246f0f02fe
Merge pull request #13280 from digitalfrost/050922b
...
PrintInformation.py: Fix grammar in docstrings
2022-09-13 11:10:53 +02:00
digitalfrost
fe483d4656
Merge branch 'main' into 050922b
2022-09-13 10:50:39 +02:00
Casper Lamboo
6abce2a81a
Merge pull request #13195 from Ultimaker/CURA-9278_choose_printer_dialog
...
[CURA-9278] Press print on abstract cloud printer. User should see dialog.
2022-09-13 10:42:36 +02:00
c.lamboo
d97dddcfe2
Revert "More agressivly check online printers"
...
This reverts commit 92b371cd50
2022-09-13 10:41:46 +02:00
c.lamboo
ad14e60d26
Show printer even if the configuration does not match
...
CURA-9278
2022-09-13 10:34:33 +02:00
Remco Burema
8935ab4a2d
Defensive coding: What if no extruder position.
...
part of CURA-9278
2022-09-13 10:12:32 +02:00
Jelle Spijker
d31cc5baf0
fix channel_metadata not defined
2022-09-12 18:32:09 +02:00
c.lamboo
92b371cd50
More agressivly check online printers
...
CURA-9278
2022-09-12 17:34:44 +02:00
c.lamboo
99136fd209
Fix bug in displaying extruders
...
CURA-9278
2022-09-12 17:24:55 +02:00
c.lamboo
8d9e9a9dbf
Use modern python typing
...
CURA-9278
2022-09-12 17:04:40 +02:00
Casper Lamboo
96bc5ed602
Simplify string notation
...
CURA-9278
2022-09-12 14:20:28 +02:00
Casper Lamboo
e3fc73f17d
Simplify if notation
...
CURA-9278
2022-09-12 14:20:06 +02:00
Casper Lamboo
0f36f83373
Simplify list notation
...
CURA-9278
2022-09-12 14:19:08 +02:00
c.lamboo
f6442d1950
Only display buildplate for glass buildplates
...
CURA-9622
2022-09-12 14:03:15 +02:00
Jaime van Kessel
093fa44f9c
Merge pull request #13244 from Ultimaker/PP-239-cleanup-jerk-settings
...
cleanup jerk settings
2022-09-12 10:37:16 +02:00
j.spijker@ultimaker.com
2244b50c6e
fix latest branch version prerelease
2022-09-12 09:09:14 +02:00
Jelle Spijker
6d8ac37766
fixed typo
2022-09-12 09:03:21 +02:00
jelle Spijker
6f0627ea48
Fix versioning scheme name used by embedded team
2022-09-12 08:58:46 +02:00
c.lamboo
880724d2e4
Add material information to ufp output
...
CURA-9224
2022-09-10 09:47:31 +02:00
Remco Burema
b7611da95e
Connect buttons for selected printers: Print and refresh.
...
part of CURA-9278
2022-09-09 15:14:29 +02:00
Remco Burema
2b1909b7b5
Don't show machines with only incompatible configurations.
...
part of CURA-9278
2022-09-09 13:17:41 +02:00
Remco Burema
6adf05bbf0
Complete interface for selecting cloud printer.
...
CURA-9278
2022-09-09 11:05:05 +02:00
Rijk van Manen
e64a48bc86
cleanup jerk settings
...
Variants: jerk_print = 25 for 0.8 cores
Intent: jerk_print = 30 for Draft/Engineering
PP-239
2022-09-08 16:28:36 +02:00
Jaime van Kessel
ba9d0f24a2
Merge pull request #13238 from Ultimaker/PP-29_Enable_zigzag_patterns
...
PP-29 use zigzag as top/bottom pattern
2022-09-08 15:31:25 +02:00
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
Remco Burema
d955a05d55
Merge remote-tracking branch 'origin/main' into CURA-9278_choose_printer_dialog
2022-09-08 13:37:02 +02:00
Remco Burema
04cd76cb3b
Get extruder configs to frontend.
...
When choosing the printer, all possible (single) extruder configs need to be shown for that printer.
CURA-9278
2022-09-08 13:36:42 +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
