3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26356 commits 302 branches 270 tags 779 MiB
Commit graph

3154 commits

Author SHA1 Message Date
Ghostkeeper
f749bbef46
Squashed commit of the following: 
commit a82c29998f18ca940089347912b01c88a766925c
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Fri Oct 1 16:43:41 2021 +0200

    Fix remaining merge conflict and tabs vs. spaces

    Contributes to issue CURA-8604.

commit d0d8eb19e0977dead9e826949161d123f53e7c75
Merge: 6dc65a491 88beb8ab6
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Fri Oct 1 16:37:09 2021 +0200

    Merge branch 'master' of https://github.com/DevelopmentHellbot/Source-files-Cura into DevelopmentHellbot-master

    Conflicts:
    	resources/definitions/hellbot_hidra.def.json
    	resources/definitions/hellbot_hidra_plus.def.json
    	resources/definitions/hellbot_magna_2_230_dual.def.json
    	resources/definitions/hellbot_magna_2_300_dual.def.json
    	resources/extruders/hellbot_hidra_extruder_0.def.json
    	resources/extruders/hellbot_hidra_extruder_1.def.json
    	resources/extruders/hellbot_hidra_plus_extruder_0.def.json
    	resources/extruders/hellbot_hidra_plus_extruder_1.def.json
    	resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json
    	resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json
    	resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json
    	resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json
    	resources/meshes/Hellbot_Magna_2_230.obj
    	resources/meshes/Hellbot_Magna_2_300.obj
    	resources/meshes/hellbot_hidra.obj
    	resources/meshes/hellbot_hidra_plus.obj

    All of these conflicting files were modified on in the PR, but it seems to have been started from a separate history somehow.

commit 88beb8ab68
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:56 2021 -0300

    Create hellbot_hidra_plus.obj

commit 48b2de0983
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:47 2021 -0300

    Update hellbot_hidra_plus.obj

commit d94d3e42fc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:13 2021 -0300

    Update hellbot_hidra.obj

commit c3e7427718
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:35:19 2021 -0300

    Update Hellbot_Magna_2_500.obj

commit 7830e553c0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:34:55 2021 -0300

    Update Hellbot_Magna_2_400.obj

commit e3ec97eefa
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:34:25 2021 -0300

    Update Hellbot_Magna_2_300.obj

commit b906f5bd36
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:33:25 2021 -0300

    Update Hellbot_Magna_2_230.obj

commit e5161a29b1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:38 2021 -0300

    Update hellbot_hidra_plus_extruder_1.def.json

commit 4d1da31703
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:25 2021 -0300

    Update hellbot_hidra_plus_extruder_0.def.json

commit 940df437b6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:45:12 2021 -0300

    Update hellbot_hidra_extruder_1.def.json

commit 7009e6f43d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:44:59 2021 -0300

    Update hellbot_hidra_extruder_0.def.json

commit 98f7f38dc2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:44:20 2021 -0300

    Update hellbot_hidra_plus.def.json

commit 941080f059
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:43:25 2021 -0300

    Update hellbot_hidra_plus.def.json

commit 13f908a9a1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 14:41:49 2021 -0300

    Update hellbot_hidra.def.json

commit e0e7af51bc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 17 15:19:25 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 47fb61b896
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 17 14:25:41 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

    Add new start gcodes

commit 8c3add290e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 16:43:53 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 11cc224d19
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:35:36 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

    Change the start gcode

commit b918db88eb
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:24:13 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit d8f73a7247
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 13 11:19:59 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

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

commit 0ba60ac18b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:06:45 2021 -0300

    Update hellbot_magna_2_300_dual.def.json

commit b84621061e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:05:49 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_1.def.json

commit 3ce4bd1b86
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 13:05:25 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_0.def.json

commit 2b09de8042
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 12:00:12 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit 2d41b9c175
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:59:13 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit c8ff19e804
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:57:57 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_1.def.json

