27073 Commits

Author SHA1 Message Date
wanders78746
a57ab5661c
Add files via upload
Replaced mesh with simplified and much smaller version.
2021-12-20 09:40:39 -06:00
wanders78746
cb6f49d2d2
Add files via upload
MakerGear M2 V3b hotend specs.
2021-12-18 14:03:50 -06:00
wanders78746
41ba7f58d7
Update makergear_m2.def.json
Corrected platform file extension.
2021-12-18 14:02:09 -06:00
wanders78746
ceebfc6b3d
Add files via upload 2021-12-18 13:59:51 -06:00
wanders78746
ad3f876292
Rename makergear_m2_bak.def.json to makergear_m2.def.json 2021-12-18 13:56:26 -06:00
wanders78746
6f61223d9a
Add files via upload
MakerGear M2 printer definition
2021-12-18 13:52:00 -06:00
Ghostkeeper
5a1b9e8efc
Further fix automated tests for Mixware printer
Oops. Should've ran this locally while merging it.

Contributes to issue CURA-8782.
2021-12-17 16:17:04 +01:00
Ghostkeeper
51412c7512
Remove category metadata
We use the manufacturer now to categorise these.

Contributes to issue CURA-8782.
2021-12-17 16:13:06 +01:00
Ghostkeeper
ae605265b7
Use value to override settings that were a value in the parent def
Contributes to issue CURA-8782.
2021-12-17 15:50:30 +01:00
Ghostkeeper
0b4c34a20d
Use the specialised profiles for Hyper S with this printer
This printer has specialised profiles. It should use them.

Contributes to issue CURA-8782.
2021-12-17 15:45:14 +01:00
Ghostkeeper
3913d1e2ba
Fix non-existing preferred materials and extruder trains
This was causing a crash. The extruder train had a different ID. The preferred material doesn't exist so it selects a random one that does match. I've set it to be default. The preferred quality needs to refer to the quality type.

Contributes to issue CURA-8782.
2021-12-17 15:42:28 +01:00
Ghostkeeper
ce196d551a
Upgrade Mixware profiles to setting_version 19
This upgrade removes some settings, one of which was used in these profiles: Compensate Outer Wall Overlaps

Contributes to issue CURA-8782.
2021-12-17 15:35:48 +01:00
Ghostkeeper
3e96508d59
Merge branch 'master' of https://github.com/mixware011/Cura into mixware011-master 2021-12-17 15:27:02 +01:00
Casper Lamboo
e7590a1ff8
Merge pull request #11081 from Ultimaker/CURA-8081_shrinkage_plate_duplicate
Cura 8081 shrinkage plate duplicate
2021-12-16 23:18:06 +01:00
casper
411252bcef Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate
# Conflicts:
#	resources/definitions/fdmprinter.def.json
2021-12-16 23:14:20 +01:00
Ghostkeeper
c5532dc745 Don't show smoothing when removing inside corners
Smoothing only has effect on concave corners. So if there are none, it has no effect and should be removed.

Contributes to issue CURA-8081.
2021-12-16 23:11:03 +01:00
Ghostkeeper
120fad7160 Apply raft wall count only to base layer
The rest of the layers (currently) never get any walls. We'll keep it that way.

Contributes to issue CURA-8081.
2021-12-16 23:11:03 +01:00
Ghostkeeper
007e26d83e Add new setting for the number of walls around the raft
We want to be able to set this to 0. But to be most consistent with how we handle other structures in Cura I'd like to make this a numeric setting.

Contributes to issue CURA-8081.
2021-12-16 23:11:02 +01:00
Ghostkeeper
b1c297761b Move new raft setting to Experimental
It should be in experimental according to the ticket. They are still testing its validity.

Contributes to issue CURA-8081.
2021-12-16 23:11:02 +01:00
Ghostkeeper
6a01c293d2 Rename setting to Remove Inside Corners
We should know better than to name a setting after a particular printing profile (i.e. 'use this for that profile'). We name our settings as much as possible after their effect on the print.

Contributes to issue CURA-8081.
2021-12-16 23:11:02 +01:00
Remco Burema
53d3ecea8d Forgot to put shrinkage plate in settins visibility.
Is supposed to be in expert for now.

part of CURA-8081
2021-12-16 23:11:02 +01:00
Remco Burema
e230eacdae Add 'shrinkage plate' setting.
A raft can become a 'shrinkage plate', useful for materials with realtively large shrinkage, as long as it's convex.

