GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 18:44:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 289 Branches 260 Tags
Commit Graph

9773 Commits

Author SHA1 Message Date
c.lamboo
a9dcfaa032 specify bot id type 2023-11-27 15:32:55 +01:00
Jaime van Kessel
d5574f36c0
Merge branch 'CURA-11377' of github.com:Ultimaker/Cura 2023-11-27 14:44:56 +01:00
c.lamboo
0225f92ae0 Fix local cloud printing for um printers 
CURA-11390
 2023-11-27 13:47:08 +01:00
Jaime van Kessel
344d648445
Merge branch '5.6' of github.com:Ultimaker/Cura 2023-11-27 12:40:56 +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
Casper Lamboo
b3d9b22ec0
Add labs extruder to lookuptable 2023-11-24 16:08:45 +01:00
c.lamboo
e66a3cda67 Only extend file formats for um3 
This was a mistake in the previous implementation. The relevant piece of code was adding ufp support for um3 printers. This is legacy support for this printer since the printer didn't know it supported ufp, but through the digital factory it could support ufp files. However, with the addition of method printers we should have added an additional check where we also check if the printer is an um3. Instead an additional check was added that did the same for makerbot printers. Because of this check didn't have a "is method" check support for makerbot format is also added to s-line printers and legacy um printers.

(fyi @saumyaj3)

CURA-11377
 2023-11-24 15:40:11 +01:00
c.lamboo
31976e591f All method printers are cloud connected 
CURA-11377
 2023-11-24 15:35:31 +01:00
Remco Burema
ad9b11a256
Merge branch 'main' into DisplayInfoOnLCD 2023-11-24 13:59:45 +01:00
c.lamboo
4ce092837e Merge branch '5.6' 
# Conflicts:
#	conanfile.py
 2023-11-24 10:24:52 +01:00
Jaime van Kessel
60bf2fbc2c
Add preference to disable sentry engine crash reporting 
CURA-11364
 2023-11-21 14:01:58 +01:00
Casper Lamboo
afe3f54167
Remove debug statements 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2023-11-17 11:00:50 +01:00
c.lamboo
36f2deea1d Fix some more parsing issues 
Example of issues we had is that parsing floating point numbers would parse the dot as an attribute syntax and trying to retrieve both sides of the attributes to the get_value resolve. E.g `3.14` would be interpreted as getting the `14` property of the object `3`, which ofcourse throws an error.

CURA-11347
 2023-11-16 14:45:46 +01:00
c.lamboo
036516b8f9 Re-add support for post slice data variables in start/end gcode 
With previous implementation we lost support for these variables in start/end gcode
"filament_cost", "print_time", "filament_amount", "filament_weight", "jobname"

CURA-11347
 2023-11-16 13:53:43 +01:00
Jelle Spijker
efafe1503d
Merge branch '5.6' 
# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
 2023-11-15 13:53:39 +01:00
Jaime van Kessel
02bcd9f857
Merge pull request #17283 from dudecc/patch-1 
Copy version info to miracle_config
 2023-11-14 17:00:12 +01:00
Casper Lamboo
e2c6955a8e
Merge pull request #17241 from Ultimaker/CURA-11166-3mf-file-saving-center-allign 
Center alligning in case of 3mf write
 2023-11-14 10:58:18 +01:00
c.lamboo
c4573ba855 Add extruder start/end gcode duration settings 
CURA-11099
 2023-11-13 10:46:44 +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
Jelle Spijker
052c37ae6f
Merge branch 'main' into CURA-11078_python_312_spike 2023-11-09 12:29:25 +01:00
Saumya Jain
f58500ddb1
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-11-08 13:33:09 +05:30
saumya.jain
457cecba59 using numpy for array calculation 
CURA-7647
 2023-11-08 13:29:47 +05:30
Remco Burema
b8deb31eb9 Merge branch '5.6' 2023-11-07 15:17:32 +01:00
saumya.jain
efda0aaba4 updated for every layer 
CURA-7647
 2023-11-07 18:42:41 +05:30
saumya.jain
6301926885 Calculating time of travel for each line segment 
CURA-7647
 2023-11-07 18:08:08 +05:30
c.lamboo
cba4151ffc Also add balanced to intent names 
CURA-11221
 2023-11-07 10:57:45 +01:00
saumya.jain
9b9f6b1bc3 intent name translated from intent_translations 
CURA-11221
 2023-11-07 10:55:09 +01:00
saumya.jain
b5c47ae8f3 Intent type translated while reading 3mf 
CURA-11221
 2023-11-07 10:54:59 +01:00
Saumya Jain
6a86a987bc
Merge branch '5.6' into CURA-11166-3mf-file-saving-center-allign 2023-11-06 19:14:48 +05:30
c.lamboo
4230f1f8b7 Merge branch '5.6' into CURA-11262-Update-products-to-id.json 2023-11-06 14:35:36 +01:00
saumya.jain
cdb2a5789d Center alligning in case of 3mf write 
Also reverting commit 7e38927a8cb76d3789fde21482aeff1e254cc636

CURA-11166
 2023-11-06 16:33:32 +05:30
Paul Kuiper
55f8ef9791
Apply suggestions from code review 
Change Makerbot to UltiMaker

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-11-06 11:31:41 +01:00
Remco Burema
35d1ae3272 Fix 'brand alignment' messing up actual print files. 2023-11-03 17:04:26 +01:00
Paul Kuiper
d6d73ed6e6 - Bug fix: ensure the product names in the material files match the Makerbot Method machine definition id 2023-11-03 16:23:49 +01:00
Erwan MATHIEU
39db261b4b Integrate prime tower mode setting 2023-11-03 13:13:27 +01:00
c.lamboo
129243289c Merge branch '5.6' 2023-11-02 17:18:41 +01:00
Remco Burema
d2db9a2555 Defensive programming for isometric snapshot. 2023-11-01 17:14:29 +01:00
saumya.jain
40d91a7f3e material translation, saving to .makerbot on cloud by default when Method printer is selected 
CURA-11138
 2023-11-01 11:03:30 +01:00
Saumya Jain
91d08a2a6d
Merge branch 'main' into CURA-11138-makerbot-cloud-printing 2023-11-01 10:32:10 +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
saumya.jain
ce132e4c3f Function name changed to make it a bit generic 
CURA-11138
 2023-10-31 11:48:44 +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
saumya.jain
39ec9c9279 printertype Parsing function made static 
CURA-11138
 2023-10-30 14:31:17 +01:00