commit efd7b380ea
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:56:42 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 97b8880501
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:55:54 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 7005882e6f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:32:31 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit b853930158
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:31:11 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 10f3cbd90d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 12 11:27:19 2021 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 251025f861
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Aug 10 12:03:10 2021 -0300

    Add missing } in line 16

commit 7adafbe64f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:25:25 2021 -0300

    Update hellbot_magna_2_300_dual_extruder_1.def.json

commit fc636ee688
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:25:13 2021 -0300

    fix format

commit c817a65416
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:24:43 2021 -0300

    Fix format

commit 9569ba33de
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:24:22 2021 -0300

    Update hellbot_magna_2_230_dual_extruder_0.def.json

commit 6badeaa11a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:22:15 2021 -0300

    fix format

commit 93c482179b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:59:24 2021 -0300

    fix formatting

commit 874efbeecd
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:56:39 2021 -0300

    Fix formatting

commit 654c90bf47
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:55:54 2021 -0300

    Fix formatting

commit d81cf2e44f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:54:18 2021 -0300

    Fix formatting

commit 641c9a3088
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:52:59 2021 -0300

    Add extruder files for Magna 2 400 and 500

commit 6c2eda8bb1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:51:30 2021 -0300

    Update extruder 0 Magna 2 300 Dual

    Add start and end gcode for Magna 2 300 Dual

commit 40d01af1ff
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:49:29 2021 -0300

    Update Extruder 1 Magna 2 300 dual

    Add start and end gcode for Magna 2 300 dual

commit c07b2344d0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:32:14 2021 -0300

    Update Extruder 1 Magna 2 300

    Add start and end Gcode for Extruder 1

commit 215373c8da
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 15:31:06 2021 -0300

    Update Extruder 0 Magna 2 230

    Add Start and End Gcode for Extruder 0

commit eb94b340ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 6 12:29:44 2021 -0300

    Fix formatting

    Fixed the spaces and tabs.

commit 3ae83992a2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Aug 6 12:21:59 2021 -0300

    Update hellbot_magna_2_400_dual.def.json

commit 521ba3feec
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 17:14:49 2021 -0300

    Add new bed 3D models

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

commit 7924b268a3
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:18:24 2021 -0300

    Add images for new Hellbot printers

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

commit 7b457e916a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:17:06 2021 -0300

    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.

commit 52ffd4acb0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:14:45 2021 -0300

    Update definition of the Magna 2 300 Dual

    Change the start gcode

commit 550f6fae0b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Thu Aug 5 15:09:39 2021 -0300

    Update Magna 2 230 Dual definition

    Change the Start gcode

commit 10f8f52c2f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:42:28 2021 -0300

    Add New Hellbot printers

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

commit d90b6556e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:39:10 2021 -0300

    Add extruder files for new Hellbot printers

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

commit 7168ced3ef
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:36:50 2021 -0300

    Add meshes files for Hellbot Hidra and Hidra plus

commit 8d982afede
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 25 10:35:46 2021 -0300

    Add bed images for Hellbot Hidra and Hidra Plus

commit f9c20085cc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:30:55 2021 -0300

    Added Start and End Gcode

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

commit 5e36e40573
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:25:22 2021 -0300

    Added new Start and End Gcode

    Added specific Gcode for purging the 2 in 1 hotend.

commit ff7288831e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:16:11 2021 -0300

    Delete Hellbot_pla_Grey.xml.fdm_material

commit 5cb5e5c655
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:16:00 2021 -0300

    Delete Hellbot_PLA_Red.xml.fdm_material

commit d005b7d77d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:06:50 2021 -0300

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

commit 2ba75d9a88
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 16:01:33 2021 -0300

    Update Hellbot_PLA_Grey.xml.fdm_material

commit 6cb074fa1b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:51:53 2021 -0300

    added print settings

commit 4a51c257c4
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:51:33 2021 -0300

    added print settings

commit c8967242e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:38:17 2021 -0300

    Added two PLA hellbot materials.

