mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 21:44:01 -06:00

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. commit88beb8ab68
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Sep 29 16:37:56 2021 -0300 Create hellbot_hidra_plus.obj commit48b2de0983
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Sep 29 16:37:47 2021 -0300 Update hellbot_hidra_plus.obj commitd94d3e42fc
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Sep 29 16:37:13 2021 -0300 Update hellbot_hidra.obj commitc3e7427718
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 commit7830e553c0
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 commite3ec97eefa
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 commitb906f5bd36
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 commite5161a29b1
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 commit4d1da31703
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 commit940df437b6
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 commit7009e6f43d
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 commit98f7f38dc2
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 commit941080f059
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 commit13f908a9a1
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Sep 29 14:41:49 2021 -0300 Update hellbot_hidra.def.json commite0e7af51bc
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 commit47fb61b896
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 commit8c3add290e
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 commit11cc224d19
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 commitb918db88eb
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 commitd8f73a7247
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. commit0ba60ac18b
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 commitb84621061e
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 commit3ce4bd1b86
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 commit2b09de8042
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 commit2d41b9c175
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 commitc8ff19e804
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 commitefd7b380ea
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 commit97b8880501
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 commit7005882e6f
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 commitb853930158
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 commit10f3cbd90d
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 commit251025f861
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Aug 10 12:03:10 2021 -0300 Add missing } in line 16 commit7adafbe64f
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 commitfc636ee688
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 16:25:13 2021 -0300 fix format commitc817a65416
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 16:24:43 2021 -0300 Fix format commit9569ba33de
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 commit6badeaa11a
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 16:22:15 2021 -0300 fix format commit93c482179b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 15:59:24 2021 -0300 fix formatting commit874efbeecd
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 15:56:39 2021 -0300 Fix formatting commit654c90bf47
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 15:55:54 2021 -0300 Fix formatting commitd81cf2e44f
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Aug 9 15:54:18 2021 -0300 Fix formatting commit641c9a3088
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 commit6c2eda8bb1
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 commit40d01af1ff
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 commitc07b2344d0
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 commit215373c8da
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 commiteb94b340ed
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. commit3ae83992a2
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 commit521ba3feec
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 commit7924b268a3
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 commit7b457e916a
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. commit52ffd4acb0
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 commit550f6fae0b
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 commit10f8f52c2f
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 commitd90b6556e6
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 commit7168ced3ef
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 commit8d982afede
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 commitf9c20085cc
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 commit5e36e40573
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. commitff7288831e
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 commit5cb5e5c655
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 commitd005b7d77d
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 commit2ba75d9a88
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 commit6cb074fa1b
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Jan 18 15:51:53 2021 -0300 added print settings commit4a51c257c4
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Jan 18 15:51:33 2021 -0300 added print settings commitc8967242e6
Author: Hellbot Development Team <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Jan 18 15:38:17 2021 -0300 Added two PLA hellbot materials. commit4a4622f95c
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 commitfa47e14765
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 commite34aedda09
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 commita40858e92c
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 commit08230ef409
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 commit4655bffec8
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 commitfa76c7c738
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 commit4a50f4d4ed
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 commite093729b45
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Nov 11 15:40:43 2020 -0300 Add files via upload commitc16b5fd034
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 commitb60df9bfb0
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Nov 11 15:24:42 2020 -0300 Add files via upload commit7a807a11bb
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 commit1fa060366a
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 commit4367946eaa
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Nov 11 15:01:47 2020 -0300 Add files via upload commit0de2121e46
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 commitda5e2d5bbc
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 commit8a97089c7c
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 commit222bfdb6f9
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 commit93530f5ee9
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 commit7e62e8b564
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 commit4f851668c0
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 commit7c78b92cd9
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 commitda01f79d53
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 commitf4147a02fd
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 commit7e6e5213ae
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 commit3fda1c9d7f
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 commit4b3732598b
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 commitff52d4f7a2
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 commitec5aee395a
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 commit76e496e201
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 commit8ec2c2da5c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:33:56 2020 -0300 Delete Hellbot_Magna_2_300.obj commitaf5524927b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:33:37 2020 -0300 Delete Hellbot_Magna_2_230.obj commit1e8b0f44a4
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:19:44 2020 -0300 Delete Magna2_300.png commitdd5f070c9b
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:19:35 2020 -0300 Delete Magna2_230.png commitbcc0fcbec0
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 commit0fde6d23c8
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 commit75c6177933
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 commit5135178a47
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 commit43c9a204ab
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 commit0c7018c822
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 commit4c4f88e52d
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 commitcf72e6f5bf
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 commit7eed5479b9
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:16:37 2020 -0300 Delete hellbot_magna_2_300.def.json commit4eafb4d929
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 28 09:13:30 2020 -0300 Delete hellbot_magna_2_230.def.json commit60f70cfb59
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 10:00:21 2020 -0300 Add files via upload commit2c894ec680
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 09:54:48 2020 -0300 Add files via upload commitfc108118ec
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 09:43:13 2020 -0300 Add files via upload commitb25ccf9444
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 commitd00d140721
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 09:37:16 2020 -0300 Update hellbot_magna_2_300.def.json commit4c82819d5e
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 commit59635c0d96
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 09:29:09 2020 -0300 Update hellbot_magna_2_230.def.json commitf80e23c14e
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Tue Oct 27 09:28:03 2020 -0300 Add files via upload commit7c0d67619c
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Mon Oct 19 17:38:59 2020 -0300 Update hellbot_magna_dual.def.json commitc2e1c1daef
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. commit65519c5a03
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 7 13:29:46 2020 -0300 Fixed Version Fixed incorrect version number commit4be3fecd44
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 7 13:18:35 2020 -0300 Update hellbot_magna_I.def.json commite7e83cef30
Author: DevelopmentHellbot <71886550+DevelopmentHellbot@users.noreply.github.com> Date: Wed Oct 7 13:17:46 2020 -0300 Update hellbot_magna_I.def.json commitfb37cc861c
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.
59 lines
1.6 KiB
JSON
59 lines
1.6 KiB
JSON
{
|
|
"version": 2,
|
|
"name": "Hellbot Hidra",
|
|
"inherits": "fdmprinter",
|
|
"metadata": {
|
|
"visible": true,
|
|
"author": "Hellbot Development Team",
|
|
"manufacturer": "Hellbot",
|
|
"file_formats": "text/x-gcode",
|
|
"platform": "hellbot_hidra.obj",
|
|
"platform_offset": [0, 0, 5],
|
|
"platform_texture": "hellbot_hidra.png",
|
|
"has_materials": true,
|
|
"machine_extruder_trains":
|
|
{
|
|
"0": "hellbot_hidra_extruder_0",
|
|
"1": "hellbot_hidra_extruder_1"
|
|
}
|
|
|
|
},
|
|
|
|
"overrides": {
|
|
"machine_name": { "default_value": "Hellbot Hidra" },
|
|
"machine_width": {
|
|
"default_value": 220
|
|
},
|
|
"machine_depth": {
|
|
"default_value": 220
|
|
},
|
|
"machine_height": {
|
|
"default_value": 250
|
|
},
|
|
"machine_heated_bed": {
|
|
"default_value": true
|
|
},
|
|
"machine_center_is_zero": {
|
|
"default_value": false
|
|
},
|
|
"machine_head_with_fans_polygon":
|
|
{
|
|
"default_value": [
|
|
[ -75, 35 ],
|
|
[ -75, -18 ],
|
|
[ 18, 35 ],
|
|
[ 18, -18 ]
|
|
]
|
|
},
|
|
"machine_extruder_count": {
|
|
"default_value": 2
|
|
},
|
|
"machine_start_gcode": {
|
|
"default_value": "G21;\nG90;\nM82;\nM107;\nG28;\nG1 Z15.0 F9000;"
|
|
},
|
|
"machine_end_gcode": {
|
|
"default_value": "M104 T0 S0;\nM104 T1 S0;\nM140 S0;\nG92 E1;\nG1 E-1 F300;\nG28 X0 Y0;\nM84;"
|
|
}
|
|
|
|
}
|
|
}
|