GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 291 Branches 260 Tags
Commit Graph

3490 Commits

Author SHA1 Message Date
AnnaKang0219
097a56bd9b fix check error 
remove speed_travel in definition due to the setting already in quality.
 2021-10-04 11:48:49 +08:00
AnnaKang0219
8c155e8990 fix check errors 
remove the settings in definitions if these parameter already setting in quality
 2021-10-04 11:23:30 +08:00
Denis Shatilov
d9a20fd01a
Fixed Extruder hitting frame after finished print 2021-10-03 12:33:04 -07:00
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 88beb8ab68f0fd5da59806af61c6327114ed649d
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 48b2de09831bc180ad8f20f110017b0ce9fadb51
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 d94d3e42fc584ffddcbc69121a163c6685069bb7
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Sep 29 16:37:13 2021 -0300

    Update hellbot_hidra.obj

commit c3e74277181d04a0c5ad686ed0b6a98266e7b1f1
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 7830e553c0b026d621e6c182d8bf6d7abe085c3e
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 e3ec97eefaf06609c2b8dfe200f6573e655ab3b7
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 b906f5bd36262c3535531d3a230b3e46ab9b623c
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 e5161a29b11bfce977c9ae0d71081567da44dd01
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 4d1da317031c7388c6364de2be1598ad49f8c361
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 940df437b67a8f544779c66fe0dec26f1783b734
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 7009e6f43d8c1fd65aee15804a9fce9af24d7145
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 98f7f38dc2cb2b2ebe3760a31c2590a659bc0096
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 941080f0598839fdd734833427013f4555415afa
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 13f908a9a12d81c47b1face1fcf81d63b99ca287
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 e0e7af51bc633d840fecbd05c7a99fc9e89c620a
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 47fb61b896f69e808292c85b3056ea55ec8af150
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 8c3add290e1f1d1d7b1119cf8da1012c76c00e78
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 11cc224d194b5162430df19a2cbc55e4b13b4a81
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 b918db88eb7d2b613fbf51e0b3f056285c604b04
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 d8f73a724734b028b6a2f21393844251e0c910f8
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 0ba60ac18b3c726421f5e151e096f2e54c41e0b9
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 b84621061e4cc6e1e3fde3fd97270ff4db819852
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 3ce4bd1b86df633cdca738302e592573f387c2a6
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 2b09de8042966a7e8fd6ff28c76cc8c42e97fac0
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 2d41b9c1756da1444dc55f7c6f6f0476e20a79bf
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 c8ff19e8046a80598917c58c7622a1a3b002df60
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 efd7b380eaf9dd57e55e9ff27339556d433cfd9f
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 97b888050197e648ccc8835cd6bde517517fd53f
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 7005882e6f7812a5d559ad8cb18c08043ca82dbd
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 b85393015849dd88566a5bd62f7db5f17d4b617b
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 10f3cbd90da4251625f359d828d23ac8d97eb931
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 251025f861aa0495fe42198e225d908fa53599d3
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 7adafbe64f97ac5b5dfe036c95e1ae03f2ee7c9f
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 fc636ee68890a222cacfba76fbbc27e7a91e2275
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:25:13 2021 -0300

    fix format

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

    Fix format

commit 9569ba33dea8b99142948cc3acbc425b5c9d1ac5
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 6badeaa11a5c6c50cde69814c3b03769b0612514
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Aug 9 16:22:15 2021 -0300

    fix format

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

    fix formatting

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

    Fix formatting

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

    Fix formatting

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

    Fix formatting

