Commit graph

493 commits

Author SHA1 Message Date
Jaime van Kessel
80d2665c1a
Merge pull request #10978 from dagoma3d/dagoma-pro430
Add new Dagoma PRO 430 printer
2022-02-09 15:13:55 +01:00
64bittuning
8198bc0db5 Submitting for approval
Upon doing my research, I have seen several other people struggle with build issues. I feel at this time that I have done my due dilligence, and as long as my only failure is 14/15, I feel this PR is ready.
2022-01-28 16:33:13 -05:00
jameschen1605
a20ff6f170
Add Hozo, Hozo 3Dprinter (#10856)
* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Fixed gantry height

* Fixed ID field

* Add Hozo iX 3dprinter

Add 3dprinter profile

* Add Hozo iX 3dprinter

Add 3dprinter extruder

* Add Hozo iX 3dprinter

Add 3dprinter mesh

* Update and rename HardPrint_Hozo.def.json to hardprint_hozo.def.json

* Update and rename HardPrint_Hozo_iX.def.json to hardprint_hozo_ix.def.json

* Rename HardPrint_Hozo_extruder_0.def.json to hardprint_hozo_extruder_0.def.json

* Rename HardPrint_Hozo_iX_extruder_0.def.json to hardprint_hozo_ix_extruder_0.def.json

* Delete HardPrint_Hozo_iX_platform.stl

* Delete HardPrint_Hozo_platform.stl

* Add files via upload

* Change IDs

* Change IDs
2022-01-28 16:39:14 +01:00
aschwenck
59cd48ee94 Updating profiles 2021-12-23 14:08:03 +01:00
Ghostkeeper
3e96508d59
Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master 2021-12-17 15:27:02 +01:00
Hellbot Development Team
1aa6ec721a
Update extruder files for Magna 2 230 and 300 (#10695)
* Update in Definition file for Hellbot Magna 1 

Change the Author name and version number. 
Added Heated bed.

* Update hellbot_magna_I.def.json

* Update hellbot_magna_I.def.json

* Fixed Version

Fixed incorrect version number

* Update to Hellbot Magna Dual Definition file

Author changed and added heated bed.

* Update hellbot_magna_dual.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Add files via upload

* Add files via upload

* Add files via upload

* Delete hellbot_magna_2_230.def.json

* Delete hellbot_magna_2_300.def.json

* Delete hellbot_magna_2_230_dual.def.json

* Delete hellbot_magna_2_300_dual.def.json

* Delete hellbot_magna_2_230_E1.def.json

* Delete hellbot_magna_2_230_dual_E1.def.json

* Delete hellbot_magna_2_230_dual_E2.def.json

* Delete hellbot_magna_2_300_E1.def.json

* Delete hellbot_magna_2_300_dual_E1.def.json

* Delete hellbot_magna_2_300_dual_E2.def.json

* Delete Magna2_230.png

* Delete Magna2_300.png

* Delete Hellbot_Magna_2_230.obj

* Delete Hellbot_Magna_2_300.obj

* Add new Mesh files for Magna 2 230/300

* Add PNG files for textures for Magna 2 230/300

* Added extruder files for Magna 2 230/300

* Add definition files for Magna 2 230/300

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

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

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

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

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

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

* Delete hellbot_magna_2_230_dual_extruder_0.def.json

* Delete hellbot_magna_2_230_dual_extruder_1.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_1.def.json

* Delete hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Add files via upload

* Create hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Added two PLA hellbot materials.

* added print settings

* added print settings

* Update Hellbot_PLA_Grey.xml.fdm_material

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

* Delete Hellbot_PLA_Red.xml.fdm_material

* Delete Hellbot_pla_Grey.xml.fdm_material

* Added new Start and End Gcode

Added specific Gcode for purging the 2 in 1 hotend.

* Added Start and End Gcode

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

* 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

* Update Magna 2 230 Dual definition

Change the Start gcode

* Update definition of the Magna 2 300 Dual

Change the start gcode

* 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.

* Add images for new Hellbot printers

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

* Add new bed 3D models

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

* Update hellbot_magna_2_400_dual.def.json

* Fix formatting

Fixed the spaces and tabs.

* Update Extruder 0 Magna 2 230

Add Start and End Gcode for Extruder 0

* Update Extruder 1 Magna 2 300

Add start and end Gcode for Extruder 1

* Update Extruder 1 Magna 2 300 dual 

Add start and end gcode for Magna 2 300 dual

* Update extruder 0 Magna 2 300 Dual

Add start and end gcode for Magna 2 300 Dual

* Add extruder files for Magna 2 400 and 500

* Fix formatting

* Fix formatting

* Fix formatting

* fix formatting

* fix format

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Fix format

* fix format

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Add missing } in line 16

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual_extruder_0.def.json

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

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

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Change the start gcode

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Add new start gcodes

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_extruder_0.def.json

* Update hellbot_hidra_extruder_1.def.json

* Update hellbot_hidra_plus_extruder_0.def.json

* Update hellbot_hidra_plus_extruder_1.def.json

* Update Hellbot_Magna_2_230.obj

* Update Hellbot_Magna_2_300.obj

* Update Hellbot_Magna_2_400.obj

* Update Hellbot_Magna_2_500.obj

* Update hellbot_hidra.obj

* Update hellbot_hidra_plus.obj

* Create hellbot_hidra_plus.obj

* Add definition file for new Hellbot 3D printer

Definition file for new Hellbot 3D printer Magna SE.

* Add extruder definition file 

Add new extruder definition file for the new Hellbot 3D printer Magna SE.

* Add new obj file 

Add .obj mesh file for the new Hellbot 3D printer, Magna SE

* Add image file 

Add image file for new Hellbot 3D printer, Magna SE

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_400.def.json

* Update hellbot_magna_2_400_dual.def.json

* Update hellbot_magna_2_500.def.json

* Update hellbot_magna_2_500_dual.def.json

* Update hellbot_magna_I.def.json

* Update hellbot_magna_dual.def.json

* Update hellbot_magna_2_230_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_1.def.json

* Update hellbot_magna_2_500_dual_extruder_0.def.json

* Update hellbot_magna_2_500_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

Add new start and end Gcodes

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual_extruder_0.def.json

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json
2021-12-15 18:55:38 +01:00
Hellbot Development Team
c593726eb4
Add new Hellbot 3D printer Magna SE (#10614)
* Update in Definition file for Hellbot Magna 1 

Change the Author name and version number. 
Added Heated bed.

* Update hellbot_magna_I.def.json

* Update hellbot_magna_I.def.json

* Fixed Version

Fixed incorrect version number

* Update to Hellbot Magna Dual Definition file

Author changed and added heated bed.

* Update hellbot_magna_dual.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Add files via upload

* Add files via upload

* Add files via upload

* Delete hellbot_magna_2_230.def.json

* Delete hellbot_magna_2_300.def.json

* Delete hellbot_magna_2_230_dual.def.json

* Delete hellbot_magna_2_300_dual.def.json

* Delete hellbot_magna_2_230_E1.def.json

* Delete hellbot_magna_2_230_dual_E1.def.json

* Delete hellbot_magna_2_230_dual_E2.def.json

* Delete hellbot_magna_2_300_E1.def.json

* Delete hellbot_magna_2_300_dual_E1.def.json

* Delete hellbot_magna_2_300_dual_E2.def.json

* Delete Magna2_230.png

* Delete Magna2_300.png

* Delete Hellbot_Magna_2_230.obj

* Delete Hellbot_Magna_2_300.obj

* Add new Mesh files for Magna 2 230/300

* Add PNG files for textures for Magna 2 230/300

* Added extruder files for Magna 2 230/300

* Add definition files for Magna 2 230/300

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

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

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

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

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

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

* Delete hellbot_magna_2_230_dual_extruder_0.def.json

* Delete hellbot_magna_2_230_dual_extruder_1.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_0.def.json

* Delete hellbot_magna_2_300_dual_extruder_1.def.json

* Delete hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230_extruder_0.def.json

* Delete hellbot_magna_2_230_extruder_0.def.json

* Add files via upload

* Create hellbot_magna_2_300_extruder_0.def.json

* Add files via upload

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Added two PLA hellbot materials.

* added print settings

* added print settings

* Update Hellbot_PLA_Grey.xml.fdm_material

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

* Delete Hellbot_PLA_Red.xml.fdm_material

* Delete Hellbot_pla_Grey.xml.fdm_material

* Added new Start and End Gcode

Added specific Gcode for purging the 2 in 1 hotend.

* Added Start and End Gcode

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

* 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

* Update Magna 2 230 Dual definition

Change the Start gcode

* Update definition of the Magna 2 300 Dual

Change the start gcode

* 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.

* Add images for new Hellbot printers

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

* Add new bed 3D models

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

* Update hellbot_magna_2_400_dual.def.json

* Fix formatting

Fixed the spaces and tabs.

* Update Extruder 0 Magna 2 230

Add Start and End Gcode for Extruder 0

* Update Extruder 1 Magna 2 300

Add start and end Gcode for Extruder 1

* Update Extruder 1 Magna 2 300 dual 

Add start and end gcode for Magna 2 300 dual

* Update extruder 0 Magna 2 300 Dual

Add start and end gcode for Magna 2 300 Dual

* Add extruder files for Magna 2 400 and 500

* Fix formatting

* Fix formatting

* Fix formatting

* fix formatting

* fix format

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Fix format

* fix format

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Add missing } in line 16

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual_extruder_0.def.json

* Update hellbot_magna_2_300_dual_extruder_1.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

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

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Change the start gcode

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_230_dual.def.json

Add new start gcodes

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_hidra_extruder_0.def.json

* Update hellbot_hidra_extruder_1.def.json

* Update hellbot_hidra_plus_extruder_0.def.json

* Update hellbot_hidra_plus_extruder_1.def.json

* Update Hellbot_Magna_2_230.obj

* Update Hellbot_Magna_2_300.obj

* Update Hellbot_Magna_2_400.obj

* Update Hellbot_Magna_2_500.obj

* Update hellbot_hidra.obj

* Update hellbot_hidra_plus.obj

* Create hellbot_hidra_plus.obj

* Add definition file for new Hellbot 3D printer

Definition file for new Hellbot 3D printer Magna SE.

* Add extruder definition file 

Add new extruder definition file for the new Hellbot 3D printer Magna SE.

* Add new obj file 

Add .obj mesh file for the new Hellbot 3D printer, Magna SE

* Add image file 

Add image file for new Hellbot 3D printer, Magna SE

* Update hellbot_hidra.def.json

* Update hellbot_hidra_plus.def.json

* Update hellbot_magna_2_230.def.json

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_400.def.json

* Update hellbot_magna_2_400_dual.def.json

* Update hellbot_magna_2_500.def.json

* Update hellbot_magna_2_500_dual.def.json

* Update hellbot_magna_I.def.json

* Update hellbot_magna_dual.def.json

* Update hellbot_magna_2_230_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_0.def.json

* Update hellbot_magna_2_400_dual_extruder_1.def.json

* Update hellbot_magna_2_500_dual_extruder_0.def.json

* Update hellbot_magna_2_500_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

Add new start and end Gcodes

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_1.def.json

* Update hellbot_magna_2_230_dual_extruder_0.def.json

* Update hellbot_magna_2_230_dual.def.json

added settings for shared heater and nozzle.

* Update hellbot_magna_2_230_dual.def.json

* Update hellbot_magna_2_300_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_300_dual.def.json

* Update hellbot_magna_2_400_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_400_dual.def.json

* Update hellbot_magna_2_500_dual.def.json

change settings for machine_extruders_share_heater to true and machine_extruders_share_nozzle to true

* Update hellbot_magna_2_500_dual.def.json
2021-12-15 18:53:08 +01:00
Ghostkeeper
0edfa89084
Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master 2021-12-14 18:46:22 +01:00
Eryone
b7e88bb021
Update Eryone thinker and er20 3d printer profile (#10650)
* 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 of profile_fast to 0.25mm

* Update eryone_thinker_fast.inst.cfg

Update the layer_height to 0.25mm

* Improving the Eryone Thinker setup

Set Definition to use Monotonic skin by default
Add Fine profile at 0.1 layer height
Change High to 0.15 layer height and number of layers to match
Change Fast to 0.25 layer height and number of layers to match

* Eryone Thinker Profile update, resolving merge

* Eryone Thinker Profile Definition & Quality Clean up

Move all the Normal settings into the core definitions
Move share setting into definition to reduce redundant values for quality profiles
Remove values from definition that match the default fdmprinter definition for easier maintence.
Change definition to only support Monotonic order on top Roof layer.

* Fixing missing [values] from normal profile

* Delete eryone_thinker_extra_fast.inst.cfg

Conflict fix

* Update eryone_thinker_fine.inst.cfg

Fix the setting version incorrectly.

* Eryone Thinker Definition Bug fix for Layer Height 0

Fixing issue when layer_height_0 value was not being resolved correctly in Cura.

* Disable the first layer cooling fan speed

* Update eryone_er20.def.json

* Add the profile

Recovery eryone_thinker_fast.inst.cfg

* Update er20 start gcode and end gcode

1. Update er20 start gcode and end gcode
2. Update nozzle offset

Co-authored-by: Demetrius Apostolopoulos <75643490+dapostol73@users.noreply.github.com>
2021-12-10 17:01:52 +01:00
aschwenck
dc56d3e22e Add new Dagoma PRO 430 printer profiles 2021-12-01 12:46:09 +01:00
VOLUMIC
bd70b7e294
Add new VOLUMIC printers model 2021-11-09 13:42:49 +01:00
Ghostkeeper
8f7ffba1f9
Fix file extension
Contributes to issue CURA-8630.
2021-11-03 17:27:49 +01:00
Ghostkeeper
c76385ca85
Merge branch 'master' of https://github.com/heed818/Cura into heed818-master 2021-11-03 15:39:24 +01:00
Ghostkeeper
4f9d2990db
Merge branch 'patch-1' of https://github.com/Hogan-Polaris/Cura into Hogan-Polaris-patch-1 2021-10-22 16:47:09 +02:00
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
Jaime van Kessel
65a35bbebc Move creaseee extruders and definitions to correct folder 2021-10-08 10:52:10 +02:00
v27jain
89070237d9
Adding 3DI D300 (#9863)
* Add files via upload

* Add files via upload

* Add files via upload

* Delete 3di_d220.def.json

* Delete 3di_d300.def.json

* Add files via upload

* Delete 3di_d220_extruder_0.def.json

* Delete 3di_d300_extruder_0.def.json

* Add files via upload

* Update 3di_d220.def.json

* Update 3di_d300.def.json

* Delete 3di_d300_platform.stl

* Add files via upload

* Update 3di_d300.def.json

* Delete 3di_d220.def.json

* Delete 3di_d220_platform.stl
2021-10-05 16:38:50 +02:00
hyu7000
46261e328b
cremaker def files added (#10409)
* test

test

* Delete 느낌표 2개.png

* Cremaker's def file

Cremaker's 3 model def files added.

* Cremaker's ext def file

Cremaker's extruder def files added.

* cremaker bed obj file

2 model size add

* change value

change to value from default value

* change value

change to value from default value

* change machine value

change to "cremaker_common" from "cremaker"

* change value

change to value from default value

* change value

change to value from default value

* change value

change to value from default value

* Update cremaker_common.def.json

* change some code for crashes to resolve
2021-10-05 16:26:03 +02:00
AnnaKang0219
585e32d241 fix errors
1.remove no-use file :xyzprinting_da_vinci_jr_wifi_pro_extruder_0.def.json
2.remove "meta" in carbon_fiber quality file.
2021-10-04 14:10:09 +08: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
AnnaKang0219
48b82a2d1f move temperature setting in material
move temperature setting in material
2021-09-29 16:52:20 +08:00
Hellbot Development Team
f2ed6d9054
Update Definitions and Extruders of Magna 2 230/300 dual
Add start and end gcode for correct change of extruders

CURA-8597 
#10298
2021-09-24 16:08:39 +02:00
Hogan-Polaris
6735f69557
Update resources/extruders/eazao_zero_extruder_0.def.json
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2021-09-24 17:27:17 +08:00
Hogan-Polaris
252731108c
Create eazao_zero_extruder_0.def.json
Add eazao zero extruder difinition file.
2021-09-23 15:58:00 +08:00
zhpt
6e2f7845c9
Add AtomStack printer definitions (#10121)
* Add files via upload

add AtomStack machine definitions

* Add files via upload

add AtomStack machine extruders

* Update resources/definitions/cambiran_maxe175.def.json

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

* Update resources/definitions/cambiran_maxe285.def.json

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

* Update resources/definitions/cambiran_proe175.def.json

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

* Update resources/definitions/cambiran_proe285.def.json

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

* Add files via upload

* Add files via upload

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* Delete cambiran_maxe175.def.json

* Delete cambiran_maxe285.def.json

* Delete cambiran_proe175.def.json

* Delete cambiran_proe285.def.json

* Delete cambrianmaxe175_extruder_1.def.json

* Delete cambrianmaxe285_extruder_1.def.json

* Delete cambrianproe175_extruder_1.def.json

* Delete cambrianproe285_extruder_1.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Update atomstack_cambrianmaxe285_extruder_0.def.json

* Update atomstack_cambrianproe175_extruder_0.def.json

* Update atomstack_cambrianproe285_extruder_0.def.json

* Update atomstack_cambrianmaxe175_extruder_0.def.json

* Create atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

* add file atomstack_cambrian_base.def.json

* Update atomstack_cambrianmaxe175.def.json

* Update atomstack_cambrianmaxe285.def.json

* Update atomstack_cambrianproe175.def.json

* Update atomstack_cambrianproe285.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-09-08 16:18:55 +02:00
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
AnnaKang0219
778855c06f Add XYZprinting Printer Definitions
Hi,
I just add Definitions for XYZprinting Printers,
Please help to check,thank you.
2021-08-17 14:12:16 +08:00
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
Jaime van Kessel
7762def1ef Merge branch 'master' of https://github.com/heed818/Cura 2021-08-12 15:20:42 +02:00
AnnaKang0219
e7e5970647 Remove the files not CZ-300
Remove the files not CZ-300
2021-08-12 09:35:15 +08:00
AnnaKang0219
c86d1638e2 Fix bugs for definition
modify Infill_pattern value setting
2021-08-09 17:20:18 +08:00
x40-Community
bb229e13c4
Merge branch 'Ultimaker:master' into master 2021-08-07 16:26:42 +02:00
nani
02e673efb5 Official Arjun Pro 300 2021-08-07 00:43:45 +05:30
goofoo3d
d709b86c16
add goofoo,renkforce printf (#8959)
* add goofoo,renkforce printf

* 优化PVA打印的配置

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

* 修改配置信息

* 添加机型配置

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

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

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

* modify setting_version = 16 to setting_version = 17

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

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

Co-authored-by: laiqiqi <laiqiqi886@163.com>
2021-08-06 15:14:24 +02:00
x40-Community
2e20ebbbd2
Merge branch 'Ultimaker:master' into master 2021-08-01 19:58:56 +02:00
Konstantinos Karmas
90d7005bc2
Merge pull request #10187 from SecKit/create_seckit_printers
Add SecKit SK-Tank and SK-Go printer definitions.
2021-07-30 11:44:13 +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
SecKit 3DP Design
2ca70b70ad
Update resources/extruders/seckit_sktank_extruder_0.def.json
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-07-28 03:27:51 +08:00
SecKit 3DP Design
32d6ff7d3b
Update resources/extruders/seckit_skgo_extruder_0.def.json
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-07-28 03:27:39 +08:00
AnnaKang0219
199b0136f0 Merge branch 'master' of https://github.com/heed818/Cura 2021-07-27 14:03:03 +08:00
AnnaKang0219
0f1f7646b8 Commit for Crazy3DPrinter
add definitions/Extruders/material
2021-07-27 13:40:40 +08:00
Ernie
6b421ef308 Add SecKit SK-Tank and SK-Go printer definitions. 2021-07-26 09:10:55 +08:00
x40-Community
48989aa5c0
Merge branch 'Ultimaker:master' into master 2021-07-25 12:52:10 +02:00
Ghostkeeper
cd7624736c
Merge branch 'mpminideltav2' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-mpminideltav2 2021-07-23 16:14:07 +02:00
root
de4ab4a453 Add WEEDO X40 printer 2021-07-23 13:53:23 +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
PurpleHullPeas
d675386358
Adding MP Mini Delta V2 Extruder 2021-07-15 07:44:24 -05:00
Ghostkeeper
c305f8b36a
Merge branch 'master' of https://github.com/v-xup6/Cura into v-xup6-master 2021-07-14 15:09:49 +02:00
Victor Lin
52b022c575
Delete atomPlus_extruder_0.def.json
Prototype machine
2021-07-13 22:42:12 +08: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