GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,955 Commits 290 Branches 260 Tags
Commit Graph

4187 Commits

Author SHA1 Message Date
jellespijker
c72e8ece7d Applied printer-linter format 2023-03-22 10:53:34 +00:00
Jelle Spijker
61ff8b42b6
Merge pull request #14624 from highpowerxh/addSM2Dual 
Add Snapmaker 2.0 Dual Extruder Definitions

Contributes to CURA-10441
 2023-03-22 11:52:21 +01:00
Jelle Spijker
dd70e127e9
simplyfied meshes for LNL3D D6 
Contributes to CURA-10440
 2023-03-22 11:44:34 +01:00
jellespijker
ec919bc758 Applied printer-linter format 2023-03-22 10:07:30 +00:00
Jelle Spijker
73f8227d96
Fix meshes for LNL3D printers 
Contributes to CURA-10440
 2023-03-22 11:06:10 +01:00
Jelle Spijker
62bb5e96c3
Merge pull request #14782 from LNL3D/LNL3D-printer-profiles 
Added LNL3D printer profiles
 2023-03-22 11:05:24 +01:00
jellespijker
9ba3062fe2 Applied printer-linter format 2023-03-22 08:45:07 +00:00
Jelle Spijker
779ce6f970
Merge branch 'main' into addSM2Dual 2023-03-22 07:35:15 +01:00
Jelle Spijker
86a167fcd3
Merge branch 'main' into LNL3D-printer-profiles 2023-03-22 07:34:59 +01:00
Jelle Spijker
0f5cfba1bc
Merge branch 'main' into main 2023-03-22 07:34:48 +01:00
jellespijker
5dd2e69253 Applied printer-linter format 2023-03-21 19:46:39 +00:00
Jelle Spijker
6fb8abcd9f
Fix override default_value 
Contributes to CURA-10435
 2023-03-21 20:45:12 +01:00
Jelle Spijker
942cd18c4b
Fix mesh/texture filename 
Contributes to CURA-10436
 2023-03-21 20:37:52 +01:00
jellespijker
15384a5956 Applied printer-linter format 2023-03-21 19:30:48 +00:00
Hellbot Development Team
2fb3b7df98
Add new Hellbot 3D printers (#14500) 
Contributes to CURA-10436


* Update in Definition file for Hellbot Magna 1 

Change the Author name and version number. 
Added Heated bed.

* Update hellbot_magna_I.def.json

* Update hellbot_magna_I.def.json

* Fixed Version

Fixed incorrect version number

* Update to Hellbot Magna Dual Definition file

Author changed and added heated bed.

* Update hellbot_magna_dual.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Add files via upload

* Add files via upload

* Add files via upload

* Delete hellbot_magna_2_230.def.json

* Delete hellbot_magna_2_300.def.json

* Delete hellbot_magna_2_230_dual.def.json

* Delete hellbot_magna_2_300_dual.def.json

* Delete hellbot_magna_2_230_E1.def.json

* Delete hellbot_magna_2_230_dual_E1.def.json

* Delete hellbot_magna_2_230_dual_E2.def.json

* Delete hellbot_magna_2_300_E1.def.json

* Delete hellbot_magna_2_300_dual_E1.def.json

* Delete hellbot_magna_2_300_dual_E2.def.json

* Delete Magna2_230.png

* Delete Magna2_300.png

* Delete Hellbot_Magna_2_230.obj

* Delete Hellbot_Magna_2_300.obj

* Add new Mesh files for Magna 2 230/300

* Add PNG files for textures for Magna 2 230/300

* Added extruder files for Magna 2 230/300

* Add definition files for Magna 2 230/300

* Rename hellbot_magna_2_230_E1.def.json to hellbot_magna_2_230_extruder_0.def.json

* Rename hellbot_magna_2_230_dual_E1.def.json to hellbot_magna_2_230_dual_extruder_0.def.json

* Rename hellbot_magna_2_230_dual_E2.def.json to hellbot_magna_2_230_dual_extruder_1.def.json

* Rename hellbot_magna_2_300_E1.def.json to hellbot_magna_2_300_extruder_0.def.json

* Rename hellbot_magna_2_300_dual_E1.def.json to hellbot_magna_2_300_dual_extruder_0.def.json

* Rename hellbot_magna_2_300_dual_E2.def.json to hellbot_magna_2_300_dual_extruder_1.def.json

* Delete hellbot_magna_2_230_dual_extruder_0.def.json

* Delete hellbot_magna_2_230_dual_extruder_1.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_1.def.json

* Delete hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Add files via upload

* Create hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Added two PLA hellbot materials.

* added print settings

* added print settings

* Update Hellbot_PLA_Grey.xml.fdm_material

* Rename Hellbot_PLA_Grey.xml.fdm_material to Hellbot_pla_Grey.xml.fdm_material

* Delete Hellbot_PLA_Red.xml.fdm_material

* Delete Hellbot_pla_Grey.xml.fdm_material

* Added new Start and End Gcode

Added specific Gcode for purging the 2 in 1 hotend.

* Added Start and End Gcode

Added machine start Gcode for purging the 2 in 1 hotend at the start and end gcode

* Add bed images for Hellbot Hidra and Hidra Plus

* Add meshes files for Hellbot Hidra and Hidra plus

* Add extruder files for new Hellbot printers 

Add extruder files for new Hellbot Printers: Hellbot Hidra and Hellbot Hidra Plus

* Add New Hellbot printers 

Add definition files for the new Hellbot printers: Hidra and Hidra Plus

* Update Magna 2 230 Dual definition

Change the Start gcode

* Update definition of the Magna 2 300 Dual

Change the start gcode

* Add definitons for new Hellbot Printers

Add definition files for Magna 2 400, Magna 2 400 Dual, Magna 2 500 and Magna 2 500 Dual.

* Add images for new Hellbot printers

Add images for beds of the Magna 2 400 and Magna 2 500

* Add new bed 3D models

Add 3d models for the beds of the Magna 2 400 and Magna 2 500

* Update hellbot_magna_2_400_dual.def.json

* Fix formatting

Fixed the spaces and tabs.

* Update Extruder 0 Magna 2 230

Add Start and End Gcode for Extruder 0

* Update Extruder 1 Magna 2 300

Add start and end Gcode for Extruder 1

* Update Extruder 1 Magna 2 300 dual 

Add start and end gcode for Magna 2 300 dual

* Update extruder 0 Magna 2 300 Dual

Add start and end gcode for Magna 2 300 Dual

* Add extruder files for Magna 2 400 and 500

* Fix formatting

* Fix formatting

* Fix formatting

* fix formatting

* fix format

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Fix format

* fix format

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Add missing } in line 16

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual_extruder_0.def.json

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Add some new start gcodes for purge line and temperature configuration.

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Change the start gcode

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Add new start gcodes

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_extruder_0.def.json