commit 4a4622f95c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:33:07 2020 -0300

    Update hellbot_magna_2_300.def.json

commit fa47e14765
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:32:45 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit e34aedda09
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:32:24 2020 -0300

    Update hellbot_magna_2_230.def.json

commit a40858e92c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:31:48 2020 -0300

    Update hellbot_magna_2_300_dual.def.json

commit 08230ef409
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:55 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 4655bffec8
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:42 2020 -0300

    Update hellbot_magna_2_300.def.json

commit fa76c7c738
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:30:18 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 4a50f4d4ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Nov 17 11:29:29 2020 -0300

    Update hellbot_magna_2_230.def.json

commit e093729b45
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:40:43 2020 -0300

    Add files via upload

commit c16b5fd034
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:31:07 2020 -0300

    Create hellbot_magna_2_300_extruder_0.def.json

commit b60df9bfb0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:24:42 2020 -0300

    Add files via upload

commit 7a807a11bb
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:19:03 2020 -0300

    Delete hellbot_magna_2_230_extruder_0.def.json

commit 1fa060366a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:11:16 2020 -0300

    Update hellbot_magna_2_230_extruder_0.def.json

commit 4367946eaa
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:01:47 2020 -0300

    Add files via upload

commit 0de2121e46
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:01:15 2020 -0300

    Delete hellbot_magna_2_300_extruder_0.def.json

commit da5e2d5bbc
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:00:55 2020 -0300

    Delete hellbot_magna_2_300_dual_extruder_1.def.json

commit 8a97089c7c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:00:30 2020 -0300

    Delete hellbot_magna_2_300_dual_extruder_0.def.json

commit 222bfdb6f9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:52 2020 -0300

    Delete hellbot_magna_2_230_extruder_0.def.json

commit 93530f5ee9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:31 2020 -0300

    Delete hellbot_magna_2_230_dual_extruder_1.def.json

commit 7e62e8b564
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 14:59:11 2020 -0300

    Delete hellbot_magna_2_230_dual_extruder_0.def.json

commit 4f851668c0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:28:51 2020 -0300

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

commit 7c78b92cd9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:28:17 2020 -0300

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

commit da01f79d53
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:27:44 2020 -0300

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

commit f4147a02fd
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:22:42 2020 -0300

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

commit 7e6e5213ae
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:22:04 2020 -0300

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

commit 3fda1c9d7f
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Fri Nov 6 16:21:22 2020 -0300

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

commit 4b3732598b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:32:32 2020 -0300

    Add definition files for Magna 2 230/300

commit ff52d4f7a2
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:21:19 2020 -0300

    Added extruder files for Magna 2 230/300

commit ec5aee395a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:16:52 2020 -0300

    Add PNG files for textures for Magna 2 230/300

commit 76e496e201
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 10:12:17 2020 -0300

    Add new Mesh files for Magna 2 230/300

commit 8ec2c2da5c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:33:56 2020 -0300

    Delete Hellbot_Magna_2_300.obj

commit af5524927b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:33:37 2020 -0300

    Delete Hellbot_Magna_2_230.obj

commit 1e8b0f44a4
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:44 2020 -0300

    Delete Magna2_300.png

commit dd5f070c9b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:35 2020 -0300

    Delete Magna2_230.png

commit bcc0fcbec0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:19:10 2020 -0300

    Delete hellbot_magna_2_300_dual_E2.def.json

commit 0fde6d23c8
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:53 2020 -0300

    Delete hellbot_magna_2_300_dual_E1.def.json

commit 75c6177933
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:38 2020 -0300

    Delete hellbot_magna_2_300_E1.def.json

commit 5135178a47
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:18:25 2020 -0300

    Delete hellbot_magna_2_230_dual_E2.def.json

commit 43c9a204ab
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:59 2020 -0300

    Delete hellbot_magna_2_230_dual_E1.def.json

