GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,299 Commits 286 Branches 260 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
Erwan MATHIEU
4f859e278b Reapply "Merge pull request #20128 from Ultimaker/CURA-12371" 
This reverts commit bf2eef3537d6f9ef3237f39cf8b303563d1804ff.
 2025-03-28 11:35:10 +01:00
Erwan MATHIEU
bf2eef3537 Revert "Merge pull request #20128 from Ultimaker/CURA-12371" 
This reverts commit f2ebf160a5770a8ed9a2e32153f4380011eb51cd, reversing
changes made to 97deb2f15ea4f2b904d14270d0d2a8b0fff19009.
 2025-03-21 10:13:46 +01:00
Erwan MATHIEU
8b0f59256f
Merge branch 'main' into CURA-12371 2025-02-06 10:31:07 +01:00
Shirley Du
868e74e84b For Method, enable corner rounding/input shaping if using highspeed type intents 2025-01-28 17:14:34 -05:00
Shirley Du
5b61a3e3b7 Make acceleration/jerk_enabled control bead modes as well 
This fits more with the parenting structure
 2025-01-16 11:11:15 -05:00
Shirley Du
99d10e5227 Use some accel/jerk settings as Method Bead Mode values 
Populate Method series .makerbot files' meta.json with accel override settings,
for the print globally and for 'bead modes' pertaining to specific features,
per extruder. Currently, extruder-specific bead mode settings will only be
added to the meta.json if the value is non-zero.

Also disallow setting per mesh/extruder/meshgroup for accel/jerk _enabled,
_print, _travel, _travel_enabled for method-based printers
 2025-01-09 20:11:03 -05:00
Erwan MATHIEU
66402ff93c Use single extruder when exporting for Replicator+ 
CURA-12313
 2025-01-09 09:19:41 +01:00
HellAholic
0311ca0ddc
Update MakerbotWriter.py 
switch back and front bounds order to line up with the NP and makerbot documentation
 2024-10-25 13:30:27 +02:00
Erwan MATHIEU
531f286445 Use same thumbnail formats for Sketch as Method 
CURA-12185
 2024-10-17 11:22:55 +02:00
Erwan MATHIEU
f0cbd8e802 Restore lost change after an errored merge 
This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552.
 2024-09-19 11:00:09 +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
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
f1dbf943a4 Merge branch 'main' into CURA-12005_include_slicemetadata_in_makerbot_file 2024-08-01 11:41:39 +02:00
c.lamboo
05a6bb7e45 Remove plugin code 
oops
 2024-07-17 12:08:04 +02:00
c.lamboo
6ebed84553 Add "instance0" entry to gaggles 2024-07-17 12:04:27 +02:00
Erwan MATHIEU
7ba48bfa97 Add the slicemetadata.json file into the makerbot file archive 
CURA-12005
 2024-07-10 13:13:26 +02:00
c.lamboo
21b8694289 Add comment explaining workaround 
CURA-11777
 2024-05-15 17:49:44 +02:00
Saumya Jain
2f8fc2cabe Updated bounds and meta values in MakerbotWriter 
The MakerbotWriter.py file has been adjusted to handle "application/x-makerbot-sketch" files without providing bounding box values. Instead of using the node name for model_counts, it now uses the count of nodes under the name "instance0".
 2024-05-08 11:40:30 +02:00
Saumya Jain
fdfc5dcc67 added machine bounds 
CURA-11777
 2024-05-07 12:51:03 +02:00
Saumya Jain
7a52cd3cd5 Update Ultimaker Sketch definitions and refactor PNG formats in MakerbotWriter 
CURA-11777
 2024-05-07 10:55:23 +02:00
Saumya Jain
0bbde663e4 Update file format and removed 'Sketch' flavor option 
The file format 'application/x-makerbotsketch' has been updated to 'application/x-makerbot-sketch' across all instances in the code base. In addition, the 'Sketch' option for gcode flavor has been removed from all printer selection menus in different sections of the code. This should be added again once the code is implemented in gcode for this flavor.
Also, change flavor in ultimaker_sketch.def.json file

CURA-11777
 2024-05-06 16:07:48 +02:00