* Update hellbot_hidra_extruder_1.def.json

* Update hellbot_hidra_plus_extruder_0.def.json

* Update hellbot_hidra_plus_extruder_1.def.json

* Update Hellbot_Magna_2_230.obj

* Update Hellbot_Magna_2_300.obj

* Update Hellbot_Magna_2_400.obj

* Update Hellbot_Magna_2_500.obj

* Update hellbot_hidra.obj

* Update hellbot_hidra_plus.obj

* Create hellbot_hidra_plus.obj

* Add definition file for new Hellbot 3D printer

Definition file for new Hellbot 3D printer Magna SE.

* Add extruder definition file 

Add new extruder definition file for the new Hellbot 3D printer Magna SE.

* Add new obj file 

Add .obj mesh file for the new Hellbot 3D printer, Magna SE

* Add image file 

Add image file for new Hellbot 3D printer, Magna SE

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_400.def.json

* Update hellbot_magna_2_400_dual.def.json

* Update hellbot_magna_2_500.def.json

* Update hellbot_magna_2_500_dual.def.json

* Update hellbot_magna_I.def.json

* Update hellbot_magna_dual.def.json

* Update hellbot_magna_2_230_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_1.def.json

* Update hellbot_magna_2_500_dual_extruder_0.def.json

* Update hellbot_magna_2_500_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

Add new start and end Gcodes

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual.def.json

added settings for shared heater and nozzle.

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_400_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_400_dual.def.json

* Update hellbot_magna_2_500_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_500_dual.def.json

* Add definition files for new Hellbot Printers

Add Definition files for Magna SE 300, and Magna SE Pro.

* Add extruder files for new Hellbot 3D printers. 

Add extruder files for Magna SE 300, and Magna SE Pro.

* Add images for new Hellbot 3D printers 

Add image files for Magna SE 300, and Magna SE Pro.

* Add meshes for new Hellbot 3D printers 

Add mesh files for Magna SE 300, and Magna SE Pro.