commit 0c7018c822
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:45 2020 -0300

    Delete hellbot_magna_2_230_E1.def.json

commit 4c4f88e52d
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:17:25 2020 -0300

    Delete hellbot_magna_2_300_dual.def.json

commit cf72e6f5bf
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:16:52 2020 -0300

    Delete hellbot_magna_2_230_dual.def.json

commit 7eed5479b9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:16:37 2020 -0300

    Delete hellbot_magna_2_300.def.json

commit 4eafb4d929
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:13:30 2020 -0300

    Delete hellbot_magna_2_230.def.json

commit 60f70cfb59
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 10:00:21 2020 -0300

    Add files via upload

commit 2c894ec680
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:54:48 2020 -0300

    Add files via upload

commit fc108118ec
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:43:13 2020 -0300

    Add files via upload

commit b25ccf9444
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:38:58 2020 -0300

    Update hellbot_magna_2_300_dual.def.json

commit d00d140721
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:37:16 2020 -0300

    Update hellbot_magna_2_300.def.json

commit 4c82819d5e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:36:24 2020 -0300

    Update hellbot_magna_2_230_dual.def.json

commit 59635c0d96
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:29:09 2020 -0300

    Update hellbot_magna_2_230.def.json

commit f80e23c14e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:28:03 2020 -0300

    Add files via upload

commit 7c0d67619c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Oct 19 17:38:59 2020 -0300

    Update hellbot_magna_dual.def.json

commit c2e1c1daef
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 14:13:01 2020 -0300

    Update to Hellbot Magna Dual Definition file

    Author changed and added heated bed.

commit 65519c5a03
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:29:46 2020 -0300

    Fixed Version

    Fixed incorrect version number

commit 4be3fecd44
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:18:35 2020 -0300

    Update hellbot_magna_I.def.json

commit e7e83cef30
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:17:46 2020 -0300

    Update hellbot_magna_I.def.json

commit fb37cc861c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 12:50:39 2020 -0300

    Update in Definition file for Hellbot Magna 1

    Change the Author name and version number.
    Added Heated bed.
 2021-10-01 16:55:26 +02:00
Jelle Spijker
d296531ffa
Merge pull request #10536 from Ultimaker/CURA-7976_Combing_strategy_to_avoid_top_and_bottom_most_suface_skins 
CURA-7976: Combing strategy to avoid top and bottom most surface skins
 2021-09-29 15:02:37 +02:00
Konstantinos Karmas
a9b792d693 Remove the value of retraction combing in S3 and S5 
So that they can inherit the formula of calculating the retraction combing from the fdmprinter. This way, the combing will be changed according to whether the monotonic top/bottom order and ironing are used.

CURA-7976
 2021-09-29 13:37:21 +02:00
Konstantinos Karmas
22e281f368 Fix using the wrong combing enum value in maker_made_300x 
The correct enum value should be 'infill'. 'Within infill' is the display name of that enum value.

CURA-7976
 2021-09-29 13:36:29 +02:00
Konstantinos Karmas
61d18f22b2 Fix combing value not being recognized 
The value of an enum needs to be in single quotes when it is in the "value" field or else it won't be recognized.

CURA-7976
 2021-09-29 13:35:21 +02:00
Jaime van Kessel
eeb56d80e5 Merge branch 'end_gcode_ender5plus' of git://github.com/mothnox/Cura 2021-09-29 13:22:17 +02:00
Konstantinos Karmas
54aaa91bfc Change "default_value" to "value" in malayan_m200.def.json 
CURA-7976
 2021-09-28 15:42:22 +02:00
Konstantinos Karmas
e1b56f9188 Remove "default_value" since the "value" overrides it 
CURA-7976
 2021-09-28 15:38:39 +02:00
Konstantinos Karmas
f1174cb7f6 Enable the "Not on outer surfaces" combing mode if monotonic or ironing 
The "Combing": "Not in outer surfaces" option will be activated for all extruders in the following cases:

