GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-19 12:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,330 Commits 287 Branches 260 Tags
Commit Graph

9992 Commits

Author SHA1 Message Date
Jaime van Kessel
aaff84ce77
Merge branch 'main' of https://github.com/TheSin-/Cura 2024-10-10 14:09:18 +02:00
Erwan MATHIEU
a96eefd8cc Fix duplicated file reloading 
CURA-11905

Instead of using the object name for reloading meshes inside a 3MF file, use a dedicated mesh ID property that is only stored internally, doesn't have to be unique (because the combination filename+ID will be) and can't be changed by the user. This should improve 3MF file reloading, and also fixes reloading of duplicated instances, because multiple meshes can now have the same mesh ID.
 2024-10-07 17:50:25 +02:00
HellAholic
5d6d2f118a
Merge branch 'main' into CURA-12138-Export_for_support_option 2024-10-04 15:23:52 +02:00
HellAholic
d770a183a1
Merge branch 'main' into CURA-12138-Export_for_support_option 2024-10-03 13:51:00 +02:00
Erwan MATHIEU
f1874d1c2e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-10-03 10:20:55 +02:00
HellAholic
ed6daa3735
Merge pull request #19083 from GregValiant/InsertAtLayerChange 
Rewrite - Insert At Layer Change
 2024-10-02 14:03:03 +02:00
HellAholic
1a7a5bcbbf
Merge pull request #19703 from Ultimaker/CURA-12097_upgrade_to_59 
[CURA-12097] Upgrader for 5.8 -> 5.9 version.
 2024-10-02 13:47:34 +02:00
Erwan MATHIEU
d2b3ca3896 Apply suggested changes 2024-10-02 13:07:45 +02:00
Remco Burema
e3211d4128 Make slicing work for the --external-backend option again. 2024-10-02 12:57:36 +02:00
Remco Burema
4b2026e718 Upgrader for 5.8 -> 5.9 version. 
see jira ticket CURA-12097
 2024-10-01 20:09:04 +02:00
Erwan MATHIEU
7815715119
Merge branch 'main' into TIme-Lapse 2024-10-01 15:17:05 +02:00
Erwan MATHIEU
e4b4b8e4a4 Remove extra-spaces after units 2024-10-01 15:16:43 +02:00
Erwan MATHIEU
ff1657305e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-09-30 13:03:09 +02:00
Erwan MATHIEU
f757032fb6
Merge branch 'main' into CURA-12138-Export_for_support_option 2024-09-30 11:40:22 +02:00
Erwan MATHIEU
fe5b4bac24 Add missing typing 
CURA-12138
 2024-09-30 11:40:01 +02:00
HellAholic
90945027aa
Merge pull request #19675 from Ultimaker/CURA-11103_display-message-file-too-big 
CURA-11103 Handle message too big error when sending model data to engine
 2024-09-30 10:35:03 +02:00
Erwan MATHIEU
befbc32c1c
Merge branch 'main' into TIme-Lapse 2024-09-30 09:22:49 +02:00
Erwan MATHIEU
acd8444465
Merge branch 'main' into InsertAtLayerChange 2024-09-30 09:22:36 +02:00
Erwan MATHIEU
4d2c879d1d
Merge branch 'main' into CURA-12138-Export_for_support_option 2024-09-27 15:48:02 +02:00
Erwan MATHIEU
f28482ebac Include log file when exporting project file for support 
CURA-12138
 2024-09-27 15:38:27 +02:00
Paul Kuiper
99b6fd7616 Adjusted code to filter out the abstract colors per machine. 
CURA-11634
 2024-09-26 14:51:22 +02:00
Paul Kuiper
2c63e33b01 Prevent abstract color profiles to be filtered out for machines that support them. 
CURA-11634
 2024-09-26 13:35:55 +02:00
Erwan MATHIEU
74cafe1c4b Handle message too big error when sending model data to engine 
CURA-11103
 2024-09-24 08:55:29 +02:00
HellAholic
69a9ff8e05
Merge branch 'main' into CURA-11761_container_stack_cache 2024-09-19 14:52:40 +02:00
Erwan MATHIEU
f0cbd8e802 Restore lost change after an errored merge 
This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552.
 2024-09-19 11:00:09 +02:00
Remco Burema
7928c241a8 Merge remote-tracking branch 'origin/5.8' 2024-09-18 17:31:27 +02:00
Erwan MATHIEU
d74e0487cd Apply suggestion to remove unnecessary extra arguments 
CURA-12093
 2024-09-10 12:50:55 +02:00
Erwan MATHIEU
101a637bbb
Apply typo fix suggestion 
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
 2024-09-10 12:44:50 +02:00