Saumya Jain
4e36c570ed Added support for Makerbot Sketch file format 
This commit introduces the ability to export files in the Makerbot Sketch format.Now the file can be saved as in a gcode format as well.
 2024-05-06 15:55:49 +02:00
c.lamboo
cf27163934 Update bot to reference 2023-11-29 12:25:51 +01:00
c.lamboo
a9dcfaa032 specify bot id type 2023-11-27 15:32:55 +01:00
c.lamboo
495079f3d9 Clean up bot LUT 
We had a lot of Look up Tables scattered around in the cura repository. This can be solved by adding a `bot_id` entry to metadata of the various makerbot extruders/materials/definitions
 2023-11-24 16:49:31 +01:00
Chris Moore
c61c896619
Copy version info to miracle_config 
Only fields in miracle_config get sent to analytics by method firmware.  I don't know if anything else in our codebase expects to also see these fields at the top level, so I put one copy at the top level and one copy down in miracle_config.
 2023-11-10 14:13:58 -05:00
Remco Burema
35d1ae3272 Fix 'brand alignment' messing up actual print files. 2023-11-03 17:04:26 +01:00
Remco Burema
d2db9a2555 Defensive programming for isometric snapshot. 2023-11-01 17:14:29 +01:00
Jelle Spijker
d7d458499e
Rename ABS-CF in material map to ABS-CF10 
Contributes to CURA-10561
 2023-10-31 18:49:23 +01:00
Jelle Spijker
f9517ada44
Add ABS-CF to material map 
Contributes to CURA-10561
 2023-10-31 15:33:05 +01:00
c.lamboo
6a07c346d6 Update comment 
CURA-10561
 2023-10-31 11:31:10 +01:00
Jelle Spijker
9e0def310c
Update Material GUID LUT 
Contributes to CURA-10561
 2023-10-31 10:20:44 +01:00
c.lamboo
20719ea5b5 Use definition name rather then display name of the machine 
CURA-10561
 2023-10-30 17:55:06 +01:00
c.lamboo
0c8496b7ab Set write flag for thumbnail 
CURA-10561
 2023-10-30 17:03:59 +01:00
c.lamboo
4f649e57d1 Write meterToMillimeter as camelcase 
CURA-10561
 2023-10-30 16:10:13 +01:00
c.lamboo
c68a4b1bb7 Write correct key for pyDulcificum_version metadata 
CURA-10561
 2023-10-30 15:44:42 +01:00
c.lamboo
71ada85966 Use camercase for isometricSnapshot def 
CURA-10561
 2023-10-30 15:41:54 +01:00
c.lamboo
2660933d6e Add mimetype for .makerbot files 
CURA-10561
 2023-10-30 13:37:50 +01:00
c.lamboo
5915994d7f codecleanup 
CURA-10561
 2023-10-27 14:08:54 +02:00
c.lamboo
b60a3b04ad Add versions 
CURA-10561
 2023-10-27 13:54:53 +02:00
c.lamboo
b0c63c35c6 Use pyDulcificum again 
CURA-10561
 2023-10-27 13:43:26 +02:00
c.lamboo
aec5ec8844 Add gaggle 
CURA-10561
 2023-10-27 13:19:22 +02:00
Jelle Spijker
089ee6c04b
Use pyDulcificum 
Contributes to CURA-10561
 2023-10-26 17:36:57 +02:00
c.lamboo
0ce4a6bd67 Add material map 
CURA-10561
 2023-10-26 17:02:29 +02:00
Jelle Spijker
b2ced7c0ba
Install pyDulcificum 
Contributes to CURA-10561
 2023-10-26 16:09:38 +02:00
c.lamboo
251f247147 Update platform_temperature and build_plane_temperature 
CURA-10561
 2023-10-25 17:52:09 +02:00
Casper Lamboo
2ee0769812
Merge pull request #17046 from Ultimaker/makerbot-iso-view-renderer 
Add iso view to snapshot
 2023-10-25 17:20:53 +02:00
c.lamboo
603d694512 Fix duration in makerbot metadata 
CURA-10561
 2023-10-25 16:27:36 +02:00
c.lamboo
fe4790fe06 Add iso view to snapshot 2023-10-20 23:14:58 +02:00
c.lamboo
1425dd01d5 Fix bug in create bounds 
CURA-10561
 2023-10-20 22:49:26 +02:00