commit 641c9a30885e4d1653f36b63d8ae07d7d158e270
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 6c2eda8bb10ee71ac3feb70770e4bb71b8e52891
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 40d01af1ff7c2ca8dd4598a70fbc8e6f1113dcfe
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 c07b2344d016cb7a09caca92ec3f0d464e59464c
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 215373c8daff67ecb427b0fb779a0429dee2b22e
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 eb94b340ed82c529ad61505c7c7e1be955fff355
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 3ae83992a2bbf8ed61ed093c12087ba8e9b54f2f
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 521ba3feec998841240a83c6792848a8485a5960
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 7924b268a340bcd77da214525ea3feb3f43e14f2
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 7b457e916a0c48d1ed5c4ea60417680ea3d05219
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 52ffd4acb0b233b782df5737dee0dbe7baeaf06b
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 550f6fae0b9bd1fdd7838e09cc26330c240e51b8
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 10f8f52c2f2486e4b4f1fd457a0fe8796ecef967
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 d90b6556e6f53b85a9a4e2e1360296947ce80be3
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 7168ced3ef2150b311061497e8f2aa6886a21fe0
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 8d982afede30337d671795e625c43ba7dec63e89
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 f9c20085cc050837b9f73bdb93a21102249fb21b
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 5e36e40573bbca02aecbcd14c9b515b717cd5c35
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 ff7288831e89249fdbeef3bc01be6fa3abe7f483
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 5cb5e5c655d59eedcda46e92f7140d0ba79a78d6
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 d005b7d77d1091f0547c8bbec0968741c1ff02b9
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 2ba75d9a88e51876a89cd55b728ecdc74d1b237e
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 6cb074fa1be7944f2a991a519b1e65e62b678b48
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Mon Jan 18 15:51:53 2021 -0300

    added print settings

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

    added print settings

commit c8967242e6e69d0b1e105e46eb22550400c1ce2d
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 4a4622f95cd85a93aeb8ac4260f5487be028c406
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 fa47e14765ad94de1bf054c89a7c9d5168225160
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 e34aedda09284bc1f05a305a713662bf4707aa65
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 a40858e92c3aea828996d0f2814e6c0411b6e976
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 08230ef409333672a942ba4a28cc6d394d40ced0
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 4655bffec86dbb5c7ad18e1c9fa9dcbb58166700
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 fa76c7c738d3a019369996e8374cfc2862041743
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 4a50f4d4ed6ac2f53db7093d550c2cf979e10f13
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 e093729b45da5456b194312bb847623de55ce622
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:40:43 2020 -0300

    Add files via upload

commit c16b5fd03405db3a01c08958205805feaa940e2a
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 b60df9bfb0c92d58adae9886227ed5736a77fe3c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:24:42 2020 -0300

    Add files via upload

commit 7a807a11bb95db7161dacbfa7b5d10ad10a25737
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 1fa060366a9ff16f755100c423b7987ffa42b6bd
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 4367946eaade48afa209fbc7a43746c10de2e6f3
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Nov 11 15:01:47 2020 -0300

    Add files via upload

commit 0de2121e46fdd6a4ffe2a2dab97e3f2a39e017a2
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 da5e2d5bbc3c1fb3ccbc6ec7aa8c5c29096b0d15
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 8a97089c7c4d1928fd3fb887b10926ae6eba7399
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 222bfdb6f9ea67a772051aff191516e61800f22a
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 93530f5ee9b604e9c163d34692ef9e5c950d81d9
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 7e62e8b564f463947568b1bbd1d797c79c79e42d
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 4f851668c03ef92d04cddbc9cd9cb500049d9498
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 7c78b92cd9f157f5de9f2e2857f0363ebdd6e19b
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 da01f79d53aebf23367839040a82423516c4b99b
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 f4147a02fdf6d121eac5f55acca91db3ab468ee4
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 7e6e5213aede756c7cc294baef8936d6eb34ab5e
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 3fda1c9d7fa660c01539dfa9df4da48b34211698
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 4b3732598b0093d5ab1c3581950ce82070192ea3
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 ff52d4f7a2671c225468cdd4a6d5f23769dea56f
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 ec5aee395af438f10ea24e2f7e29bf099222d350
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 76e496e2019410371e3034857c1d3cefa1a9f6e8
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 8ec2c2da5ce5b714d54dcae80146bf97554db577
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 28 09:33:56 2020 -0300

    Delete Hellbot_Magna_2_300.obj

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

    Delete Hellbot_Magna_2_230.obj

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

    Delete Magna2_300.png

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

    Delete Magna2_230.png