part of CURA-8081
2021-12-16 23:11:02 +01:00
Ghostkeeper
385c02f0bd
Merge branch '4.13' 2021-12-16 17:17:08 +01:00
Ghostkeeper
5a9bafe453
Update SDK version to 7.9.0
This is going to be the new SDK version for Cura 4.13.
2021-12-16 17:15:59 +01:00
Jaime van Kessel
d59cd602ee FIx failing mypy test
CURA-8083
2021-12-16 10:00:11 +01:00
Jaime van Kessel
6c64e08299 Fix typing of scaleAreas
The change in e5be3e56dc4f04df2c6fe44bede285b04c5a5f0e wasn't quite correct

CURA-8083
2021-12-16 09:58:09 +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
casper
e5be3e56dc Use correct definition of Polygons
Only saw this error after the merge so pushing directly to master.

part of CURA-8083
2021-12-15 17:48:20 +01:00
Casper Lamboo
7c7a1016d0
Merge pull request #11075 from Ultimaker/CURA-8083_separate_z_shrinkage_comp
[CURA-8083] Separate Vertical and Horizontal Shrinkage Compensation.
2021-12-15 17:40:27 +01:00
Remco Burema
d277109cc8
Fix build-volume (related) tests.
part of CURA-8083
2021-12-15 14:42:17 +01:00
Remco Burema
f51cc84a7c
Temporary? solution for UX w.r.t. material shrinkage.
Material shrinkage now alters both the disallowed areas+, and the blue wireframe, toghether repressenting the usable build-volume. This doesn't shrink the build-plate/printer model, still keeping in line with the 'show the size of the result object in Prepare, not the resized one we do print becasue it will shrink later' principle we had originally agreed on enough. Note that the disallowed areas also take the object themzelves into account, so the user could still tell when objects are going to be printed overlapped (as the dissalowed areas of those respective models then overlap -- but not, of course, the models themselves).

part of CURA-8083
2021-12-15 12:50:01 +01:00
Jaime van Kessel
03398422dd Merge branch '4.13' of github.com:Ultimaker/Cura 2021-12-15 12:04:19 +01:00
Jaime van Kessel
998ba3631c Add missing format to error log 2021-12-15 12:03:55 +01:00
Jaime van Kessel
58719fd294 Disable material_alternate_walls for now
CURA-8079
2021-12-15 10:35:08 +01:00
casper
d2a0ef0ecb Move "Alternate Wall Directions" setting to experimental
As dictated by the ticket

CURA-8079
2021-12-15 10:34:13 +01:00
Remco Burema
281b337be6 Add setting for alternating wall directions.
This will be useful for materials that can build up a lot of stress.

part of CURA-8079
2021-12-15 10:33:38 +01:00
Ghostkeeper
fdfdb2e428
Remove Cura 4 settings
These settings have been removed and should no longer be in the profiles.
They were added during a merge, since they were updated recently for Cura 4.13. The merge 'resolved' the conflict automatically without informing me. And resolved it wrongly.
2021-12-15 10:09:42 +01:00
Ghostkeeper
0edfa89084
Merge branch 'master' of github.com:VOLUMIC/Cura into VOLUMIC-master 2021-12-14 18:46:22 +01:00
Remco Burema
b6c0a49657
Attempt to compensate build-area/volume for material shrinkage.
part of CURA-8083
2021-12-14 17:04:20 +01:00
Remco Burema
ef1a94c6e4
Split 'shrinkage compensation' in XY versus Z axis.
CURA-8083
2021-12-14 15:47:39 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Ghostkeeper
64dec9ecc1
Merge branch 'master' of https://github.com/lin-ycv/Cura into lin-ycv-master 2021-12-13 17:29:54 +01:00
Ghostkeeper
006b5e25b2
Also catch unknown keyring errors
We're confident now that we get it to not crash for most normal cases. If there is a crash here it's due to the internals of Keyring. We're catching all of the others separately anyway.

Fixes Sentry issue CURA-340.
2021-12-13 11:22:37 +01:00
Ghostkeeper
5567cc480e
Merge branch '4.13' 2021-12-13 10:18:10 +01:00
Ghostkeeper
2abfad55e0
Remove tree support from draft intent profiles
It is a global setting, so it can't currently be changed with an intent profile.
A resolve function would resolve this. But which function that should be is to be decided.

Contributes to issue CURA-8746.
2021-12-13 10:17:54 +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
Ghostkeeper
0d53408487
Merge branch '4.13' 2021-12-10 16:18:55 +01:00
Ghostkeeper
ca9c1111ff
Update version number in header files
We're currently translating for Cura 4.13, not 4.12.

Contributes to issue CURA-8753.
2021-12-10 16:15:34 +01:00
Jaime van Kessel
940c699a10 Add multiprint plugin to gitignore 2021-12-10 14:43:23 +01:00