Erwan MATHIEU
48ddaa8861 Add a comment so that we don't forget to update the doc 
CURA-12093
 2024-09-06 12:20:46 +02:00
Erwan MATHIEU
370c8e49c3 Add a link to the documentation to write start/end GCode 
CURA-12093
 2024-09-06 12:20:27 +02:00
Erwan MATHIEU
ac8176d91e
Merge branch 'main' into CURA-11761_container_stack_cache 2024-09-05 11:35:17 +02:00
Erwan MATHIEU
ccffbea8c9 Add ability to write condition Start/End gcode parts 
CURA-12093
 2024-09-05 11:03:58 +02:00
GregValiant
ffc21403a1 Update TimeLapse.py 
Update TimeLapse.py

Update to include a pause before the image is snapped.
 2024-09-04 22:01:48 -04:00
Remco Burema
d0252554c4 Make extra sure cache is emptied when objects get altered. 
See the (new) cachePerInstance decorator in UM/Decorators, and the accompanying CachedMemberFunction handler-class.

part of CURA-11761
 2024-09-03 18:23:41 +02:00
David Fries
6e3e3e6742 Use raw strings for regular expressions with invalid escape sequences 
If "T(\d*)" was "T(\n*)" it would search for newlines.  There isn't
any such \d escape character.

It should be "T(\\d*)" or r"T(\d*)" going with the latter, to be
easier to read and be consistent with other Cura usage.

Start python with -Wd or for python 3.12 will raise a SyntaxWarning.
 2024-08-31 12:11:59 -05:00
Frederic Meeuwissen
4064dddacc Only convert to yes/no if value is a boolean 2024-08-28 13:39:35 +02:00
Frederic Meeuwissen
a18da5c9bd Only convert to yes/no if value is a boolean 2024-08-26 13:12:03 +02:00
HellAholic
83fc0b764c
Merge pull request #19492 from Ultimaker/CURA-11957_sketch_fileformat_autoselect 
[CURA-11957] Makerbot file formats don't just have 1 mime-type.
 2024-08-14 13:51:26 +02:00
Erwan MATHIEU
946bf03306 Revert "Merge branch 'main' into 5.8" 
This reverts commit fec7637615fd05fb052848bb1cd569840d650ebd, reversing
changes made to 081b9b543b564ac6c2a840916162a06b289c5d94.
 2024-08-13 15:56:01 +02:00
Erwan MATHIEU
ee65d93fb6
Merge branch 'main' into TIme-Lapse 2024-08-13 09:21:20 +02:00
Justin F. Hallett
86576c6fbc
Merge branch 'Ultimaker:main' into main 2024-08-10 15:24:02 -06:00
Justin F. Hallett
3bb782fd5f
Add 3 New UI Settings 
- Add UI to set `machine_start_gcode_first` so that no gcode is adding infront of the start_gcode.
- Add float input box to set `machine_extruder_change_duration` which added proper extruder change times to the estimated print time.
- Add textbox to set `machine_extruder_prestart_code` to add gcodes that will run pre extruder change, things like heat up so we are at change before with pick up the next extruder.
 2024-08-10 12:53:56 -06:00
Michael Jäger
3136dfc0ec Process M82 and M83 command for Marlin flavoured GCode too 2024-08-09 18:13:01 +02:00
Remco Burema
77e0d705db The easy way to fix a slow response is to up the timeout. 
This might on one hand have (other) consequences, and given the slowness we encounter not even be enough in some cases (may be related to the size of the messages?) May need to be fixed on server side.

attempt to adress CURA-11956
 2024-08-07 18:04:18 +02:00
Remco Burema
8b47ce0315 Autoselect file-format: Split up long line and better documentation. 
done as part of CURA-11957
 2024-08-06 17:04:42 +02:00
Remco Burema
89209f5f9a Makerbot file formats don't just have 1 mimetype. 
There are machines with other mime-types. Prepare for adding that one.

last step of CURA-11957 (otherwise solved by previous efforts)
 2024-08-06 15:47:28 +02:00
HellAholic
e38987f46b
Merge branch 'main' into CURA-12005_include_slicemetadata_in_makerbot_file 2024-08-06 09:05:26 +02:00
Jaime van Kessel
4a5aecc1e4
Merge branch 'fix/3MFWriter' of https://github.com/nilsiism/Cura 2024-08-05 13:25:55 +02:00
Remco Burema
9c457b0d20 Map internal name reps to .makerbot-file reps. 
Not only is this more congruent with the file-format as it exists, the Digital Library handles the metadata in this format, and can do little with it otherwise.

last step needed for CURA-12005
 2024-08-01 15:31:04 +02:00
Remco Burema
ddf4f4c6fe Also move printer name mapping to new FormatMaps utility. 
done as part of CURA-12005
 2024-08-01 14:33:24 +02:00