GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-06 08:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,106 Commits 295 Branches 268 Tags
Commit Graph

33106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saumya Jain
5a8b7e5740
Merge pull request #16962 from Ultimaker/CURA-11155-formulas-in-start-end-code 
Formulas in start/end code
 2023-10-16 11:25:34 +02:00
Saumya Jain
15b75b7327
Merge branch 'main' into CURA-11155-formulas-in-start-end-code 2023-10-16 10:58:58 +02:00
Jaime van Kessel
67c11bf7f8
Fix certain 3mf models not restoring properly 
CURA-11164
 2023-10-16 10:56:07 +02:00
Erwan MATHIEU
7ad35fae44
Merge pull request #16758 from Pelochus/main 
Fix spanish translation for lightning infill
 2023-10-16 10:19:54 +02:00
Erwan MATHIEU
cfea094161
Restore missing translation 
Lost during conflicts solve
 2023-10-16 10:15:34 +02:00
Erwan MATHIEU
9d40c840cf
Merge branch 'main' into main 2023-10-16 10:09:19 +02:00
c.lamboo
e98240fb2c Cleanup code in GcodeStartEndFormatter 
CURA-11155
 2023-10-13 07:36:45 +02:00
Jelle Spijker
c223b39752
Fixed macos runner id 
https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
 2023-10-13 00:51:50 +02:00
c.lamboo
14afd73c19 Make sure default variables are available in start/end code 
The following properties are not settings-names, but could previously be used as template variables
- material_id
- time
- date
- day
- initial_extruder_nr
- material_id
- material_name
- material_type
- material_brand
- time
- date
- day
- initial_extruder_nr
These properties are _awkwardly_ propogated through the kwargs of the `get_value` method of `GcodeStartEndFormatter`. I don't quite like implementing it like this, but to avoid API breaks I couldn't change abusing the kwargs arg for this purpose.

CURA-11155
 2023-10-12 21:09:10 +02:00
c.lamboo
c3f3a86385 Extend start/end gcode templates feature with support for formula's 
CURA-11155
 2023-10-12 16:53:39 +02:00
c.lamboo
4378e8a827 use macos 12 when building all installers 
This should fix the nightly builds
 2023-10-11 16:50:10 +02:00
Jaime van Kessel
9f1be535eb
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-11 15:36:16 +02:00
Jaime van Kessel
6f82397476
Merge pull request #16943 from Ultimaker/CURA-11146_badonka_donk_donk 
CURA-11146 limit the bloat in the new AppImage
 2023-10-11 15:35:48 +02:00
Jelle Spijker
d8ef4c381c
Less bloat 
Could also be a solution for:
- #16932
- #16935

Fixes CURA-11146
Fixes #16931
 2023-10-11 14:21:24 +02:00
saumyaj3
e627a4174f Applied printer-linter format 2023-10-11 12:18:41 +00:00
Saumya Jain
7d9d6cbf6a
Merge pull request #16796 from dim1triy/add-creality-ender-3-V3-SE 
Add Creality Ender 3 V3 SE definition and nozzles
 2023-10-11 14:17:27 +02:00
Saumya Jain
e7fc100f62
Merge branch 'main' into add-creality-ender-3-V3-SE 2023-10-11 14:00:33 +02:00
Casper Lamboo
b81e1b8741
Merge pull request #16829 from Ultimaker/CURA-10994_translations_v5p5 
[CURA-10994] Translations for 5.5.x
 2023-10-11 10:33:50 +02:00
Jelle Spijker
73900d33a2
Merge branch '5.5' 
# Conflicts:
#	conanfile.py
 2023-10-10 12:24:18 +02:00
Jelle Spijker
57b581d19b
Revert "Revert "loosen versions to latest stable"" 
This reverts commit e2578554e6fb6f4f8d02f6396f003e93d6993cfb.
 2023-10-10 12:23:18 +02:00
c.lamboo
e9cc6532d7 re-add ColorDialog class 
to avoid api breaks
5.5.0-beta.1 		2023-10-10 12:00:55 +02:00
c.lamboo
4eb0ba9861 re-add functions for arrange 
To avoid api break
new functions are added with the depricated decorator
 2023-10-10 11:39:06 +02:00
Jelle Spijker
e2578554e6
Revert "loosen versions to latest stable" 
This reverts commit 8d34bcdeb55df5098dbc58913de235b372b64c90.
 2023-10-10 11:18:40 +02:00
