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
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
5.5.0
2023-10-25 11:50:37 +02:00
Erwan MATHIEU
89267dd33f
Fix overridden default values
...
CURA-10783
2023-10-25 11:22:57 +02:00
Jelle Spijker
68e3c79d71
Merge branch '5.5'
...
# Conflicts:
# conanfile.py
2023-10-25 10:33:33 +02:00
Jelle Spijker
98a79e8c00
Merge pull request #17092 from Ultimaker/CURA-11168_Changelog_Update_For_5.5
...
Update changelog for 5.5 Stable
2023-10-25 10:30:47 +02:00
Jelle Spijker
c7a950d0d0
Set version to 5.5.0
...
Contributes to CURA-11218
2023-10-25 10:28:43 +02:00
Erwan MATHIEU
55314a643f
Prime tower position refinement
...
CURA-10783
2023-10-25 09:15:29 +02:00
Jelle Spijker
60da066877
Merge pull request #17097 from Ultimaker/5.5
...
5.5
2023-10-25 01:35:45 +02:00
Jelle Spijker
b4117bc601
no need to package glibc-source
2023-10-25 01:34:04 +02:00
Erwan MATHIEU
267a7283ed
Merge remote-tracking branch 'origin/CURA-10783_prime_tower_with_raft' into CURA-10783_prime_tower_with_raft
2023-10-24 16:23:35 +02:00
Erwan MATHIEU
d27a991c7b
Base curve magnitude is now a float
...
CURA-10783
2023-10-24 16:23:28 +02:00