commit bcc0fcbec03ac48de23a4cbec60254234b025c3c
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 0fde6d23c875ffc789e50e51620e942a0d8c7611
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 75c61779333495eecca36e031956e36f1f42b3ab
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 5135178a47ccbe801b4b4f2eea4c0b0fb384b182
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 43c9a204aba6bbc021feec9ebf302692993821f3
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 0c7018c82270992a5ecda6a969ef08ef90d7841a
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 4c4f88e52d966f65d9c5e60211d016bc16b9f457
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 cf72e6f5bf335f9c5f6a007494c64a8c2bbbc326
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 7eed5479b96ba54de82fe6aa56058bb0e6863df4
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 4eafb4d929f1aa2381691586bd96e276f5881478
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 60f70cfb5910f855b919fa57c172b285f7241f14
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 10:00:21 2020 -0300

    Add files via upload

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

    Add files via upload

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

    Add files via upload

commit b25ccf9444c1f0e6eacf2586fdaec40ccc8d2d08
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 d00d140721b411ed5ae2834fb075eb8c924d7e23
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 4c82819d5e2df005a0a8db711cdcb3f10b2e00b5
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 59635c0d96b992d5ac226897bd53759c9f37bd92
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 f80e23c14e339a93aed206653c6d802e0575756c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Tue Oct 27 09:28:03 2020 -0300

    Add files via upload

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

    Update hellbot_magna_dual.def.json

commit c2e1c1daef04cda171fc0004d46459e0683b0511
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 65519c5a0313223d3597745e05d308ce836e1850
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date:   Wed Oct 7 13:29:46 2020 -0300

    Fixed Version

    Fixed incorrect version number

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

    Update hellbot_magna_I.def.json

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

    Update hellbot_magna_I.def.json

commit fb37cc861cd3777cb63faec91526a1b477e0b916
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
Ghostkeeper
363aa765f5
Don't show Infill Overhang Angle if lightning infill is enabled 
If the Infill Support setting was enabled but still hidden by Lightning Infill, this sub-setting could still be shown.

Contributes to issue CURA-8550.
 2021-10-01 15:28:18 +02:00
Ghostkeeper
5b923d105a
Fix sorting of setting overrides 
Keeps it maintainable in the long run.

Contributes to issue PP-1.
 2021-10-01 13:55:27 +02:00
Ghostkeeper
40fd3203b8
Fix tests: Removing unnecessary default_value overrides 
If there's a value, the default_value isn't used. This test exists to prevent confusion between the two, where a contributor could change the default_value but it gets overridden by a value.

Contributes to issue PP-1.
 2021-10-01 13:52:42 +02:00
p.kuiper
f9f59d0da1 Merge branch 'master' into PP-1-Improved_print_profiles 
# Conflicts:
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
 2021-09-29 17:33:02 +02:00
p.kuiper
be9f62c5ba - Only use monotonic order in top layer (increase print speed). 
- Explicitly set combing mode to the new 'no_outer_surfaces' strategy
- Adjusted the engineering profiles to use 100% wall flow and triangle infill pattern
 2021-09-29 16:07: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
p.kuiper
b99267048f Same print profile adjustments to the UM print profile as the S5 print profile, except for the maximum resolution adjustments 2021-09-29 12:58:34 +02:00
p.kuiper
7125aeb1ff Same print profile adjustments to the S3 print profile as the S5 print profile 2021-09-29 12:35:55 +02:00
p.kuiper
5f9fc5740e Print profile improvements: 
- Infill pattern: from triangles to lines
  => less strong but better visual appearance on large horizontal surfaces
- Infill before walls: from true to false
  => prevent infill push out walls and show artefacts
- skin_monotonic:from false to true
  => low reduction in print time vs large quality increase
  Note: this switch also sets:  retraction_combing from 'all' to 'noskin'
  The 'noskin' options prevents scarring in top surfaces and gloss streaking in large horizontal surfaces
  See: CURA-7976 for details