---------

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2023-03-21 20:29:44 +01:00
Mixware
6ad7906a58
Add printer for Mixware (#14510) 
* Add printer for Mixware

After fork synchronizes main, re-pull request

* Applied printer-linter format

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_s.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_s.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_s.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/mixware_hyper_s.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

* Delete redundant override

* Update resources/definitions/mixware_hyper_s.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

* Update resources/definitions/mixware_hyper_k.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

---------

Co-authored-by: Mixwarebot <Mixwarebot@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2023-03-21 19:46:35 +01:00
c.lamboo
06dbf0f275 Merge branch 'main' into CURA-10201_fill-narrow-skin-with-walls 2023-03-21 13:49:12 +01:00
Casper Lamboo
837171ac5c Apply suggestions from code review 2023-03-20 17:35:42 +01:00
Jelle Spijker
5c0345a475
enable smart brim ordering by default 2023-03-20 15:46:12 +01:00
c.lamboo
1dfdf46d09 Use more predictable settings-name 
CURA-10032
 2023-03-20 13:46:55 +01:00
casperlamboo
01df365d06 Applied printer-linter format 2023-03-17 15:24:30 +00:00
c.lamboo
1023eb8867 Add "smart brim" setting 
CURA-10032
 2023-03-17 16:23:16 +01:00
Vandresc
733a926e05 Update_HoleHorizontalExpansion_CURA-8890 
Small typo in setting description
 2023-03-16 18:05:23 +01:00
c.lamboo
61aff1756e Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 
# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
 2023-03-15 12:50:29 +01:00
c.lamboo
cb8f66b5fd Update copy 
CURA-8890
 2023-03-15 11:48:37 +01:00
Jelle Spijker
905a40dc39
Set height to 1 if skirt gap is 0 
Contributes to CURA-9826
 2023-03-15 11:15:31 +01:00
Jelle Spijker
f22d25e6e6
Merge branch 'main' into CURA-9826_add-skirt-height 2023-03-14 18:17:53 +01:00
hyu7000
6866249429
Update cremaker_common.def.json 2023-03-14 09:19:44 +09:00
Jelle Spijker
1eda386448
Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 2023-03-13 11:54:21 +01:00
Jelle Spijker
58b88a2ab4
Merge remote-tracking branch 'origin/main' into CURA-10127-dont-allow-minimum-speed-to-be-zero 2023-03-13 11:26:25 +01:00
Remco Burema
5ed7a5da98 Merge branch '5.3' 2023-03-09 11:54:11 +01:00
Remco Burema
04c6f6bbcf Small layer temp: Have (more) sensible warning/limit values. 
CURA-10377
 2023-03-09 11:34:58 +01:00
Rijk van Manen
de7714ef7f Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 2023-03-08 10:40:56 +01:00
Rijk van Manen
011febc0f8 Merge branch 'main' into CURA-10127-dont-allow-minimum-speed-to-be-zero 2023-03-08 10:35:00 +01:00
jspijker
52a58374a8 Merge branch '5.3' 
# Conflicts:
#	conanfile.py
 2023-03-07 13:48:39 +01:00
jellespijker
5c5deac169 Applied printer-linter format 2023-03-07 10:13:36 +00:00
jspijker
325614907b Partially revert Geeetech PR 
The following printers are back to their old behaviour:

- Geeetech A10
- Geeetech A10M
- Geeetech A10T
- Geeetech A20
- Geeetech A20M
- Geeetech A20T
- Geeetech A30

added:
- Geeetech Mizar S (legacy)

Contribute to CURA-10370
 2023-03-07 11:12:08 +01:00
c.lamboo
62812393b0 Fix typos in translations 
CURA-10369
 2023-03-07 10:29:37 +01:00
nallath
702c317c4c Applied printer-linter format 2023-03-07 08:27:28 +00:00
Christian Kvasny
cc8c6611e7
Fix VzBot Base definition file 
The correct value should be -03 not 0.3 Should actually still in the 5.3. Maybe it works out.
 2023-03-07 00:09:57 +01:00
Rijk van Manen
ebbf4d3ca2 add new skirt_height setting 
CURA-9826
 2023-03-06 16:50:13 +01:00
mario
13ce4ae4f5 Update base definition file 2023-03-05 18:40:22 -08:00
mario
0b3c037a19 Updated meshes 2023-03-05 18:11:00 -08:00
mario
d1c692c9dd Added newline at the end of files 2023-03-05 17:50:15 -08:00
mario
7602f20d25 Requested changes 2023-03-05 17:12:12 -08:00
mario
bb56d01c21 Added LNL3D printer profiles 2023-03-05 16:41:25 -08:00
Hao Xu
62ada23836
Update snapmaker2_A250_dual.def.json 2023-02-24 15:36:30 -08:00
Rijk van Manen
132e7b7a6e the new setting is not a child setting 
CURA-8890
 2023-02-23 16:29:45 +01:00
Rijk van Manen
26a8d4790e Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 2023-02-23 16:22:03 +01:00
jspijker
28ab2a98c6 Merge branch '5.3' 2023-02-23 15:26:19 +01:00