GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,133 Commits 294 Branches 267 Tags
Commit Graph

9845 Commits

Author SHA1 Message Date
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
saumya.jain
c2e2511fdc Makerbot machine firmware version set to min of 2.700 
CURA-11138
 2023-10-30 13:51:56 +01:00
c.lamboo
2660933d6e Add mimetype for .makerbot files 
CURA-10561
 2023-10-30 13:37:50 +01:00
saumya.jain
3bfc0afc93 For makerbot files upload in cloud 
CURA-11138
 2023-10-30 13:32:25 +01:00
saumya.jain
1cc7ce7a66 Message to show user when cloud printer is not available 
-added png for makerbots for exception case

CURA-11138

CURA-11138
 2023-10-27 17:08:05 +02: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
saumya.jain
3dd4ef7dda printer firmware version is major and minor in case of makerbot 
CURA-11138
 2023-10-27 11:41:06 +02:00
saumya.jain
37e236405a fix for functions 
CURA-11138
 2023-10-27 09:30:06 +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
saumya.jain
cf78ae0dca Method printers method, methodx, methodxl read from cloud 
CURA-11138
 2023-10-26 16:17:03 +02:00
Jelle Spijker
b2ced7c0ba
Install pyDulcificum 
Contributes to CURA-10561
 2023-10-26 16:09:38 +02:00
Jelle Spijker
69f474a426
Merge branch 'main' into CURA-10561-makerbot 2023-10-26 15:27:25 +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
Jaime van Kessel
9a410d2c16
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-24 10:55:39 +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
c.lamboo
fa1f5a7c89 Boyscouting 
CURA-11189
 2023-10-20 15:10:39 +02:00
c.lamboo
7d6e96d1d3 Boyscouting 
CURA-11189
 2023-10-20 15:09:16 +02:00
GregValiant
cd6e583f43 Update DisplayInfoOnLCD.py 
Add pause count notification

Update DisplayInfoOnLCD.py

Moved some line insertions to accommodate newer Creality firmware.

Change DisplayFIlename and DIsplayProgress

Add messages to use DIsplay Info and add exit code.

Update DisplayInfoOnLCD.py

Some changes
 2023-10-20 09:07:10 -04:00
Remco Burema
e603631b7e Fix '\d' deprecation warning. 
done as part of Python 3.12 spike (CURA-11078)
 2023-10-20 11:06:56 +02:00
c.lamboo
cdc3f910d3 Add basic makerbot writer 
CURA-10561
 2023-10-19 18:50:52 +02:00
c.lamboo
0e1262126a Fix memory leak issues in minitor page 
Issue was that QT (incorrectly?) asserted that there was a binding loop between width and height in the `NetworkMJPGImage` component. This caused the height to evalualte to `infinity`, making QT create a buffer with an infinite amount of memory. Solved by calculating a serpeate `img_scale_factor` which both the width and height uses.

CURA-11180
 2023-10-19 11:53:41 +02:00
saumya.jain
8ca005f804 Updated upgrade script. removed update of materials other than: 
abs
 pla
 petg and
 tough-pla

CURA-11151
 2023-10-16 14:13:12 +02:00
Jaime van Kessel
5f998f0ab4
Merge branch 'main' of github.com:Ultimaker/Cura 2023-10-16 12:07:38 +02:00