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 88beb8ab68
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:37:56 2021 -0300
Create hellbot_hidra_plus.obj
commit 48b2de0983
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:37:47 2021 -0300
Update hellbot_hidra_plus.obj
commit d94d3e42fc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:37:13 2021 -0300
Update hellbot_hidra.obj
commit c3e7427718
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:35:19 2021 -0300
Update Hellbot_Magna_2_500.obj
commit 7830e553c0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:34:55 2021 -0300
Update Hellbot_Magna_2_400.obj
commit e3ec97eefa
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:34:25 2021 -0300
Update Hellbot_Magna_2_300.obj
commit b906f5bd36
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 16:33:25 2021 -0300
Update Hellbot_Magna_2_230.obj
commit e5161a29b1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:45:38 2021 -0300
Update hellbot_hidra_plus_extruder_1.def.json
commit 4d1da31703
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:45:25 2021 -0300
Update hellbot_hidra_plus_extruder_0.def.json
commit 940df437b6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:45:12 2021 -0300
Update hellbot_hidra_extruder_1.def.json
commit 7009e6f43d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:44:59 2021 -0300
Update hellbot_hidra_extruder_0.def.json
commit 98f7f38dc2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:44:20 2021 -0300
Update hellbot_hidra_plus.def.json
commit 941080f059
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:43:25 2021 -0300
Update hellbot_hidra_plus.def.json
commit 13f908a9a1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Sep 29 14:41:49 2021 -0300
Update hellbot_hidra.def.json
commit e0e7af51bc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Aug 17 15:19:25 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit 47fb61b896
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Aug 17 14:25:41 2021 -0300
Update hellbot_magna_2_230_dual.def.json
Add new start gcodes
commit 8c3add290e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 13 16:43:53 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit 11cc224d19
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 13 11:35:36 2021 -0300
Update hellbot_magna_2_230_dual.def.json
Change the start gcode
commit b918db88eb
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 13 11:24:13 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit d8f73a7247
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 13 11:19:59 2021 -0300
Update hellbot_magna_2_230_dual.def.json
Add some new start gcodes for purge line and temperature configuration.
commit 0ba60ac18b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 13:06:45 2021 -0300
Update hellbot_magna_2_300_dual.def.json
commit b84621061e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 13:05:49 2021 -0300
Update hellbot_magna_2_300_dual_extruder_1.def.json
commit 3ce4bd1b86
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 13:05:25 2021 -0300
Update hellbot_magna_2_300_dual_extruder_0.def.json
commit 2b09de8042
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 12:00:12 2021 -0300
Update hellbot_magna_2_230_dual_extruder_1.def.json
commit 2d41b9c175
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:59:13 2021 -0300
Update hellbot_magna_2_230_dual_extruder_1.def.json
commit c8ff19e804
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:57:57 2021 -0300
Update hellbot_magna_2_230_dual_extruder_1.def.json
commit efd7b380ea
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:56:42 2021 -0300
Update hellbot_magna_2_230_dual_extruder_0.def.json
commit 97b8880501
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:55:54 2021 -0300
Update hellbot_magna_2_230_dual_extruder_0.def.json
commit 7005882e6f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:32:31 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit b853930158
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:31:11 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit 10f3cbd90d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 12 11:27:19 2021 -0300
Update hellbot_magna_2_230_dual.def.json
commit 251025f861
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Aug 10 12:03:10 2021 -0300
Add missing } in line 16
commit 7adafbe64f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 16:25:25 2021 -0300
Update hellbot_magna_2_300_dual_extruder_1.def.json
commit fc636ee688
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 16:25:13 2021 -0300
fix format
commit c817a65416
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 16:24:43 2021 -0300
Fix format
commit 9569ba33de
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 16:24:22 2021 -0300
Update hellbot_magna_2_230_dual_extruder_0.def.json
commit 6badeaa11a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 16:22:15 2021 -0300
fix format
commit 93c482179b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:59:24 2021 -0300
fix formatting
commit 874efbeecd
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:56:39 2021 -0300
Fix formatting
commit 654c90bf47
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:55:54 2021 -0300
Fix formatting
commit d81cf2e44f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:54:18 2021 -0300
Fix formatting
commit 641c9a3088
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:52:59 2021 -0300
Add extruder files for Magna 2 400 and 500
commit 6c2eda8bb1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:51:30 2021 -0300
Update extruder 0 Magna 2 300 Dual
Add start and end gcode for Magna 2 300 Dual
commit 40d01af1ff
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:49:29 2021 -0300
Update Extruder 1 Magna 2 300 dual
Add start and end gcode for Magna 2 300 dual
commit c07b2344d0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:32:14 2021 -0300
Update Extruder 1 Magna 2 300
Add start and end Gcode for Extruder 1
commit 215373c8da
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Aug 9 15:31:06 2021 -0300
Update Extruder 0 Magna 2 230
Add Start and End Gcode for Extruder 0
commit eb94b340ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 6 12:29:44 2021 -0300
Fix formatting
Fixed the spaces and tabs.
commit 3ae83992a2
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Aug 6 12:21:59 2021 -0300
Update hellbot_magna_2_400_dual.def.json
commit 521ba3feec
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 5 17:14:49 2021 -0300
Add new bed 3D models
Add 3d models for the beds of the Magna 2 400 and Magna 2 500
commit 7924b268a3
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 5 15:18:24 2021 -0300
Add images for new Hellbot printers
Add images for beds of the Magna 2 400 and Magna 2 500
commit 7b457e916a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 5 15:17:06 2021 -0300
Add definitons for new Hellbot Printers
Add definition files for Magna 2 400, Magna 2 400 Dual, Magna 2 500 and Magna 2 500 Dual.
commit 52ffd4acb0
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 5 15:14:45 2021 -0300
Update definition of the Magna 2 300 Dual
Change the start gcode
commit 550f6fae0b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Thu Aug 5 15:09:39 2021 -0300
Update Magna 2 230 Dual definition
Change the Start gcode
commit 10f8f52c2f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 25 10:42:28 2021 -0300
Add New Hellbot printers
Add definition files for the new Hellbot printers: Hidra and Hidra Plus
commit d90b6556e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 25 10:39:10 2021 -0300
Add extruder files for new Hellbot printers
Add extruder files for new Hellbot Printers: Hellbot Hidra and Hellbot Hidra Plus
commit 7168ced3ef
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 25 10:36:50 2021 -0300
Add meshes files for Hellbot Hidra and Hidra plus
commit 8d982afede
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 25 10:35:46 2021 -0300
Add bed images for Hellbot Hidra and Hidra Plus
commit f9c20085cc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:30:55 2021 -0300
Added Start and End Gcode
Added machine start Gcode for purging the 2 in 1 hotend at the start and end gcode
commit 5e36e40573
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:25:22 2021 -0300
Added new Start and End Gcode
Added specific Gcode for purging the 2 in 1 hotend.
commit ff7288831e
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:16:11 2021 -0300
Delete Hellbot_pla_Grey.xml.fdm_material
commit 5cb5e5c655
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:16:00 2021 -0300
Delete Hellbot_PLA_Red.xml.fdm_material
commit d005b7d77d
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:06:50 2021 -0300
Rename Hellbot_PLA_Grey.xml.fdm_material to Hellbot_pla_Grey.xml.fdm_material
commit 2ba75d9a88
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 16:01:33 2021 -0300
Update Hellbot_PLA_Grey.xml.fdm_material
commit 6cb074fa1b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 15:51:53 2021 -0300
added print settings
commit 4a51c257c4
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 15:51:33 2021 -0300
added print settings
commit c8967242e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Jan 18 15:38:17 2021 -0300
Added two PLA hellbot materials.
commit 4a4622f95c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:33:07 2020 -0300
Update hellbot_magna_2_300.def.json
commit fa47e14765
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:32:45 2020 -0300
Update hellbot_magna_2_230_dual.def.json
commit e34aedda09
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:32:24 2020 -0300
Update hellbot_magna_2_230.def.json
commit a40858e92c
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:31:48 2020 -0300
Update hellbot_magna_2_300_dual.def.json
commit 08230ef409
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:30:55 2020 -0300
Update hellbot_magna_2_230_dual.def.json
commit 4655bffec8
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:30:42 2020 -0300
Update hellbot_magna_2_300.def.json
commit fa76c7c738
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:30:18 2020 -0300
Update hellbot_magna_2_230_dual.def.json
commit 4a50f4d4ed
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Nov 17 11:29:29 2020 -0300
Update hellbot_magna_2_230.def.json
commit e093729b45
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:40:43 2020 -0300
Add files via upload
commit c16b5fd034
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:31:07 2020 -0300
Create hellbot_magna_2_300_extruder_0.def.json
commit b60df9bfb0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:24:42 2020 -0300
Add files via upload
commit 7a807a11bb
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:19:03 2020 -0300
Delete hellbot_magna_2_230_extruder_0.def.json
commit 1fa060366a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:11:16 2020 -0300
Update hellbot_magna_2_230_extruder_0.def.json
commit 4367946eaa
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:01:47 2020 -0300
Add files via upload
commit 0de2121e46
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:01:15 2020 -0300
Delete hellbot_magna_2_300_extruder_0.def.json
commit da5e2d5bbc
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:00:55 2020 -0300
Delete hellbot_magna_2_300_dual_extruder_1.def.json
commit 8a97089c7c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 15:00:30 2020 -0300
Delete hellbot_magna_2_300_dual_extruder_0.def.json
commit 222bfdb6f9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 14:59:52 2020 -0300
Delete hellbot_magna_2_230_extruder_0.def.json
commit 93530f5ee9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 14:59:31 2020 -0300
Delete hellbot_magna_2_230_dual_extruder_1.def.json
commit 7e62e8b564
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Nov 11 14:59:11 2020 -0300
Delete hellbot_magna_2_230_dual_extruder_0.def.json
commit 4f851668c0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:28:51 2020 -0300
Rename hellbot_magna_2_300_dual_E2.def.json to hellbot_magna_2_300_dual_extruder_1.def.json
commit 7c78b92cd9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:28:17 2020 -0300
Rename hellbot_magna_2_300_dual_E1.def.json to hellbot_magna_2_300_dual_extruder_0.def.json
commit da01f79d53
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:27:44 2020 -0300
Rename hellbot_magna_2_300_E1.def.json to hellbot_magna_2_300_extruder_0.def.json
commit f4147a02fd
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:22:42 2020 -0300
Rename hellbot_magna_2_230_dual_E2.def.json to hellbot_magna_2_230_dual_extruder_1.def.json
commit 7e6e5213ae
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:22:04 2020 -0300
Rename hellbot_magna_2_230_dual_E1.def.json to hellbot_magna_2_230_dual_extruder_0.def.json
commit 3fda1c9d7f
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Fri Nov 6 16:21:22 2020 -0300
Rename hellbot_magna_2_230_E1.def.json to hellbot_magna_2_230_extruder_0.def.json
commit 4b3732598b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 10:32:32 2020 -0300
Add definition files for Magna 2 230/300
commit ff52d4f7a2
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 10:21:19 2020 -0300
Added extruder files for Magna 2 230/300
commit ec5aee395a
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 10:16:52 2020 -0300
Add PNG files for textures for Magna 2 230/300
commit 76e496e201
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 10:12:17 2020 -0300
Add new Mesh files for Magna 2 230/300
commit 8ec2c2da5c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:33:56 2020 -0300
Delete Hellbot_Magna_2_300.obj
commit af5524927b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:33:37 2020 -0300
Delete Hellbot_Magna_2_230.obj
commit 1e8b0f44a4
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:19:44 2020 -0300
Delete Magna2_300.png
commit dd5f070c9b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:19:35 2020 -0300
Delete Magna2_230.png
commit bcc0fcbec0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:19:10 2020 -0300
Delete hellbot_magna_2_300_dual_E2.def.json
commit 0fde6d23c8
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:18:53 2020 -0300
Delete hellbot_magna_2_300_dual_E1.def.json
commit 75c6177933
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:18:38 2020 -0300
Delete hellbot_magna_2_300_E1.def.json
commit 5135178a47
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:18:25 2020 -0300
Delete hellbot_magna_2_230_dual_E2.def.json
commit 43c9a204ab
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:17:59 2020 -0300
Delete hellbot_magna_2_230_dual_E1.def.json
commit 0c7018c822
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:17:45 2020 -0300
Delete hellbot_magna_2_230_E1.def.json
commit 4c4f88e52d
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:17:25 2020 -0300
Delete hellbot_magna_2_300_dual.def.json
commit cf72e6f5bf
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:16:52 2020 -0300
Delete hellbot_magna_2_230_dual.def.json
commit 7eed5479b9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:16:37 2020 -0300
Delete hellbot_magna_2_300.def.json
commit 4eafb4d929
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 28 09:13:30 2020 -0300
Delete hellbot_magna_2_230.def.json
commit 60f70cfb59
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 10:00:21 2020 -0300
Add files via upload
commit 2c894ec680
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:54:48 2020 -0300
Add files via upload
commit fc108118ec
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:43:13 2020 -0300
Add files via upload
commit b25ccf9444
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:38:58 2020 -0300
Update hellbot_magna_2_300_dual.def.json
commit d00d140721
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:37:16 2020 -0300
Update hellbot_magna_2_300.def.json
commit 4c82819d5e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:36:24 2020 -0300
Update hellbot_magna_2_230_dual.def.json
commit 59635c0d96
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:29:09 2020 -0300
Update hellbot_magna_2_230.def.json
commit f80e23c14e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Tue Oct 27 09:28:03 2020 -0300
Add files via upload
commit 7c0d67619c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Mon Oct 19 17:38:59 2020 -0300
Update hellbot_magna_dual.def.json
commit c2e1c1daef
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 7 14:13:01 2020 -0300
Update to Hellbot Magna Dual Definition file
Author changed and added heated bed.
commit 65519c5a03
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 7 13:29:46 2020 -0300
Fixed Version
Fixed incorrect version number
commit 4be3fecd44
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 7 13:18:35 2020 -0300
Update hellbot_magna_I.def.json
commit e7e83cef30
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 7 13:17:46 2020 -0300
Update hellbot_magna_I.def.json
commit fb37cc861c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com>
Date: Wed Oct 7 12:50:39 2020 -0300
Update in Definition file for Hellbot Magna 1
Change the Author name and version number.
Added Heated bed.
2021-10-01 16:55:26 +02:00
Jaime van Kessel
6dc65a4912
Fix crash with login
...
Fixes CURA-2N2
2021-10-01 13:43:33 +02:00
Ghostkeeper
ebee7dbec9
Remove space from link
...
This was probably a copy-paste error.
2021-10-01 10:22:38 +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
Ghostkeeper
fbd48767fb
Sort requirements list
...
Makes it easier to update this list in the future, if we don't mess it up again.
2021-09-29 12:02:54 +02:00
Ghostkeeper
f5a600e4ac
Update version numbers of requirements with updated dependencies
...
These dependencies changed last week, as of https://github.com/Ultimaker/cura-build-environment/pull/107 .
This ensures that the easy-development-environment workflow is still up to date as well.
Contributes to issue CURA-8400.
2021-09-29 12:00:11 +02:00
Konstantinos Karmas
54aaa91bfc
Change "default_value" to "value" in malayan_m200.def.json
...
CURA-7976
2021-09-28 15:42:22 +02:00
Konstantinos Karmas
e1b56f9188
Remove "default_value" since the "value" overrides it
...
CURA-7976
2021-09-28 15:38:39 +02:00
Konstantinos Karmas
f1174cb7f6
Enable the "Not on outer surfaces" combing mode if monotonic or ironing
...
The "Combing": "Not in outer surfaces" option will be activated for all extruders in the following cases:
1. Monotonic Top/Bottom Order is enabled (in any extruder)
2. Ironing is enabled (in any extruder)
3. Top Surface Skin Layers > 0 and Monotonic Top Surface Order is enabled (in any extruder)
CURA-7976
2021-09-28 15:15:37 +02:00
Konstantinos Karmas
96f989c33b
Add "No outer surfaces" combing option
...
CURA-7976
2021-09-28 14:06:25 +02:00
Jaime van Kessel
c83c6b0068
Merge branch 'CURA-8510_version_upgrade' of github.com:Ultimaker/Cura
2021-09-28 10:31:56 +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
f3e2e7f6ac
Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura
2021-09-27 14:43:07 +02:00
Jaime van Kessel
e88ac49fd6
Add global & extruder stack to ignore list for name filters
...
This prevents the weird spam about "global_stack" not being a plugin ID
2021-09-27 13:41:53 +02:00
Jaime van Kessel
4f3b3a3c4a
Update setting_version of eryone profile
...
CURA-8510
2021-09-27 10:21:04 +02: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
Ghostkeeper
ef568ce622
Only get quality-changes fields for quality-changes profiles
...
And make the upgrade more robust against weird input, too.
Contributes to issue CURA-8510.
2021-09-24 16:32:38 +02:00
Jaime van Kessel
fa3f3efbec
Merge pull request #10289 from fieldOfView/feature_material_type_name_patterns
...
Add {material_type}, {material_name}, {material_id} and {material_brand} as replacement patterns
CURA-8598
2021-09-24 16:17:12 +02:00
Hellbot Development Team
f2ed6d9054
Update Definitions and Extruders of Magna 2 230/300 dual
...
Add start and end gcode for correct change of extruders
CURA-8597
#10298
2021-09-24 16:08:39 +02:00
Eryone
c6c325facb
Update the thinker printer profile ( #10431 )
...
* Adding Eryone Thinker profile to Cura
- adding printer definition
- adding extruder definition
- adding image plate
- adding platform object
- adding quality profiles
* Minor update eryone_thinker.def.json
Fix initial fan speed
* Improve model textures and draw order
Fixed draw order of model by seperating the mesh into parts and ordering them before export. Add more colors to the texture to allow for more distictant parts.
* Reduced mesh size by remodeling the bed height adjustment wheels.
* Updated Eryone Thinker name to include Series in the name
* Update eryone_thinker.def.json
* Improve End GCode
Ensure we disable bed temp and turn off all fans.
Move the nozzle up by 0.5mm and retract to remove wipe on model top layer.
* Minor fixes to start and end gcode
* Eryone Thinker Profile improvements.
Adding Extra Fast profile.
Added acceleration speed for Fast.
Minor updates to definition for default material to be Eryone PLA and some other setting to work better with profiles.
* Delete eryone_thinker.def.json
* Create eryone_thinker.def.json
* Updating Eryone Thinker Definition
Added changes again due to for reconcile stomping the original
* Update eryone_thinker_fast.inst.cfg
Update the layer_height to 0.25mm
Co-authored-by: Demetrius Apostolopoulos <75643490+dapostol73@users.noreply.github.com>
2021-09-24 15:03:51 +02:00
Ghostkeeper
413913a5a8
Modernise logging
...
Hopefully this prevents issues like Sentry issue CURA-2WB.
2021-09-24 15:00:03 +02:00
Ghostkeeper
026c4062ce
Add logging for when the user encounters errors in setting values
...
We want to be able to see this from the log file, to help debug issues.
Done to help with cases like #10475 .
2021-09-24 14:08:55 +02:00
Ghostkeeper
0bcd5eba48
Add print_temperature to print temperature settings
...
This way it is recognised as a command to set the printing temperature, and will prevent Cura from putting its own temperature commands in.
Fixes issue reported here: https://www.reddit.com/r/Cura/comments/pu98kc/stop_initial_hotend_heatup/
2021-09-24 13:09:37 +02:00
Konstantinos Karmas
a08a5625d2
Update setting_version of newest resources to 19
...
These resources still had 17 as they were merged in master.
CURA-8510
2021-09-23 17:02:16 +02:00
Konstantinos Karmas
ad6a8d828e
Merge branch 'master' into CURA-8510_version_upgrade
2021-09-23 17:01:00 +02:00
Konstantinos Karmas
b322edfa53
Update the flsun quality_changes profiles during version upgrade
...
So that they are also mapped from the global qualities to the flsun_sr-specific ones. This way they will be able to still be used in the newer Cura versions.
CURA-8510
2021-09-23 16:21:46 +02:00
Ghostkeeper
43f1df1723
Show error when failing to save archive
...
It could be that you don't have permission to save the archive. Instead of crashing Cura, show an error to the user.
Fixes Sentry issue CURA-2VS.
2021-09-23 15:44:28 +02:00
Konstantinos Karmas
5266cbb950
Initiate an account sync immediately after pressing "Add cloud printer"
...
It was a bit weird that the sync didn't happen immediately and you had to wait for 30seconds until the printer appeared.
2021-09-23 12:53:57 +02:00
Remco Burema
985bcd6622
Merge pull request #10491 from Ultimaker/CURA-8421_Introduce_app_switcher
...
CURA-8421: Introduce app switcher
2021-09-22 15:50:04 +02:00
Ghostkeeper
c4f8ce15d6
Merge branch 'CURA-8422_style_tooltips' into CURA-8421_Introduce_app_switcher
2021-09-22 15:31:17 +02:00
Ghostkeeper
b020f8efd4
Also update version number of Digital Library in bundled versions
...
Otherwise we still get an update notification when starting from factory defaults. The plug-in's real version is 1.1.0 now.
2021-09-22 15:28:53 +02:00
Ghostkeeper
426e3064d2
Don't crash when material file can't be opened for sending to printer
...
It seems that due to the threaded nature, the limit to the number of open file handlers could be reached here. Or it could just be locked or something of course.
Fixes Sentry issue CURA-2V2.
2021-09-22 14:59:27 +02:00
Jaime van Kessel
0656e11afa
Fix styling of application button
...
Fixes previous mistake that I made while simplifying the QML
CURA-8421
2021-09-22 13:53:49 +02:00
Jaime van Kessel
7d46e0a96c
Fix styling of application button
...
Fixes previous mistake that I made while simplifying the QML
CURA-8421
2021-09-22 13:52:54 +02:00
Jaime van Kessel
e39675e447
Use styled tooltip
...
CURA-8422
2021-09-22 13:44:45 +02:00
Jaime van Kessel
9b3103e624
Fix typo in changelog
...
Found it when making the same typo in search.
2021-09-22 13:00:45 +02:00
Jaime van Kessel
5a8396651e
Update the copy of the tooltips
...
CURA-8422
2021-09-22 12:59:43 +02:00
Jaime van Kessel
aa905a80fe
Add animations to hover effect
...
CURA-8421
2021-09-22 09:48:27 +02:00
Jaime van Kessel
90bfdce3bb
Further simplify the qml of applicationSwitcherPopup
...
CURA-8421
2021-09-22 09:45:53 +02:00
Jaime van Kessel
0c9ef1e647
Move ApplicationSwitcherPopup to it's own file
...
CURA-8421
2021-09-22 09:43:49 +02:00
Jaime van Kessel
fd0804646a
Simplify the QML of application switcher
...
CURA-8421
2021-09-22 09:40:32 +02:00
Jaime van Kessel
9bf5d85be1
Add animation to hover effect
...
CURA-8421
2021-09-22 09:36:47 +02:00
Jaime van Kessel
f55e3363d0
Remove unneeded property change
...
CURA-8421
2021-09-22 09:35:09 +02:00
Jaime van Kessel
dc181a3426
Simplify QML of application button
...
CURA-8421
2021-09-22 09:33:13 +02:00
Jaime van Kessel
e0b38f2782
Add animation to hover effect
...
CURA-8421
2021-09-22 09:29:47 +02:00