1. Monotonic Top/Bottom Order is enabled (in any extruder)
2. Ironing is enabled (in any extruder)
3. Top Surface Skin Layers > 0 and Monotonic Top Surface Order is enabled (in any extruder)

CURA-7976
 2021-09-28 15:15:37 +02:00
Konstantinos Karmas
96f989c33b Add "No outer surfaces" combing option 
CURA-7976
 2021-09-28 14:06:25 +02:00
mothnox
23a93d674b Change Ender 5 Plus end gcode to prevent BLTouch from colliding with frame on printer restart 2021-09-27 14:42:12 -05:00
Jaime van Kessel
20b76c12a7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8510_version_upgrade 2021-09-27 10:20:50 +02:00
Hellbot Development Team
f2ed6d9054
Update Definitions and Extruders of Magna 2 230/300 dual 
Add start and end gcode for correct change of extruders

CURA-8597 
#10298
 2021-09-24 16:08:39 +02:00
Eryone
c6c325facb
Update the thinker printer profile (#10431) 
* Adding Eryone Thinker profile to Cura

- adding printer definition
- adding extruder definition
- adding image plate
- adding platform object
- adding quality profiles

* Minor update eryone_thinker.def.json

Fix initial fan speed

* Improve model textures and draw order

Fixed draw order of model by seperating the mesh into parts and ordering them before export.  Add more colors to the texture to allow for more distictant parts.

* Reduced mesh size by remodeling the bed height adjustment wheels.

* Updated Eryone Thinker name to include Series in the name

* Update eryone_thinker.def.json

* Improve End GCode

Ensure we disable bed temp and turn off all fans.
Move the nozzle up by 0.5mm and retract to remove wipe on model top layer.

* Minor fixes to start and end gcode

* Eryone Thinker Profile improvements.

Adding Extra Fast profile.
Added acceleration speed for Fast.
Minor updates to definition for default material to be Eryone PLA and some other setting to work better with profiles.

* Delete eryone_thinker.def.json

* Create eryone_thinker.def.json

* Updating Eryone Thinker Definition

Added changes again due to for reconcile stomping the original

* Update eryone_thinker_fast.inst.cfg

Update the layer_height to 0.25mm

Co-authored-by: Demetrius Apostolopoulos <75643490+dapostol73@users.noreply.github.com>
 2021-09-24 15:03:51 +02:00
Konstantinos Karmas
ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00
HOELLII
0626eccb92
Add Profile for Creality Ender 6 (#10437) 
CURA-8582
 2021-09-21 15:58:29 +02:00
Konstantinos Karmas
3e143a012a Change the setting version to 19 
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
 2021-09-15 16:25:04 +02:00
Ghostkeeper
453b666b1d
Increment setting_version to 18 
We now have version 18, where Flsun Super Racer has customised profiles.
Nothing changes in the built-in profiles. It only needs a change in the machine instances.

Contributes to issue CURA-8510.
 2021-09-14 16:32:43 +02:00
Ghostkeeper
cb47c88b2d
Don't override the setting version 
It should get inherited from fdmprinter or fdmextruder.

Found during work on CURA-8510.
 2021-09-14 16:27:17 +02:00
Ghostkeeper
5d40e8d7cc
Don't use stylised caps 
Contributes to issue CURA-8545.
 2021-09-08 16:20:00 +02:00
Ghostkeeper
9344f88c21
Canonical indentation 
Contributes to issue CURA-8545.
 2021-09-08 16:19:48 +02:00
zhpt
6e2f7845c9
Add AtomStack printer definitions (#10121) 
* Add files via upload

add AtomStack machine definitions

* Add files via upload

add AtomStack machine extruders

* Update resources/definitions/cambiran_maxe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_maxe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe175.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/cambiran_proe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Add files via upload

* Add files via upload

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* Delete cambiran_maxe175.def.json

* Delete cambiran_maxe285.def.json

* Delete cambiran_proe175.def.json

* Delete cambiran_proe285.def.json

* Delete cambrianmaxe175_extruder_1.def.json

* Delete cambrianmaxe285_extruder_1.def.json

* Delete cambrianproe175_extruder_1.def.json

* Delete cambrianproe285_extruder_1.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Update atomstack_cambrianmaxe285_extruder_0.def.json

* Update atomstack_cambrianproe175_extruder_0.def.json

* Update atomstack_cambrianproe285_extruder_0.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Create atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* add file atomstack_cambrian_base.def.json

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-09-08 16:18:55 +02:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04:00
Remco Burema
7eeae4db87
Enable infill pattern via infill line distance instead. 
Fixes an issue where, when the global infill density was 0, and the settings for a mesh overlap changed the infill line distance (but not outright the density),  the infill pattern would be disabled in the mesh overlap settings. (You still will need to select both the density and line width to actually change the line width though.)

Relates to github issue Cura/10349 (not explicity linking it here, as it might close that issue then, while it shouldn't as most sub-issues in there are still unresolved one way or the other.
 2021-09-07 14:56:02 +02:00
Ghostkeeper
7f1e3144bc
Remove arbitrary lower limit of 5% flow 
This was not a true limitation of the mathematics. In fact, we had other flow settings (for initial layer) that already went to 0.0001%.

Discovered while working on a bug report from Reddit.
 2021-09-02 09:49:30 +02:00
Jaime van Kessel
1740f8e880 Add Anycubic Vyper 
CURA-8515

commit 24250e19e94f8bf1b8cfe9edf1e29b7e78284525
Author: Jaime van Kessel <nallath@gmail.com>
Date:   Wed Aug 25 11:54:15 2021 +0200

    Move files to right location

commit 96efe7a885ba215a4334a36bcb1fee4b4f5a42a4
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Wed Aug 25 10:43:19 2021 +0800

    Update anycubic_vyper_.def.json

commit a620b9026191e86c41657a39a3ec50f946ef8eff
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:30:44 2021 +0800

    Upload anycubic_vyper_platform.stl

commit 84d48ce5239b8dd2b044d160b9e7f5513a03b8a5
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:29:56 2021 +0800

    Delete anycubic_vyper_platform.3mf

commit d66cb4221d4e03175f7bf6e5cfe6ce27c2608d5b
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:12:56 2021 +0800

    Add files via upload

commit 78bd0ea81842eaf96ac63c4eb1a48b6fb368973c
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 09:59:40 2021 +0800

    Update anycubic_vyper_.def.json

commit de1f452a0a4416e277e19cb11e30c5f4ce6bc849
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 09:57:48 2021 +0800

    Delete anycubic_vyper_platform.stl

commit 106e40950aaee8ee118a017b3c23852e756c97bb
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 12:25:53 2021 +0800

    Add Anycubic Vyper

commit 4cab52c9ca32f9773c87bcab78086a29ce863180
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 11:51:08 2021 +0800

    Revert "Add Anycubic Vyper"

commit ed5916df6c6b7a0762bc34c682975089a8b2baf1
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 11:43:49 2021 +0800

    Add files via upload
 2021-08-25 11:59:19 +02:00
Jaime van Kessel
2350712633 Remove incorrect reference to icons in some machine definitions 2021-08-22 19:57:09 +02:00
Ghostkeeper
44913c0d87
Merge branch '4.11' 2021-08-20 17:37:49 +02:00
Cyril
53263cf054
Improve FLSUN Super Racer profile (#10192) 
* Improve FLSUN Super Racer profile

- Added quality profiles based on profiles provided by FLSUN
- Improved machine settings based on FLSUN's Marlin sources
- Replaced Super Racer STL with correct one

* Update flsun_SuperRacer.stl

* Update definitions

* Update flsun_sr.stl

* Update flsun_sr.stl

* Update flsun_sr.def.json

* Improve platform

* Normal quality by default

* Improvements

* Fix double settings

CURA-8510
 2021-08-20 17:18:37 +02:00
Ghostkeeper
3eba7cd454
Slightly shorten AnyCubic i3 Mega S/Pro name 
This was causing some files to be just over the limit of file length when given the default printer name on some operating systems. Some file systems, especially encrypted ones, have strict limitations for the maximum length of a file name. With percent-encoding and the extension and postfix we add to these file names, this could go over the limit in file name length for some operating systems.
Easy fix is to slightly shorten the name, at least to remove those brackets.

Done as a 5 minute fix.
 2021-08-20 14:48:40 +02:00
Ghostkeeper
a3b8b95ade
Remove stylised caps 
We don't condone stylized caps as they give an unfair advantage to some printers. We don't show logos here, just textual names.

Contributes to issue CURA-8469.
 2021-08-19 16:32:17 +02:00
Ghostkeeper
41a259228f
Merge branch 'master' of https://github.com/x40-Community/Cura into x40-Community-master 2021-08-19 16:23:03 +02:00
X40-Community
d199d2f297 USB connection and gerneric_pc removed 2021-08-18 20:13:04 +02:00
X40-Community
0b666cce20 Error in line 24 fixed 2021-08-16 18:51:39 +02:00
Jaime van Kessel
bb2651bc0b Merge branch 'master' of https://github.com/NilsRo/Cura 2021-08-16 11:11:46 +02:00
root
2939294018 Merge branch 'master' of https://github.com/x40-Community/Cura 
M192 removed from start code, parking position changed to X351 in start code
 2021-08-12 22:14:37 +02:00
root
742c8fed21 M192 removed from start code, parking position changed to X351 2021-08-12 22:12:49 +02:00
NilsRo
b33f4640ad Updated Acceleration to firmware default 
Updated Acceleration to firmware default to increase time estimation accuracy and match firmware default
 2021-08-12 22:10:37 +02:00
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
Jaime van Kessel
7762def1ef Merge branch 'master' of https://github.com/heed818/Cura 2021-08-12 15:20:42 +02:00
AnnaKang0219
e7e5970647 Remove the files not CZ-300 
Remove the files not CZ-300
 2021-08-12 09:35:15 +08:00
AnnaKang0219
c86d1638e2 Fix bugs for definition 
modify Infill_pattern value setting
 2021-08-09 17:20:18 +08:00
AnnaKang0219
6a2120dbd3 update CrazyPrinter CZ-300 definitions 
update CrazyPrinter CZ-300 definitions
 2021-08-09 11:51:53 +08:00
root
099645fac8 Merge branch 'master' of https://github.com/x40-Community/Cura 2021-08-07 17:14:54 +02:00
root
db16d25aa1 Suppress all new materials without color information 2021-08-07 17:14:14 +02:00
x40-Community
bb229e13c4
Merge branch 'Ultimaker:master' into master 2021-08-07 16:26:42 +02:00
goofoo3d
d709b86c16
add goofoo,renkforce printf (#8959) 
* add goofoo,renkforce printf

* 优化PVA打印的配置

* 修正双喷打印不能重叠的问题

* 修改配置信息

* 添加机型配置

* 新增 goofoo 2-1混色脚本，优化机型配置.

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

* 修改机器名称不对的问题

* modify setting_version = 16 to setting_version = 17

* modify renkforce & goofoo's files setting_version = 16 to 17

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

Co-authored-by: laiqiqi <laiqiqi886@163.com>
 2021-08-06 15:14:24 +02:00
Konstantinos Karmas
b86e6ddfe6
Merge pull request #10189 from Ultimaker/CURA-7689_beta_release_notifications 
Allow update checking for BETA and stable releases
 2021-08-04 15:59:08 +02:00
Jaime van Kessel
0bc3ebbd46
Merge pull request #10222 from Ultimaker/CURA-7928_monotonic_order 
Monotonic ordering of skin, top surface and ironing
 2021-08-04 15:38:35 +02:00