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

272 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 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
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
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
x40-Community
2e20ebbbd2
Merge branch 'Ultimaker:master' into master 2021-08-01 19:58:56 +02:00
Victor Sanchez Martinez
d6d0db2f50
Added Kingroon K3P and K3PS definitions (#9972) 
* Added Kingroon KP3/KP3S printers

* Stock max_feedrate and max_acceleration

Fixed max_feedrate and max_acceleration to match stock firmware

* Update to Cura 4.10

* Delete kingroon_kp3s_v3.stl

* Delete kingroon_kp3s_v2.stl

* Delete kingroon_kp3s_v1.stl

* Delete kingroon_kp3.stl

* New meshes for KP3 and KP3S

* Delete kingroon_kp3s_v3.def.json

* Delete kingroon_kp3s_v2.def.json

* Delete kingroon_kp3s_v1.def.json

* Unified KP3S definitions

* Delete kingroon_kp3s_v3_0.2.inst.cfg

* Delete kingroon_kp3s_v3_0.3.inst.cfg

* Delete kingroon_kp3s_v3_0.4.inst.cfg

* Delete kingroon_kp3s_v3_0.5.inst.cfg

* Delete kingroon_kp3s_v3_0.6.inst.cfg

* Delete kingroon_kp3s_v3_0.8.inst.cfg

* Delete kingroon_kp3s_v3_1.0.inst.cfg

* Delete kingroon_kp3s_v2_1.0.inst.cfg

* Delete kingroon_kp3s_v2_0.8.inst.cfg

* Delete kingroon_kp3s_v2_0.6.inst.cfg

* Delete kingroon_kp3s_v2_0.5.inst.cfg

* Delete kingroon_kp3s_v2_0.4.inst.cfg

* Delete kingroon_kp3s_v2_0.3.inst.cfg

* Delete kingroon_kp3s_v2_0.2.inst.cfg

* Delete kingroon_kp3s_v1_1.0.inst.cfg

* Delete kingroon_kp3s_v1_0.8.inst.cfg

* Delete kingroon_kp3s_v1_0.6.inst.cfg

* Delete kingroon_kp3s_v1_0.5.inst.cfg

* Delete kingroon_kp3s_v1_0.4.inst.cfg

* Delete kingroon_kp3s_v1_0.3.inst.cfg

* Delete kingroon_kp3s_v1_0.2.inst.cfg

* Updated Variants

* KP3S buildplate fix

Fixed a misaligned part

* Simplified meshes

Simplified meshes to improve performance

* Delete kingroon_base_0.2.inst.cfg

* Delete kingroon_base_0.3.inst.cfg

* Delete kingroon_base_0.4.inst.cfg

* Delete kingroon_base_0.6.inst.cfg

* Delete kingroon_base_0.8.inst.cfg

* Delete kingroon_base_1.0.inst.cfg

* Added/deleted excluded materials

Deleted non-1.75mm materials and added missing ones.
 2021-07-30 10:41:57 +02:00
x40-Community
48989aa5c0
Merge branch 'Ultimaker:master' into master 2021-07-25 12:52:10 +02:00
root
de4ab4a453 Add WEEDO X40 printer 2021-07-23 13:53:23 +02:00
Luke Harrison
918d1f188b
Biqu bx definition (#10086) 
* Added prelim support for the BX

* Revert "Added prelim support for the BX"

This reverts commit 923fbdbbb617d000663f04d08d468ed0c560517c.

* Added prelim support for the BX

* Revert "Added prelim support for the BX"

This reverts commit 923fbdbbb617d000663f04d08d468ed0c560517c.

* Added BIQU BX printer def

* Updated the platform name.

* Minor update to the start code. Ready for merge.
 2021-07-19 15:57:30 +02:00
Thushan Fernando
c60295c69e
Adds FLSun Super Racer Profile (#10078) 
* Initial FLSun Super Racer profile setup.

* flip has_machine_quality to false as suggested by @konskarm.

* tabs vs spaces! Space is the final frontier!

* Enumeration value should be in inner single quotes as requested by @konskarm.
 2021-07-16 13:43:22 +02:00
pbr-research
6634fca887
Add PBR 3D Gen-I printer definition (#9307) 
* Add new printer PBR_3D.def.json

Adding new Profile definition for PBR 3D.

* Create pbr_3d.extruder_0.def.json

Adding extruder profile for PBR 3D

* Delete pbr_3d.def.json

* Delete pbr_3d.extruder_0.def.json

* Adding PBR 3D Gen-I printer definition.

This is an printer definition for our printer.

* Adding PBR 3D Gen-I Printer Extruder definition

This is an extruder definition for our printer.

* Adding buildplate definition for PBR 3D Gen-I

This is a buildplate definition for our printer.

* Update pbr3d_g1.def.json

* Add files via upload
 2021-07-06 11:42:44 +02:00
Ghostkeeper
6275f32840
Merge branch 'jg-voron-v0' of https://github.com/jgehrig/Cura into jgehrig-jg-voron-v0 2021-06-25 16:22:17 +02:00
saliery999
0a40ceb72f
add Farm 2 and Farm 2CE printer, extruder profiles, variants, quality, meshes and images. (#9574) 
* Add files via upload

* Add files via upload

* Add files via upload (#1)

* Delete farm2_ce_normal.inst.cfg

* Delete farm2_normal.inst.cfg

* Update farm2.def.json

* Update farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Rename farm2.def.json to resources/definitions/farm2.def.json

* Delete farm2_platform.stl

* Add files via upload

* Rename farm2_CE.def.json to resources/definitions/farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Add files via upload

* Delete farm2CEplate.png.png

* Delete farm2_platform.3mf

* Delete farm2plate.png

* Add files via upload

* Add files via upload

* Delete farm2_ce_extruder_1.def.json

* Delete farm2_extruder_1.def.json

* Delete farm2_ce_printhead_0.2.inst.cfg

* Delete farm2_ce_printhead_0.3.inst.cfg

* Delete farm2_ce_printhead_0.4.inst.cfg

* Delete farm2_ce_printhead_0.5.inst.cfg

* Delete farm2_printhead_0.2.inst.cfg

* Delete farm2_printhead_0.3.inst.cfg

* Delete farm2_printhead_0.4.inst.cfg

* Delete farm2_printhead_0.5.inst.cfg

* Add files via upload

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Rename farm2_CE.def.json to farm2_ce.def.json

* Delete farm2CEplate.png

* Add files via upload

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Delete farm2plate.png

* Delete farm2ceplate.png

* Add files via upload

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2.def.json

* Update farm2_ce.def.json
 2021-06-22 16:54:21 +02:00
Ghostkeeper
0ae1e958f9
Merge branch 'master' of https://github.com/VOLUMIC/Cura into VOLUMIC-master 2021-06-08 16:00:46 +02:00
Ghostkeeper
867b3ba31e
Merge branch 'master' of https://github.com/NilsRo/Cura into NilsRo-master 2021-06-01 15:58:09 +02:00
NilsRo
c89e186671 Mega X: Fixed Layer Mesh, Optimized qualities 2021-05-17 20:23:51 +02:00
Konstantinos Karmas
86d84d14e1
Merge pull request #9114 from Lester3DGadgets/master 
Adding Twotrees Full range printer profiles
 2021-05-10 17:23:10 +02:00
VOLUMIC
398da09a92
Re-optimized STL 2021-05-04 16:59:23 +02:00
NilsRo
57c3050709 Added Anycubic Mega S Profil 2021-04-29 22:10:26 +02:00
Ghostkeeper
38061c4044
Merge branch 'master' of https://github.com/lowkeyjoe/Cura into lowkeyjoe-master 2021-04-29 14:24:41 +02:00
Konstantinos Karmas
71ec43d4b9
Merge pull request #9408 from cataclism/MINGDAprofiles 
Added profiles for MINGDA D3/Pro,Rock3/Pro,D4/Pro
 2021-04-28 11:51:12 +02:00
John Gehrig
fff2f2c073 Add Voron V0 Printer 
Configuration is based on the existing Voron V2 Cura printer profile.

The Bed STL is based on the VoronDesign CAD files, with some minimal
modifications to reduce STL size.
 2021-04-17 15:56:24 -04:00
Ghostkeeper
4bf440b86e
Squashed commit of the following: 
commit 21706720d320f79aa513dcbfb41b1f5e3849aa6d
Author: CrissR <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Apr 1 09:55:38 2021 +0300

    Update jgaurora_a6_extruder_0.def.json

commit de8ea9f8bebe5901541db3487f2f54f2d8fd3f6f
Author: CrissR <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Apr 1 09:44:01 2021 +0300

    Update jgaurora_a6.def.json

commit d17d231fdda400e937a1a34eb462c78072fa30f1
Author: CrissR <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Apr 1 09:31:24 2021 +0300

    Update jgaurora_a6_extruder_0.def.json

commit 00522440d762f24076db16317c8049c5d004c255
Author: CrissR <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 31 18:38:49 2021 +0300

    Update jgaurora_a6_extruder_0.def.json

    Added quality_definition for extruder

commit 87cc97a426421c9010591338c582efe763fe5928
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 10:13:11 2021 +0200

    Update jgaurora_a6_0.28_fast.inst.cfg.txt

commit 9d94002f5a0a621003f1965dfa2cde0cd768e983
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 10:12:42 2021 +0200

    Update jgaurora_a6_0.24_draft.inst.cfg

commit 57238e31f51d38b27325d140c4d94c4a91981f21
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 10:12:10 2021 +0200

    Update jgaurora_a6_0.2_normal.inst.cfg

commit 6e6e84786933434990ce75230d02cf94a3297fae
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 10:10:59 2021 +0200

    Update jgaurora_a6_0.16_optimal.inst.cfg

commit 5cc3021eb25a681a46c72fe988ba046d29100d9d
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 10:05:28 2021 +0200

    Update jgaurora_a6_0.12_detail.inst.cfg

commit 3eacc21bb54ae4c762c09db0dafe40aa1800d36b
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Fri Mar 5 09:51:08 2021 +0200

    Update jgaurora_a6.def.json

commit 71bb0e86c5d4427a209ed1c7c578209c78f03ea2
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 13:47:17 2021 +0200

    Update jgaurora_a6.def.json

commit 1971b94784a869184bbf7de1bacd81ddc323c933
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 10:27:24 2021 +0200

    Update jgaurora_a6.def.json

commit 26e849a2b86f4303c8735684706c18d2ea64f79a
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:48:12 2021 +0200

    Update jgaurora_a6_extruder_0.def.json

commit 3adeffa563ad23f8ce4096482c09f4ed201a5187
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:41:18 2021 +0200

    Update jgaurora_a6.def.json

commit 13475dd2f22b09f3b6ad2bf227ded43d3f31dd03
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:15:41 2021 +0200

    Add files via upload

    Fast 0.28 mm layer height

commit aa81a7bb6dc2caa0e36ba2ca9cd9052515643ff1
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:13:54 2021 +0200

    Update jgaurora_a6_0.24_draft.inst.cfg

commit 382486d598ff9482a90aaadb7f45606aeaa7f3c5
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:13:02 2021 +0200

    Update jgaurora_a6_0.2_normal.inst.cfg

commit 6ab2b608ac498f0f9288565a78755fc16645d7d5
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:11:40 2021 +0200

    Update jgaurora_a6_0.16_optimal.inst.cfg

commit cd270c4f6be4edf59a07e78bfb270676639dc79b
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Thu Mar 4 09:10:38 2021 +0200

    Update jgaurora_a6_0.12_detail.inst.cfg

commit 8051192a05a67806d8b8978e924e995b0f2919a1
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:32:20 2021 +0200

    Delete jgaurora_a6_0.2_normal.inst.cfg

commit 52587c006041f1629bb6137856206de697c3e0d0
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:32:07 2021 +0200

    Delete jgaurora_a6_0.24_draft.inst.cfg

commit e84701638cdb01ea1673f98358eecc2a7b875691
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:31:57 2021 +0200

    Delete jgaurora_a6_0.16_optimal.inst.cfg

commit 8fd8221dd3816df679c7400ec02db399e222d54b
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:31:47 2021 +0200

    Delete jgaurora_a6_0.12_detail.inst.cfg

commit 576661dade0d1101c2113db7c87b6a51d813e690
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:31:36 2021 +0200

    Delete jgaurora_a6_extruder_0.def.json

commit ad807f318a98641b7f7cf78238b9f557ca4411a6
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:31:25 2021 +0200

    Delete jgaurora_a6_platform.stl

commit 6fd7d9f640b3383cd511e3bfeed4cc0184b24393
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:31:10 2021 +0200

    Delete jgaurora_a6.def.json

commit e7f83a9e0686c4964c9d74da3c76ec8dff91254c
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:24:16 2021 +0200

    Update jgaurora_a6_0.2_normal.inst.cfg

commit 6ba89ba958418a0dad4e703191032fbd855e8994
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:23:59 2021 +0200

    Update jgaurora_a6_0.24_draft.inst.cfg

commit 366249a5de6f7602bdddd8cfb9f1b7c8ef4c3ac5
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:23:42 2021 +0200

    Update jgaurora_a6_0.16_optimal.inst.cfg

commit 2328a8e2042e1ca850974fc9f76c5e802f59f68b
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:23:20 2021 +0200

    Update jgaurora_a6_0.12_detail.inst.cfg

commit 0dc529037e0b6676cdbe271f9b23495baa01a5e7
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:12:59 2021 +0200

    Add files via upload

commit 872d2d689c512cea21d49ab9ede7856ce67d0c35
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:09:12 2021 +0200

    Add files via upload

commit 5575926e436fc4e5481d6c4e3c2e5f962c7e8061
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:08:46 2021 +0200

    Add files via upload

commit 77f40c009f35cac7cb5459b4828cc58fc8c34ee2
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:08:14 2021 +0200

    Add files via upload

commit 88246c18ececa016e99d954b1056a459189545c4
Author: criss-rasc <79998803+criss-rasc@users.noreply.github.com>
Date:   Wed Mar 3 20:07:15 2021 +0200

    Add files via upload

    JGAurora A6 printer profile
 2021-04-15 14:26:31 +02:00
Ghostkeeper
7b7b640ef7
Merge branch 'atom3_printers' of https://github.com/Daniel-Kurth/Cura into Daniel-Kurth-atom3_printers 2021-04-09 13:34:28 +02:00
VOLUMIC
0b298b5475
optimized STL 2021-03-30 18:26:36 +02:00
VOLUMIC
979c2a249f
Files for VOLUMIC printers series 
Files for VOLUMIC printers series
 2021-03-30 17:11:40 +02:00
Jaime van Kessel
8b447ca5cd
Merge pull request #9270 from mehmetsutas/Rigid3D 
Update Rigid3D definitions / Add Mucit2 definition
 2021-03-29 13:53:30 +02:00
Ghostkeeper
309bd52eb4
Merge branch 'defs_inat' of https://github.com/MarkINAT/Cura into MarkINAT-defs_inat 2021-03-29 13:40:10 +02:00
cataclism
344930f93a
Add files via upload 2021-03-16 14:43:53 +01:00
Daniel Kurth
b1788f3329 refactor: New meshes for Atom 3 / lite 
Add smaller meshes for the Atom 3 and Atom 3 Lite printer as they are too big for the official repo.
 2021-03-15 14:21:01 +01:00
Daniel Kurth
87cc83bbc4 Merge branch 'master' of https://github.com/Ultimaker/Cura into atom3_printers 2021-03-10 21:08:04 +01:00
Tom Callaway
eb5baebd64
add Lulzbot TAZ Pro and Lulzbot Mini 2 profiles (#9335) 
* add Lulzbot TAZ Pro and Lulzbot Mini 2 profiles

* Update resources/definitions/lulzbot_taz_pro_dual.def.json

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

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-03-09 09:27:46 +01:00
KeltE
cbafac6133
Cura Definition for Flasforge DreamerNX (#9303) 
* Add files via upload

* Update resources/definitions/flashforge_base.def.json

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

* Update resources/definitions/flashforge_base.def.json

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

* Update resources/definitions/flashforge_dreamer_nx.def.json

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

* Update resources/definitions/flashforge_dreamer_nx.def.json

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

* Rename ff_dreamernx_extruder_0.def.json to flashforge_dreamernx_extruder_0.def.json

* Update flashforge_dreamer_nx.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-03-08 16:51:45 +01:00
Daniel Kurth
22dd625c7d feat: Adds files for Layer Atom 3 line of printers 
The commit adds:
- Machine definition files for the Layer One Atom 3 and Atom 3 Lite Printer
- One shared extruder definition file for the Atom 3 and the Atom 3 Lite
- A mesh file for the Atom 3 and Atom 3 Lite
- Variant files for [0.2; 0.4; 0.6]mm Nozzles for PTFE and full metal hotends
 2021-02-28 12:34:23 +01:00
Ghostkeeper
642fee9904
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-02-25 17:32:45 +01:00
Eryone
2b024ab390
Merge pull request #9202 
* Adding Eryone Thinker profile to Cura
 2021-02-24 15:10:28 +01:00
Hellbot Development Team
c7e238c7c7
Update definition files for Hellbot Magna 1 and Hellbot Magna dual (#8509) 
* Update in Definition file for Hellbot Magna 1 
* Change the Author name and version number. 
* Added Heated bed.
* Added specific Gcode for purging the 2 in 1 hotend.
* 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

CURA-8047
 2021-02-24 14:55:26 +01:00
Mehmet Sutaş
522aec56ca Merge remote-tracking branch 'upstream/master' into Rigid3D 2021-02-12 01:51:41 +03:00
Mehmet Sutaş
4e9704c546 Mucit2 Definition and Rigid3D Definition Updates 2021-02-12 01:50:26 +03:00
MarkMan0
acf79aa31d Definitions for INAT Proton X printers 2021-02-11 18:05:42 +01:00
tomasbaldi
9052e2dae3
adding profiles for Trimaker printers (#8537) 
* adding profiles for Trimaker printers

* adding profiles for Trimaker printers v2

* Update resources/extruders/trimaker_nebula_extruder.def.json

Co-authored-by: Jaime van Kessel <nallath@gmail.com>

* Update resources/extruders/trimaker_cosmosII_extruder.def.json

Co-authored-by: Jaime van Kessel <nallath@gmail.com>

* Delete trimaker_cosmosII_platform.STL

* correction extension of trimaker_cosmosII_platform.stl and modification in trimaker_cosmosII.def.json and trimaker_nebula.def.json

* Update trimaker_nebula_platform.stl

* move the STL up

* Update resources/definitions/trimaker_nebula.def.json

"grid" -> "'grid'"

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

* Update resources/definitions/trimaker_cosmosII.def.json

"grid" -> "'grid'"

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

* 220x220x260 -> 230x230x260 (nebula)

* change the name of the qualities directory

* translate quality names from spanish to english

* change nebula platform_offset

* change nebula platform_offset 2

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-02-09 15:28:04 +01:00
freejoe
4222444731 add LONGER fdm printer series 2021-01-20 10:37:51 +08:00
3dg-Lester
c55986e583 Update sapphirepro_platform.stl 2021-01-16 10:27:16 +08:00
3dg-Lester
afc8065ae7 Adding Twotrees Full range printer profiles 
Profile for:
Bluer / Bluer Plus / Sapphire Pro / Sapphire Plus

Nozzle size : 0.2mm to 1mm

Material: PLA / ABS / PETG / TPU
 2021-01-12 11:59:39 +08:00
cataclism
a2e5ce6680
Adding the MINGDA D2 (#8872) 
* Added the configuration files for the Artillery Printers

Added the configuration files for the Artillery Printers

* Changed version file

* Updated versions, removed machine_head_polygon

* fixed version in some files

* Added generic PLA,PETG,ABS,TPU

* Update resources/definitions/artillery_base.def.json

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

* Update resources/definitions/artillery_base.def.json

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

* 1st batch of update

* Apply suggestions from code review

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

* 2nd batch of changes

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg

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

* Update resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg

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

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg

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

* Update resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg

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

* Added the MINDA definition and the MINGDA D2

* Update mingda_d2.def.json

Inserted artillery genius plate for the moment

* Update mingda_d2.def.json

Updated machine dimension

* Added the mesh for the D2 & updated the offsets

* Update resources/definitions/mingda_base.def.json

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-01-11 09:07:35 +01:00
Eryone
2dce2118f5 Added the eryone_er20 3d printer 2020-12-10 20:25:00 +08:00
nani
74ca8a0d8e
Merge branch 'master' into master 2020-11-23 19:20:19 +05:30
venkatkamesh
f8f6809a3e changed platform 2020-11-23 19:16:22 +05:30
venkatkamesh
fe2eb10abb New Definition 2020-11-23 13:59:08 +05:30
Ghostkeeper
0696d6f2e6
Merge branch 'master' of https://github.com/Firedrops/Cura into Firedrops-master 2020-11-17 11:06:10 +01:00
Firedrops
2923204c2b Fixed Bed Position 
Bed Mesh was poking above actual bed plane in Cura, bed shifted down to align properly.
 2020-11-16 12:43:20 +10:00