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

5055 Commits

Author SHA1 Message Date
Paul Kuiper
baefd3e4b6 Excluded material from certain machines (e.g. PPS-CF and Nylon) 2024-10-07 13:57:37 +02:00
HellAholic
d464f3930d Applied printer-linter format 2024-10-07 08:09:50 +00:00
HellAholic
449d81684e
Merge branch 'main' into zyyx_profile_addition 2024-10-07 09:53:52 +02:00
HellAholic
bf064e7768
Merge branch 'main' into Add-Sketch-printers 2024-10-04 14:59:26 +02:00
HellAholic
6e8192a1f5
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials 2024-10-04 14:41:41 +02:00
HellAholic
aa22343660
Merge branch 'main' into PP-511-Method-5-9-Rebased 2024-10-04 14:23:08 +02:00
Erwan MATHIEU
fe5c81a59c
Merge branch 'main' into CURA-12081_scarf-seam 2024-10-04 11:57:02 +02:00
Erwan MATHIEU
1d28f7d778 Move scarf seam and acceleration/deceleration to experimental 
CURA-12077
 2024-10-04 11:56:17 +02:00
Theodor Hansson
462b072eb7 Merge remote-tracking branch 'origin/main' into zyyx_profile_addition 
# Conflicts:
#	resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
 2024-10-03 20:48:03 +02:00
Erwan MATHIEU
e25c8f6bca Fix incorrect definitions pointed out by unit test 
CURA-12167
 2024-10-03 14:03:26 +02:00
Erwan MATHIEU
78be499aeb Fix issues pointed out by linter 
CURA-12167
 2024-10-03 13:28:51 +02:00
Erwan MATHIEU
a2e0701492 Add mesh and texture for Sketch Sprint 
CURA-12167
 2024-10-03 13:21:17 +02:00
Paul Kuiper
47551c4200 Sketch printer 2024-10-03 10:42:19 +02:00
Erwan MATHIEU
f1874d1c2e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-10-03 10:20:55 +02:00
alanbjorklund
e86e111f00
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials 2024-10-02 17:19:53 -04:00
Alan Bjorklund
dca7d0cd3c adding sketch / sketch large files after merging other PRs 
PP-511
 2024-10-02 17:18:11 -04:00
Alan Bjorklund
5bd60d595a requested changes for sketch definition file and missing meshes 
PP-511
 2024-10-02 10:53:40 -04:00
Theodor Hansson
e63a95b335 removed ZYYX Agile (and unused ZYYX+ variant file) 2024-10-02 11:30:49 +02:00
Theodor Hansson
78bface21a
Merge branch 'Ultimaker:main' into zyyx_profile_addition 2024-10-02 10:20:45 +02:00
Theodor Hansson
c05dd2ad97 merge from theodorhansson/ZYYX-Cura-Printer-Profiles V3 2024-10-02 10:20:06 +02:00
wawanbreton
c2c3419502 Applied printer-linter format 2024-10-02 06:57:13 +00:00
Erwan MATHIEU
d1b889b96c Re-apply disallowed areas and build area fixes 
CURA-12165
 2024-10-02 08:56:18 +02:00
Alan Bjorklund
b37e13d684 reverted the method definition files to match master 
PP-511
 2024-10-01 12:44:35 -04:00
Alan Bjorklund
85c7fede7e update method extruder start gcode, exclude all generic materials 
PP-511
 2024-10-01 11:49:18 -04:00
wawanbreton
8e4b85ec4c Applied printer-linter format 2024-10-01 11:37:40 +00:00
Erwan MATHIEU
acd477d183 Adjust Method XL build area 
CURA-12165
This is required because methodxl definition inherits methodx, which has a defined plaftofm_offset.
 2024-10-01 13:36:39 +02:00
wawanbreton
8e5a766193 Applied printer-linter format 2024-10-01 08:49:25 +00:00
Erwan MATHIEU
4f0c77e16a Fix disallowed areas definition conflict 
CURA-12165
 2024-10-01 10:48:27 +02:00
alanbjorklund
b0d5b425b2 Applied printer-linter format 2024-10-01 02:45:24 +00:00
alanbjorklund
59278253a1
Update resources/definitions/ultimaker_sketch.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 22:44:03 -04:00
alanbjorklund
550741f5f1
Update resources/definitions/ultimaker_sketch.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 22:43:07 -04:00
Alan Bjorklund
3eb0b63024 adding sketch & sketch large files 
PP-520
 2024-09-30 22:29:05 -04:00
alanbjorklund
14a44c7a0b
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:58:07 -04:00
alanbjorklund
1eb04e79ff
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:57:46 -04:00
alanbjorklund
6f87a313be
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:57:31 -04:00
alanbjorklund
febc1ebb93
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:56:33 -04:00
alanbjorklund
49b52737ee
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:55:32 -04:00
alanbjorklund
bedf2ef277
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:55:24 -04:00
alanbjorklund
a004e69d0e
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:55:08 -04:00
alanbjorklund
69c4a1bd2b
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:54:52 -04:00
alanbjorklund
5fe2fee356
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:54:38 -04:00
alanbjorklund
60a2dddd4e
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:53:47 -04:00
alanbjorklund
efaa1674ef
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:53:38 -04:00
alanbjorklund
5f11e20e90
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:53:00 -04:00
alanbjorklund
4cf419b4ad
Update resources/definitions/ultimaker_method_base.def.json 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-30 21:52:48 -04:00
Alan Bjorklund
aa3a9f36d2 update start gcode for method extruders, convert generic profiles into Labs extruder profiles, mark these as experimental 
PP-511
 2024-09-30 21:20:06 -04:00
Erwan MATHIEU
64b21e17fd
Merge branch 'main' into PP-511-Method-5-9-Rebased 2024-09-30 15:23:53 +02:00
Erwan MATHIEU
ff1657305e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-09-30 13:03:09 +02:00
HellAholic
c5348fa034
Merge pull request #19662 from Ultimaker/PP-324-Limit-buildplate-to-120C 
PP-324 Hard limit iso warning on bed temperatures above 120C
 2024-09-30 09:34:23 +02:00
Alan Bjorklund
523214912b remove redundant values from Tough PLA 175 quality file, standardize skirt values in method base definition file 
PP-511
 2024-09-27 18:01:03 -04:00