3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
35365 commits 306 branches 272 tags 787 MiB
Commit graph

35365 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b3bbb887ff
Merge branch 'main' into CURA-11138-makerbot-cloud-printing 2023-10-30 13:35:28 +01:00
saumya.jain
3bfc0afc93 For makerbot files upload in cloud 
CURA-11138
 2023-10-30 13:32:25 +01:00
Jelle Spijker
e04d37ecc1
Merge remote-tracking branch 'origin/main' into CURA-10561-makerbot 2023-10-30 13:06:04 +01:00
Casper Lamboo
80b4351372
Merge pull request #17124 from Ultimaker/CURA-11233_prime_tower_raft_base_line_spacing 
Add setting for specific prime tower raft line spacing
 2023-10-30 11:29:27 +01:00
c.lamboo
a3eed42a38 Add prime_tower_raft_base_line_spacing to setting visibility 
Also fix setting name `prime_tower_base_curve_magnitude`

CURA-10561
 2023-10-30 11:17:32 +01:00
Saumya Jain
a247e81bb3
Merge branch 'main' into CURA-11138-makerbot-cloud-printing 2023-10-30 10:59:21 +01:00
Jelle Spijker
16249e490e Allow sideloading of resources via env 
`CURA_DATA_ROOT` and `URANIUM_DATA_ROOT`
This allows the conanfile.py to point to `venv/share/cura`

This functionality is disabled in sys.frozen

Contributes to CURA-10561
 2023-10-29 14:25:06 +01:00
Jelle Spijker
94eb9e1a21 Build dulcificum static on Windows 
Contributes to CURA-10561
 2023-10-29 11:52:27 +01:00
Jelle Spijker
872ce27d8a Give translations their own option 
Only available on bash/zsh environments

Contributes to CURA-10561 - CURA-11117
 2023-10-29 11:51:56 +01:00
Jelle Spijker
4b7cefa891
No need to build unit tests for installer 
Contributes to CURA-10561
 2023-10-28 18:14:42 +02:00
Jelle Spijker
91be79fbf3
Fix incorrect deps workflow summary 
Contributes to CURA-10561
 2023-10-28 18:05:09 +02:00
Jelle Spijker
bb6f8fa554
Fix incorrect embedded quotes 
Contributes to CURA-10561
 2023-10-28 14:37:54 +02:00
Jelle Spijker
64f5f54919
Fix missing pyinstaller spec generation 
Contributes to CURA-10561
 2023-10-28 12:59:18 +02:00
Jelle Spijker
aaa8d0cf03
Merge branch 'main' into CURA-10561-makerbot 
# Conflicts:
#	conanfile.py
 2023-10-28 08:24:27 +02:00
Jelle Spijker
d8b35aa09f
remove private packages before uploading 
Contributes to CURA-10561
 2023-10-28 08:21:19 +02:00
Jelle Spijker
edb38aa5f3
Use internal user cura_private_data 
Easier to filter upon

Contributes to CURA-10561
 2023-10-28 08:13:55 +02:00
GregValiant
5bbdf5efc6 Merge remote-tracking branch 'upstream/main' into DisplayInfoOnLCD 2023-10-27 12:19:48 -04: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
Erwan MATHIEU
8897a5c0d6
Merge pull request #17022 from Ultimaker/CURA-11041_fracional_support_gap 
[CURA-10407] Fix description now that we have fractional layer-heights (for top).
 2023-10-27 15:55:55 +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
Erwan MATHIEU
b695f4eb35 Add setting for specific prime tower raft line spacing 
CURA-11233
 2023-10-27 12:24:53 +02:00
Saumya Jain
97549401eb
Merge branch 'main' into definitions/neptune4pro 2023-10-27 12:02:11 +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
Jelle Spijker
cdb581a80b
Use CURA-10561 private data branch 
Contributes to CURA-10561
 2023-10-26 17:31:20 +02:00
c.lamboo
0ce4a6bd67 Add material map 
CURA-10561
 2023-10-26 17:02:29 +02:00
Jelle Spijker
494543a7d7
Use CURA-10561 Uranium 
Contributes to CURA-10561
 2023-10-26 16:23:04 +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
Erwan MATHIEU
33160e90a6
Merge branch 'main' into CURA-11041_fracional_support_gap 2023-10-26 15:58:03 +02:00
Erwan MATHIEU
51ace51218 Fractional layer-heights description refinement 
CURA-10407
 2023-10-26 15:57:05 +02:00
Jelle Spijker
69f474a426
Merge branch 'main' into CURA-10561-makerbot 2023-10-26 15:27:25 +02:00
Casper Lamboo
15e7bb1f07
Pin gradual flow 2023-10-26 14:11:44 +02:00
c.lamboo
f795909f4a Merge branch 'main' into CURA-11041_fracional_support_gap 2023-10-26 10:14:18 +02:00
dependabot[bot]
9ae3c6d4a2
Bump twisted from 21.2.0 to 23.8.0 
Bumps [twisted](https://github.com/twisted/twisted) from 21.2.0 to 23.8.0.
- [Release notes](https://github.com/twisted/twisted/releases)
- [Changelog](https://github.com/twisted/twisted/blob/trunk/NEWS.rst)
- [Commits](https://github.com/twisted/twisted/compare/twisted-21.2.0...twisted-23.8.0)

---
updated-dependencies:
- dependency-name: twisted
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-25 21:45:55 +00:00
Jelle Spijker
6d0332e895
use the latest 0.1.x stable gradual flow plugin 2023-10-25 22:41:28 +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
Remco Burema
a7b6097f49
Merge pull request #16975 from Ultimaker/CURA-10783_prime_tower_with_raft 
[CURA-10783] prime tower with raft
 2023-10-25 15:36:58 +02:00
Remco Burema
ab843c52ae Add prime-tower-base settings to visibility category. 
done as part of CURA-10783
 2023-10-25 14:08:09 +02:00
Jelle Spijker
9b2a3add41
Merge branch '5.5' 
# Conflicts:
#	conanfile.py
 2023-10-25 11:52:09 +02:00
Jelle Spijker
bd4cc7057d
pin fdm_materials to 5.5.0 
Contributes to CURA-11218
 2023-10-25 11:50:37 +02:00