Remco Burema
c20b227e5f Prevent 'major' API/SDK version break. 2023-10-10 11:15:57 +02:00
Jelle Spijker
8d34bcdeb5
loosen versions to latest stable 2023-10-10 11:03:02 +02:00
Jelle Spijker
0f770aca15
set version to 5.6.0-alpha 2023-10-10 11:00:49 +02:00
Jelle Spijker
72bba90e73
Pin versions 2023-10-10 10:53:38 +02:00
c.lamboo
d48a50be81 Merge branch '5.5' 2023-10-10 10:39:11 +02:00
Jelle Spijker
7dbfebdfe2
Merge pull request #16919 from Ultimaker/CURA-11063_Changleog_Cura5.5 
Updates for the Cura 5.5 Beta
 2023-10-10 10:34:17 +02:00
Jelle Spijker
c006913a04
Apply suggestions from code review 2023-10-10 10:33:54 +02:00
Remco Burema
a4259c9f0f Upgrade SDK to 8.5.0 (corresponds to Cura 5.5.x). 2023-10-10 10:23:37 +02:00
Jelle Spijker
b29b5138f0
fix typo 
Co-authored-by: fieldOfView <aldo@fieldofview.com>
 2023-10-10 07:27:39 +02:00
Casper Lamboo
b1ffbfdcb2
Merge pull request #16920 from Ultimaker/CURA-11130-profile-updates 
Profile improvements
 2023-10-09 17:55:36 +02:00
Paul Kuiper
62a653ff64 - Added extra quick intent profiles for 0.3 and 0.4mm mode 
- Visual intent outerwall speed has been reduced
- Retract settings of AA0.8 have been tuned
 2023-10-09 17:07:45 +02:00
Paul Kuiper
d6897e59c5 - Added extra quick intent profiles for 0.3 and 0.4mm mode 2023-10-09 17:07:41 +02:00
c.lamboo
c2f0a3cbdd Revert "- Added extra quick intent profiles for 0.3 and 0.4mm mode" 
This reverts commit dc7cd8f8c5c228e98a55c02d05ef49c2e00b4f82.
 2023-10-09 17:07:07 +02:00
c.lamboo
3ad13f437f Revert "- Added extra quick intent profiles for 0.3 and 0.4mm mode" 
This reverts commit 0aec51f7de867e72e595e6d66dde3fd8a3358cd4.
 2023-10-09 17:07:04 +02:00
Paul Kuiper
0aec51f7de - Added extra quick intent profiles for 0.3 and 0.4mm mode 
- Visual intent outerwall speed has been reduced
- Retract settings of AA0.8 have been tuned
 2023-10-09 17:02:33 +02:00
Paul Kuiper
dc7cd8f8c5 - Added extra quick intent profiles for 0.3 and 0.4mm mode 2023-10-09 17:01:35 +02:00
MariMakes
16386b722a Update for 5.5 
These changes were missing.
 2023-10-09 14:31:37 +02:00
c.lamboo
61d67f108d Merge branch '5.5' into CURA-10994_translations_v5p5 2023-10-09 11:31:52 +02:00
Jelle Spijker
dcd01db7c4
Merge branch '5.5' 2023-10-09 11:14:56 +02:00
Dim1triy
5a7f5b03f0
Merge branch 'main' into add-creality-ender-3-V3-SE 2023-10-07 20:23:17 +03:00
MariMakes
d33f6fcf6e Update Changelog for Cura 5.5 
First version
 2023-10-06 17:10:26 +02:00
Casper Lamboo
5c171743fe
Merge pull request #16899 from Ultimaker/CURA-11131_rename_default_intent_to_balanced 
Rename "Default" intent to "Balanced"
 2023-10-06 13:01:44 +02:00
Remco Burema
213f0c8cdd
Merge pull request #16892 from Ultimaker/CURA-11110-top-surface-inner-outer-wall-config 
Top surface inner outer wall config
 2023-10-06 12:43:48 +02:00
c.lamboo
98f0f9819d Remove superfluous comma from balanced description 
CURA-11131
 2023-10-06 12:19:44 +02:00
c.lamboo
ec1cd6b192 Add description to balanced intent 
CURA-11131
 2023-10-06 12:16:22 +02:00
Saumya Jain
5c87cc7d26
Merge pull request #16898 from Ultimaker/PPM-profile-updates-petg-abs 
Restored PETG and ABS profiles.
 2023-10-06 11:32:01 +02:00
Jaime van Kessel
82c4a10c1d
Rename "Default" intent to "Balanced" 
CURA-11131
 2023-10-06 11:03:49 +02:00