- wall_material_flow: from 100% to 90%
  => reduces line width variations due to overextrusion in walls. Less gloss streaking and more uniform horizontal walls
- top_bottom_pattern: from lines to zigzag
  => prevent the short jerky travel moves of the lines pattern around the walls. Results in a nicer top surface
 - meshfix_maximum_resolution from (speed_wall_0 + speed_wall_x) / 60 to (speed_wall_0 + speed_wall_x) / 150
 => reduce visibility of line segments due to rounding. This will create a higher change of a buffer underrun = surface blobs
 2021-09-29 12:32:50 +02:00
AnnaKang0219
48b82a2d1f move temperature setting in material 
move temperature setting in material
 2021-09-29 16:52:20 +08: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
Jaime van Kessel
40552762b7 Added inset_direction to crazyprint 
Should have happend when removing the old setting
 2021-09-28 15:22:03 +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
Jaime van Kessel
88b0ca560f Remove deleted settings from machine definitions 2021-09-28 14:59:09 +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
Hogan-Polaris
dc3a41afa3
Update eazao_zero.def.json 2021-09-25 08:20:06 +08:00
Hogan-Polaris
de10eabba0
Update eazao_zero.def.json 2021-09-25 08:19:32 +08:00
Hogan-Polaris
8bca9e79e1
Update resources/definitions/eazao_zero.def.json 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2021-09-25 08:16:41 +08: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
p.kuiper
7af71f5b36 Merge branch 'master' into PP-1-Improved_print_profiles 2021-09-24 10:56:24 +02:00
p.kuiper
ec096a12f6 Also add minimal jerk of 20mm/s to S3 and UM3. 2021-09-24 10:01:15 +02:00
Hogan-Polaris
9f09b2bb01
Update eazao_zero.def.json 2021-09-24 15:54:04 +08:00
Konstantinos Karmas
ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00
Hogan-Polaris
de0a53f225
Update resources/definitions/eazao_zero.def.json 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2021-09-23 22:50:54 +08:00
Hogan-Polaris
d8a32e706b
Update eazao_zero.def.json 2021-09-23 14:56:38 +08:00
Hogan-Polaris
6883cc4332
Update eazao_zero.def.json 2021-09-23 14:53:54 +08:00
Hogan-Polaris
437c711077
Update eazao_zero.def.json 2021-09-23 14:39:46 +08:00
Hogan-Polaris
7948cdb9f4
Create eazao_zero.def.json 
Create EAZAO zero printer definition file
 2021-09-23 14:33:53 +08:00
HOELLII
0626eccb92
Add Profile for Creality Ender 6 (#10437) 
CURA-8582
 2021-09-21 15:58:29 +02:00
Ghostkeeper
f50e16d30e
Merge branch 'master' into UMH-2021_ribbed_vaults_infill 2021-09-20 09:55:55 +02:00
THeijmans
3803d28d3d Increase maximum extrusion deviation 
See LibArachneBeta slides
 2021-09-16 13:52:11 +02:00
THeijmans
dfd5768c5c Turns on print thin walls 
For Arachne profile iteration 2, PP-2
 2021-09-16 11:56:58 +02:00
THeijmans
63bf47ffe9 Turn on back pressure compensation 
Initial setpoint at 50%, as in PP-2
 2021-09-16 11:10:44 +02:00
THeijmans
586d9f1b9a Removes accidental comma 2021-09-16 11:07:00 +02:00
THeijmans
a698409a25 Set line widths equal to nozzle diameter 
and remove line width lines from profiles (PP-13)
 2021-09-16 10:27:44 +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
THeijmans
8be12106c9 Updates wall order and top surface quality 
For PP-5, PP-27, PP-29
 2021-09-15 15:05:41 +02:00
THeijmans
0152a0429a Updates acceleration settings to a max of 3500mmps2 
And increases minimum to 1000mmps2.
 2021-09-15 14:32:39 +02:00