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
Jelle Spijker
3abbcc99c0
fixed top bottom pattern zigzag in profiles
...
The enum value should be placed in single quotes in double quotes
2021-10-21 17:13:25 +02:00
THeijmans
74c432428b
Fixes bug in top bottom pattern settings
...
As discussed in CCB, mistake was made which led to no skin being printed. This fixes it.
PP-44
2021-10-21 09:57:43 +02:00
THeijmans
4e4a5ff382
Fixes bug in ultimaker S3 definition
...
setting was configured twice
2021-10-21 09:52:37 +02:00
THeijmans
04f37e6283
Removes missed line width settings
...
As discussed in CCB, now every line width setting will inherit from the right place
2021-10-21 09:48:55 +02:00
THeijmans
9cc1a24e11
Moves arachne setting changes to ultimaker2 layer
...
Fixing a mistake from PP-28,
PP-44
2021-10-21 09:48:00 +02:00
Remco Burema
8c8ec5391f
Revert settings-version to the one for Arachne-builds.
2021-10-20 11:01:13 +02:00
Remco Burema
86046a32b3
Merge branch 'master' into merge_main_20211019
2021-10-20 08:38:01 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous
...
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
Ghostkeeper
a1a4d421ca
Consistent user-visible naming of Arjun Pro printers
...
Contributes to issue CURA-8580.
2021-10-15 16:13:31 +02:00
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master
2021-10-15 16:07:59 +02:00
Ghostkeeper
c6d92dc8d6
Fix combing mode override
...
This needs quotes, since it's a Python expression. Otherwise it would get interpreted as a variable name which doesn't exist.
Contributes to issue CURA-8627.
2021-10-13 17:23:09 +02:00
Ghostkeeper
f0262abbb5
Combine two property overrides in one setting, for proper JSON
...
Otherwise the maximum gets ignored because the JSON results in a dict where the keys are unique. So the second one happens to get skipped then.
Contributes to issue CURA-8627.
2021-10-13 15:46:35 +02:00
Ghostkeeper
43897b60d8
Properly use strings as values for enums in setting overrides
...
This is interpreted as a Python function, so if it doesn't have those quotes it'll be interpreted as a variable name, and that variable doesn't exist.
Contributes to issue CURA-8627.
2021-10-13 15:42:46 +02:00
Jelle Spijker
246c986d95
Merge pull request #10605 from Ultimaker/CURA-8550_lightning_infill
...
CURA-8550 Added lightning infill description and sub-settings level.
2021-10-13 12:21:29 +02:00
p.kuiper
7deb31db98
Bug fixes.
...
- Removed default value when value is already set.
- Make sure UM3 and UM3 extended variants are the same
2021-10-12 12:54:26 +02:00
p.kuiper
17ea8d0de7
Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles
...
# Conflicts:
# resources/definitions/ultimaker3.def.json
# resources/definitions/ultimaker_s3.def.json
# resources/definitions/ultimaker_s5.def.json
2021-10-12 09:31:20 +02:00
Remco Burema
e29edb0cc9
Added lightning infill description and sub-settings level.
...
part of CURA-8550
2021-10-12 09:17:58 +02:00
p.kuiper
fb645a2454
Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles
...
# Conflicts:
# resources/definitions/ultimaker3.def.json
# resources/definitions/ultimaker_s3.def.json
# resources/definitions/ultimaker_s5.def.json
2021-10-12 09:09:05 +02:00
p.kuiper
0239ce8a78
- Bug fix error due to string overrides.
...
- "Minimum_value" changed to "minimum_warning_value"
- PVA (BB0.4 and BB0.8) require low support jerk settings for good adhesion
- Support roof does follow print_jer and no warning levels set
2021-10-11 13:53:21 +02:00
p.kuiper
6c67b03a55
- Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00
2021-10-11 11:35:38 +02:00
p.kuiper
730fb72f78
Merge branch 'master' into PP-1-Improved_print_profiles
2021-10-11 08:09:05 +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
Jelle Spijker
52a38d4176
Merge pull request #9160 from Ultimaker/UMH-2021_ribbed_vaults_infill
...
UM Hackathon 2021: Add 'Ribbed Support Vaults' infill pattern.
2021-10-05 12:29:00 +02:00
AnnaKang0219
b154e4260a
fix errors
...
1.setting extruder for Jr. Wifi Pro
2.setting base quality
2021-10-04 16:48:00 +08:00
AnnaKang0219
8b5e64a4f9
remove unnecessary default_values
...
remove unnecessary default_values for ['adhesion_type']
2021-10-04 13:01:07 +08:00
AnnaKang0219
097a56bd9b
fix check error
...
remove speed_travel in definition due to the setting already in quality.
2021-10-04 11:48:49 +08:00
AnnaKang0219
8c155e8990
fix check errors
...
remove the settings in definitions if these parameter already setting in quality
2021-10-04 11:23:30 +08:00
Denis Shatilov
d9a20fd01a
Fixed Extruder hitting frame after finished print
2021-10-03 12:33:04 -07:00
Ghostkeeper
f749bbef46
Squashed commit of the following:
...
commit a82c29998f18ca940089347912b01c88a766925c
Author: Ghostkeeper <rubend@tutanota.com>
Date: Fri Oct 1 16:43:41 2021 +0200
Fix remaining merge conflict and tabs vs. spaces
Contributes to issue CURA-8604.
commit d0d8eb19e0977dead9e826949161d123f53e7c75
Merge: 6dc65a49188beb8ab6https://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 88beb8ab6848b2de0983d94d3e42fcc3e74277187830e553c0e3ec97eefab906f5bd36e5161a29b14d1da31703940df437b67009e6f43d98f7f38dc2941080f05913f908a9a1e0e7af51bc47fb61b8968c3add290e11cc224d19b918db88ebd8f73a72470ba60ac18bb84621061e3ce4bd1b862b09de80422d41b9c175c8ff19e804efd7b380ea97b88805017005882e6fb85393015810f3cbd90d251025f8617adafbe64ffc636ee688c817a654169569ba33de6badeaa11a93c482179b874efbeecd654c90bf47d81cf2e44f641c9a30886c2eda8bb140d01af1ffc07b2344d0215373c8daeb94b340ed3ae83992a2521ba3feec7924b268a37b457e916a52ffd4acb0550f6fae0b10f8f52c2fd90b6556e67168ced3ef8d982afedef9c20085cc5e36e40573ff7288831e5cb5e5c655d005b7d77d2ba75d9a886cb074fa1b4a51c257c4c8967242e64a4622f95cfa47e14765e34aedda09a40858e92c08230ef4094655bffec8fa76c7c7384a50f4d4ede093729b45c16b5fd034b60df9bfb07a807a11bb1fa060366a4367946eaa0de2121e46da5e2d5bbc8a97089c7c222bfdb6f993530f5ee97e62e8b5644f851668c07c78b92cd9da01f79d53f4147a02fd7e6e5213ae3fda1c9d7f4b3732598bff52d4f7a2ec5aee395a76e496e2018ec2c2da5caf5524927b1e8b0f44a4dd5f070c9bbcc0fcbec00fde6d23c875c61779335135178a4743c9a204ab0c7018c8224c4f88e52dcf72e6f5bf7eed5479b94eafb4d92960f70cfb592c894ec680fc108118ecb25ccf9444d00d1407214c82819d5e59635c0d96f80e23c14e7c0d67619cc2e1c1daef65519c5a034be3fecd44e7e83cef30fb37cc861c
2021-10-01 16:55:26 +02:00
Ghostkeeper
363aa765f5
Don't show Infill Overhang Angle if lightning infill is enabled
...
If the Infill Support setting was enabled but still hidden by Lightning Infill, this sub-setting could still be shown.
Contributes to issue CURA-8550.
2021-10-01 15:28:18 +02:00
Ghostkeeper
5b923d105a
Fix sorting of setting overrides
...
Keeps it maintainable in the long run.
Contributes to issue PP-1.
2021-10-01 13:55:27 +02:00
Ghostkeeper
40fd3203b8
Fix tests: Removing unnecessary default_value overrides
...
If there's a value, the default_value isn't used. This test exists to prevent confusion between the two, where a contributor could change the default_value but it gets overridden by a value.
Contributes to issue PP-1.
2021-10-01 13:52:42 +02:00
p.kuiper
f9f59d0da1
Merge branch 'master' into PP-1-Improved_print_profiles
...
# Conflicts:
# resources/definitions/ultimaker_s3.def.json
# resources/definitions/ultimaker_s5.def.json
2021-09-29 17:33:02 +02:00
p.kuiper
be9f62c5ba
- Only use monotonic order in top layer (increase print speed).
...
- Explicitly set combing mode to the new 'no_outer_surfaces' strategy
- Adjusted the engineering profiles to use 100% wall flow and triangle infill pattern
2021-09-29 16:07:26 +02:00
Jelle Spijker
d296531ffa
Merge pull request #10536 from Ultimaker/CURA-7976_Combing_strategy_to_avoid_top_and_bottom_most_suface_skins
...
CURA-7976: Combing strategy to avoid top and bottom most surface skins
2021-09-29 15:02:37 +02:00
Konstantinos Karmas
a9b792d693
Remove the value of retraction combing in S3 and S5
...
So that they can inherit the formula of calculating the retraction combing from the fdmprinter. This way, the combing will be changed according to whether the monotonic top/bottom order and ironing are used.
CURA-7976
2021-09-29 13:37:21 +02:00
Konstantinos Karmas
22e281f368
Fix using the wrong combing enum value in maker_made_300x
...
The correct enum value should be 'infill'. 'Within infill' is the display name of that enum value.
CURA-7976
2021-09-29 13:36:29 +02:00
Konstantinos Karmas
61d18f22b2
Fix combing value not being recognized
...
The value of an enum needs to be in single quotes when it is in the "value" field or else it won't be recognized.
CURA-7976
2021-09-29 13:35:21 +02:00
Jaime van Kessel
eeb56d80e5
Merge branch 'end_gcode_ender5plus' of git://github.com/mothnox/Cura
2021-09-29 13:22:17 +02:00
p.kuiper
b99267048f
Same print profile adjustments to the UM print profile as the S5 print profile, except for the maximum resolution adjustments
2021-09-29 12:58:34 +02:00
p.kuiper
7125aeb1ff
Same print profile adjustments to the S3 print profile as the S5 print profile
2021-09-29 12:35:55 +02:00
p.kuiper
5f9fc5740e
Print profile improvements:
...
- Infill pattern: from triangles to lines
=> less strong but better visual appearance on large horizontal surfaces
- Infill before walls: from true to false
=> prevent infill push out walls and show artefacts
- skin_monotonic:from false to true
=> low reduction in print time vs large quality increase
Note: this switch also sets: retraction_combing from 'all' to 'noskin'
The 'noskin' options prevents scarring in top surfaces and gloss streaking in large horizontal surfaces
See: CURA-7976 for details
- wall_material_flow: from 100% to 90%
=> reduces line width variations due to overextrusion in walls. Less gloss streaking and more uniform horizontal walls
- top_bottom_pattern: from lines to zigzag
=> prevent the short jerky travel moves of the lines pattern around the walls. Results in a nicer top surface
- meshfix_maximum_resolution from (speed_wall_0 + speed_wall_x) / 60 to (speed_wall_0 + speed_wall_x) / 150
=> reduce visibility of line segments due to rounding. This will create a higher change of a buffer underrun = surface blobs
2021-09-29 12:32:50 +02:00
AnnaKang0219
48b82a2d1f
move temperature setting in material
...
move temperature setting in material
2021-09-29 16:52:20 +08:00
Konstantinos Karmas
54aaa91bfc
Change "default_value" to "value" in malayan_m200.def.json
...
CURA-7976
2021-09-28 15:42:22 +02:00
Konstantinos Karmas
e1b56f9188
Remove "default_value" since the "value" overrides it
...
CURA-7976
2021-09-28 15:38:39 +02:00
Jaime van Kessel
40552762b7
Added inset_direction to crazyprint
...
Should have happend when removing the old setting
2021-09-28 15:22:03 +02:00
Konstantinos Karmas
f1174cb7f6
Enable the "Not on outer surfaces" combing mode if monotonic or ironing
...
The "Combing": "Not in outer surfaces" option will be activated for all extruders in the following cases:
1. Monotonic Top/Bottom Order is enabled (in any extruder)
2. Ironing is enabled (in any extruder)
3. Top Surface Skin Layers > 0 and Monotonic Top Surface Order is enabled (in any extruder)
CURA-7976
2021-09-28 15:15:37 +02:00
