diff --git a/README.md b/README.md index 5b49cf60db..ca3666da50 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Optimize your prints with ultra-fast slicing, intelligent support generation, an ⚠️ CAUTION:

There are several clickbait and malicious websites pretending to be Official OrcaSlicer. These sites may redirect you to dangerous downloads or contain misleading information.

-If you come across any of these in search results, please report them as unsafe or spam to help keep the community secure. +If you come across any of these in search results, please report them as unsafe or phishing to help keep the community secure. diff --git a/doc/Home.md b/doc/Home.md index 325cf1193d..7e2e0bf2f0 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -51,6 +51,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Quality Settings +![custom-gcode_quality](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_quality.svg?raw=true) Settings related to print quality and aesthetics. ![process-quality](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-quality.png?raw=true) - ![param_layer_height](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_layer_height.svg?raw=true) [Layer Height Settings](quality_settings_layer_height) @@ -65,6 +66,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Strength Settings +![custom-gcode_strength](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_strength.svg?raw=true) Settings related to print strength and durability. ![process-strength](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-strength.png?raw=true) - ![param_wall](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_wall.svg?raw=true) [Walls](strength_settings_walls) @@ -76,6 +78,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Speed Settings +![custom-gcode_speed](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_speed.svg?raw=true) Settings related to print speed and movement. ![process-speed](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-speed.png?raw=true) - ![param_speed_first](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_speed_first.svg?raw=true) [Initial Layer Speed](speed_settings_initial_layer_speed) @@ -88,6 +91,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Support Settings +![custom-gcode_support](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_support.svg?raw=true) Settings related to support structures and their properties. ![process-support](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-support.png?raw=true) - ![param_support](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_support.svg?raw=true) [Support](support_settings_support) @@ -99,6 +103,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Multimaterial Settings +![custom-gcode_multi_material](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_multi_material.svg?raw=true) Settings related to multimaterial printing. ![process-multimaterial](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-multimaterial.png?raw=true) - ![param_tower](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_tower.svg?raw=true) [Prime Tower](multimaterial_settings_prime_tower) @@ -109,6 +114,7 @@ OrcaSlicer is a powerful open source slicer for FFF (FDM) 3D Printers. This wiki ### Others Settings +![custom-gcode_other](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/custom-gcode_other.svg?raw=true) Settings related to various other print settings. ![process-others](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/GUI/process/process-others.png?raw=true) - ![param_skirt](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/param_skirt.svg?raw=true) [Skirt](others_settings_skirt) diff --git a/doc/calibration/pressure-advance-calib.md b/doc/calibration/pressure-advance-calib.md index ad96932e86..d34ebf135c 100644 --- a/doc/calibration/pressure-advance-calib.md +++ b/doc/calibration/pressure-advance-calib.md @@ -2,77 +2,88 @@ Pressure Advance is a feature that compensates for the lag in filament pressure within the nozzle during acceleration and deceleration. It helps improve print quality by reducing issues like blobs, oozing, and inconsistent extrusion, especially at corners or during fast movements. -OrcaSlicer includes three approaches for calibrating the pressure advance value. Each method has its own advantages and disadvantages. It is important to note that each method has two versions: one for a direct drive extruder and one for a Bowden extruder. Make sure to select the appropriate version for your test. - -> [!NOTE] -> [Adaptive Pressure Advance Guide](adaptive-pressure-advance-calib) +OrcaSlicer includes three approaches for calibrating the Pressure Advance value. Each method has its own advantages and disadvantages. It is important to note that each method has two versions: one for a direct-drive extruder and one for a Bowden extruder. Make sure to select the appropriate version for your test. > [!WARNING] -> **Marlin Printers:** Linear advance must be enabled in firmware (M900). +> **Marlin Printers:** Linear Advance must be enabled in firmware (M900). > **Not all printers have it enabled by default.** > [!WARNING] > **Bambulab Printers:** make sure you do not select the 'Flow calibration' option. > ![flowrate-Bambulab-uncheck](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Flow-Rate/flowrate-Bambulab-uncheck.png?raw=true) -## Line method +- [Calibration](#calibration) + - [Tower method](#tower-method) + - [Pattern method](#pattern-method) + - [Line method](#line-method) -The line method is quick and straightforward to test. However, its accuracy highly depends on your first layer quality. It is suggested to turn on the bed mesh leveling for this test. -Steps: +## Calibration + +You can use different methods to calibrate the Pressure Advance value, each with its own advantages and disadvantages. + +The results from these methods should be saved to the material profile. +![pressure_advance_enable](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pressure_advance_enable.png?raw=true) + +> [!TIP] +> Consider using the [Adaptive Pressure Advance](adaptive-pressure-advance-calib) method for more accurate results. +> Especially for high-speed printers. + +### Tower method + +The tower method may take a bit more time to complete, but it does not rely on the quality of the first layer. 1. Select the printer, filament, and process you would like to use for the test. -2. Print the project and check the result. You can select the value of the most even line and update your PA value in the filament settings. -3. In this test, a PA value of `0.016` appears to be optimal. +2. Examine each corner of the print and mark the height that yields the best overall result. +3. In this example a height of 8 mm was selected, so the Pressure Advance value should be calculated as `PressureAdvanceStart + (PressureAdvanceStep x measured)`; example: `0 + (0.002 x 8) = 0.016`. + ![pa-tower](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-tower.jpg?raw=true) + ![pa-tower-measure](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-tower-measure.jpg?raw=true) - ![pa-line](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-line.gif?raw=true) +> [!TIP] +> @ItsDeidara has made an HTML tool to help with the calculation. Check it out if those equations give you a headache [here](https://github.com/ItsDeidara/Orca-Slicer-Assistant). - ![pa-lines](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-lines.png?raw=true) - - ![pa-line-0-016](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-line-0-016.png?raw=true) - - ![pressure_advance_enable](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pressure_advance_enable.png?raw=true) - -## Pattern method +### Pattern method The pattern method is adapted from [Andrew Ellis' pattern method generator](https://ellis3dp.com/Pressure_Linear_Advance_Tool/), which was itself derived from the [Marlin pattern method](https://marlinfw.org/tools/lin_advance/k-factor.html) developed by [Sineos](https://github.com/Sineos/k-factorjs). [Instructions for using and reading the pattern method](https://ellis3dp.com/Print-Tuning-Guide/articles/pressure_linear_advance/pattern_method.html) are provided in [Ellis' Print Tuning Guide](https://ellis3dp.com/Print-Tuning-Guide/), with only a few OrcaSlicer differences to note. -Test configuration window allow user to generate one or more tests in a single projects. Multiple tests will be placed on each plate with extra plates added if needed. +The test configuration window allows the user to generate one or more tests in a single project. Multiple tests will be placed on the plate with extra plates added if needed. 1. Single test \ ![pa-pattern-single](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-pattern-single.png?raw=true) 2. Batch mode testing (multiple tests on a single plate) \ ![pa-pattern-batch](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-pattern-batch.png?raw=true) -Once test generated, one or more small rectangular prisms could be found on the plate, one for each test case. This object serves a few purposes: +Once a test is generated, one or more small rectangular prisms will be placed on the plate, one for each test case. The prism object serves a few purposes: -1. The test pattern itself is added in as custom G-Code at each layer, same as you could do by hand actually. The rectangular prism gives us the layers in which to insert that G-Code. This also means that **you'll see the full test pattern when you move to the Preview pane:** +1. The test pattern itself is added in as custom G-Code at each layer, same as you could do by hand. The rectangular prism provides the layers in which to insert that G-Code. This also means that **you'll see the full test pattern when you move to the Preview pane:** ![pa-pattern-batch-plater](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-pattern-batch-plater.png?raw=true) -1. The prism acts as a handle, enabling you to move the test pattern wherever you'd like on the plate by moving the prism -2. Each test object is pre-configured with target parameters which are reflected in the objects name. However, test parameters may be adjusted for each prism individually by referring to the object list pane: +2. The prism acts as a handle, enabling you to move the test pattern wherever you'd like on the plate by moving the prism. +3. Each test object is pre-configured with target parameters which are reflected in the object's name. Test parameters may be adjusted for each prism individually via the object list pane: ![pa-pattern-batch-objects](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-pattern-batch-objects.png?raw=true) Next, Ellis' generator provided the ability to adjust specific printer, filament, and print profile settings. You can make these same changes in OrcaSlicer by adjusting the settings in the Prepare pane as you would with any other print. When you initiate the calibration test, Ellis' default settings are applied. A few things to note about these settings: -1. Ellis specified line widths as a percent of filament diameter. The Orca pattern method does the same to provide its suggested defaults, making use of Ellis' percentages in combination with your specified nozzle diameter -2. In terms of line width, the pattern only makes use of the `Default` and `First layer` widths -3. In terms of speed, the pattern only uses the `First layer speed -> First layer` and `Other layers speed -> Outer wall` speeds -4. The infill pattern beneath the numbers cannot be changed because it's not actually an infill pattern pulled from the settings. All of the pattern G-Code is custom written, so that "infill" is, effectively, hand-drawn and so not processed through the usual channels that would enable Orca to recognize it as infill +1. Ellis specified line widths as a percent of filament diameter. The Orca pattern method does the same to provide its suggested defaults, making use of Ellis' percentages in combination with your specified nozzle diameter. +2. In terms of line width, the pattern only makes use of the `Default` and `First layer` widths. +3. In terms of speed, the pattern only uses the `First layer speed -> First layer` and `Other layers speed -> Outer wall` speeds. +4. The infill pattern beneath the numbers cannot be changed because it's not actually an infill pattern pulled from the settings. All of the pattern G-Code is custom written, so that "infill" is, effectively, hand-drawn and not processed through the usual channels that would enable Orca to recognize it as infill. -## Tower method +### Line method -The tower method may take a bit more time to complete, but it does not rely on the quality of the first layer. -The PA value for this test will be increased by 0.002 for every 1 mm increase in height. (**NOTE** 0.02 for Bowden) +The line method is quick and straightforward to test. However, its accuracy depends heavily on the quality of your first layer. It is suggested to turn on bed mesh leveling for this test. + +Steps: 1. Select the printer, filament, and process you would like to use for the test. -2. Examine each corner of the print and mark the height that yields the best overall result. -3. I selected a height of 8 mm for this case, so the pressure advance value should be calculated as `PressureAdvanceStart+(PressureAdvanceStep x measured)` example: `0+(0.002 x 8) = 0.016`. - ![pa-tower](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-tower.jpg?raw=true) - ![pa-tower-measure](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-tower-measure.jpg?raw=true) +2. Print the project and check the result. Choose the value corresponding to the most even line and update your Pressure Advance value in the filament settings. +3. In this test, a Pressure Advance value of `0.016` appears to be optimal. -> [!TIP] -> @ItsDeidara has made a html to help with the calculation. Check it out if those equations give you a headache [here](https://github.com/ItsDeidara/Orca-Slicer-Assistant). + ![pa-line](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-line.gif?raw=true) + + ![pa-lines](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-lines.png?raw=true) + + ![pa-line-0-016](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/pa/pa-line-0-016.png?raw=true) diff --git a/doc/developer-reference/Built-in-placeholders-variables.md b/doc/developer-reference/Built-in-placeholders-variables.md new file mode 100644 index 0000000000..1fd3a93b61 --- /dev/null +++ b/doc/developer-reference/Built-in-placeholders-variables.md @@ -0,0 +1,96 @@ +# Placeholders Variables + +This section describes the general built-in placeholders variables available for use in G-code scripts and configurations. + +- [Global Slicing State](#global-slicing-state) + - [Read Only](#read-only) + - [Read Write](#read-write) +- [Slicing State](#slicing-state) +- [Print Statistics](#print-statistics) +- [Objects Info](#objects-info) +- [Dimensions](#dimensions) +- [Temperatures](#temperatures) +- [Timestamps](#timestamps) +- [Presets](#presets) + +## Global Slicing State + +### Read Only + +- **zhop**: Contains Z-hop present at the beginning of the custom G-code block. + +### Read Write + +- **e_position[]**: Current position of the extruder axis. Only used with absolute extruder addressing. +- **e_restart_extra[]**: Currently planned extra extruder priming after de-retraction. +- **e_retracted[]**: Retraction state at the beginning of the custom G-code block. If the custom G-code moves the extruder axis, it should write to this variable so OrcaSlicer knows where it travels from when it gets control back. +- **position[]**: Current position of the extruder axis. Only used with absolute extruder addressing. + +## Slicing State + +- **current_extruder**: Zero-based index of currently used extruder. +- **current_object_idx**: Zero-based index of currently printed object. +- **has_wipe_tower**: Whether or not wipe tower is being generated in the print. +- **initial_extruder**: Zero-based index of the first extruder used in the print. Same as initial_tool. +- **initial_tool**: Zero-based index of the first extruder used in the print. Same as initial_extruder. +- **is_extruder_used**: Vector of booleans stating whether a given extruder is used in the print. +- **has_single_extruder_multi_material_priming**: Whether or not single extruder multi-material priming is used in the print. +- **initial_no_support_extruder**: Zero-based index of the first extruder used for printing without support. Same as initial_no_support_tool. +- **in_head_wrap_detect_zone**: Indicates if the first layer overlaps with the head wrap zone. + +## Print Statistics + +- **extruded_volume**: Total filament volume extruded per extruder during the entire print. +- **extruded_volume_total**: Total volume of filament used during the entire print. +- **extruded_weight**: Total filament weight extruded per extruder during the entire print. +- **extruded_weight_total**: Total weight of filament used during the entire print. +- **total_print_time**: Total time taken for the print. +- **total_layer_count**: Total number of layers in the print. + +## Objects Info + +- **num_objects**: Total number of objects in the print. +- **num_instances**: Total number of object instances in the print, summed over all objects. +- **scale[]**: Contains a string with the information about what scaling was applied to the individual objects. Indexing of the objects is zero-based (first object has index 0). +- **input_filename_base**: Source filename of the first object, without extension. +- **input_filename**: Full input filename of the first object. +- **plate_name**: Name of the plate sliced. + +## Dimensions + +- **first_layer_print_convex_hull**: Vector of points of the first layer convex hull. Each element has the following format: '[x, y]' (x and y are floating-point numbers in mm). +- **first_layer_print_min**: Bottom-left corner of first layer bounding box. +- **first_layer_print_max**: Top-right corner of first layer bounding box. +- **first_layer_print_size**: Size of the first layer bounding box. +- **print_bed_min**: Bottom-left corner of print bed bounding box. +- **print_bed_max**: Top-right corner of print bed bounding box. +- **print_bed_size**: Size of the print bed bounding box. +- **first_layer_center_no_wipe_tower**: First layer center without wipe tower. +- **first_layer_height**: Height of the first layer. + +## Temperatures + +- **bed_temperature**: Vector of bed temperatures for each extruder/filament. +- **bed_temperature_initial_layer**: Vector of initial layer bed temperatures for each extruder/filament. Provides the same value as first_layer_bed_temperature. +- **bed_temperature_initial_layer_single**: Initial layer bed temperature for the initial extruder. Same as bed_temperature_initial_layer[initial_extruder]. +- **chamber_temperature**: Vector of chamber temperatures for each extruder/filament. +- **overall_chamber_temperature**: Overall chamber temperature. This value is the maximum chamber temperature of any extruder/filament used. +- **first_layer_bed_temperature**: Vector of first layer bed temperatures for each extruder/filament. Provides the same value as bed_temperature_initial_layer. +- **first_layer_temperature**: Vector of first layer temperatures for each extruder/filament. + +## Timestamps + +- **timestamp**: String containing current time in yyyyMMdd-hhmmss format. +- **year**: Current year. +- **month**: Current month. +- **day**: Current day. +- **hour**: Current hour. +- **minute**: Current minute. +- **second**: Current second. + +## Presets + +Each preset's ([Print process settings](home#process-settings), [Filament/Material settings](home#material-settings), [Printer settings](home#printer-settings)) variables can be used in your G-code scripts and configurations. + +> [!TIP] +> To know the variable name you can hover your mouse over the variable in the UI. diff --git a/doc/images/Fuzzy-skin/Fuzzy-skin-billow.png b/doc/images/Fuzzy-skin/Fuzzy-skin-billow.png new file mode 100644 index 0000000000..70b1d8e024 Binary files /dev/null and b/doc/images/Fuzzy-skin/Fuzzy-skin-billow.png differ diff --git a/doc/images/Fuzzy-skin/Fuzzy-skin-classic.png b/doc/images/Fuzzy-skin/Fuzzy-skin-classic.png new file mode 100644 index 0000000000..09b3250f96 Binary files /dev/null and b/doc/images/Fuzzy-skin/Fuzzy-skin-classic.png differ diff --git a/doc/images/Fuzzy-skin/Fuzzy-skin-perlin.png b/doc/images/Fuzzy-skin/Fuzzy-skin-perlin.png new file mode 100644 index 0000000000..e2a751ba31 Binary files /dev/null and b/doc/images/Fuzzy-skin/Fuzzy-skin-perlin.png differ diff --git a/doc/images/Fuzzy-skin/Fuzzy-skin-ridged-multifractal.png b/doc/images/Fuzzy-skin/Fuzzy-skin-ridged-multifractal.png new file mode 100644 index 0000000000..0311bf2aa7 Binary files /dev/null and b/doc/images/Fuzzy-skin/Fuzzy-skin-ridged-multifractal.png differ diff --git a/doc/images/Fuzzy-skin/Fuzzy-skin-voronoi.png b/doc/images/Fuzzy-skin/Fuzzy-skin-voronoi.png new file mode 100644 index 0000000000..40c801f6be Binary files /dev/null and b/doc/images/Fuzzy-skin/Fuzzy-skin-voronoi.png differ diff --git a/doc/images/brim/brim-inner.png b/doc/images/brim/brim-inner.png new file mode 100644 index 0000000000..b6a69bd148 Binary files /dev/null and b/doc/images/brim/brim-inner.png differ diff --git a/doc/images/brim/brim-mouse-ears.png b/doc/images/brim/brim-mouse-ears.png new file mode 100644 index 0000000000..77828217ed Binary files /dev/null and b/doc/images/brim/brim-mouse-ears.png differ diff --git a/doc/images/brim/brim-outer-inner.png b/doc/images/brim/brim-outer-inner.png new file mode 100644 index 0000000000..727c46e53f Binary files /dev/null and b/doc/images/brim/brim-outer-inner.png differ diff --git a/doc/images/brim/brim-outer.png b/doc/images/brim/brim-outer.png new file mode 100644 index 0000000000..45cf6e1d57 Binary files /dev/null and b/doc/images/brim/brim-outer.png differ diff --git a/doc/images/brim/brim.png b/doc/images/brim/brim.png new file mode 100644 index 0000000000..914efdfbc2 Binary files /dev/null and b/doc/images/brim/brim.png differ diff --git a/doc/images/fill/infill-multiline-esthetic.gif b/doc/images/fill/infill-multiline-aesthetic.gif similarity index 100% rename from doc/images/fill/infill-multiline-esthetic.gif rename to doc/images/fill/infill-multiline-aesthetic.gif diff --git a/doc/images/skirt/skirt-combined.png b/doc/images/skirt/skirt-combined.png new file mode 100644 index 0000000000..b757073d20 Binary files /dev/null and b/doc/images/skirt/skirt-combined.png differ diff --git a/doc/images/skirt/skirt-per-object.png b/doc/images/skirt/skirt-per-object.png new file mode 100644 index 0000000000..696ff896bc Binary files /dev/null and b/doc/images/skirt/skirt-per-object.png differ diff --git a/doc/images/skirt/skirt.png b/doc/images/skirt/skirt.png new file mode 100644 index 0000000000..33db35a34a Binary files /dev/null and b/doc/images/skirt/skirt.png differ diff --git a/doc/images/slicing-mode/close-holes.png b/doc/images/slicing-mode/close-holes.png new file mode 100644 index 0000000000..3a8b080af4 Binary files /dev/null and b/doc/images/slicing-mode/close-holes.png differ diff --git a/doc/print_settings/others/others_settings_brim.md b/doc/print_settings/others/others_settings_brim.md index 858ca6f322..351c63c0dc 100644 --- a/doc/print_settings/others/others_settings_brim.md +++ b/doc/print_settings/others/others_settings_brim.md @@ -1,46 +1,102 @@ # Brim -Brim is a flat layer printed around the base of a model to help with adhesion to the print bed. It can be useful for models with small footprints or those that are prone to warping. +Brim is a flat layer printed around a model's base to improve adhesion to the print bed. It is useful for models with small footprints or those prone to warping. + +![brim](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/brim/brim.png?raw=true) + +- [Type](#type) + - [Auto](#auto) + - [Painted](#painted) + - [Outer](#outer) + - [Inner](#inner) + - [Outer and Inner](#outer-and-inner) + - [Mouse Ears](#mouse-ears) + - [Ear max angle](#ear-max-angle) + - [Ear detection radius](#ear-detection-radius) +- [Width](#width) +- [Brim-Object Gap](#brim-object-gap) ## Type -This controls the generation of the brim at outer and/or inner side of models. -Auto means the brim width is analyzed and calculated automatically. +Controls how the brim is generated on a model's outer and/or inner sides. + +### Auto + +The Auto brim feature computes an optimal brim width by evaluating material properties, part geometry, printing speed, and thermal characteristics. + +- Model geometry + - Uses the model's bounding box to determine dimensions. + - Height-to-area ratio: `height/(width²*length)`. +- Printing speed + - Higher maximum printing speeds generally increase the recommended brim width. +- Thermal length + - Defined as the diagonal of the model's base. + - Reference thermal lengths (material-specific): + - ABS, PA-CF, PET-CF: 100 + - PC: 40 + - TPU: 1000 +- Material adhesion coefficient + - Default: 1 + - PETG/PCTG: 2 + - TPU: 0.5 + +The computed brim width is capped at 20 mm and at 1.5× the thermal length. If the final width is under 5 mm and also less than 1.5× the thermal length, no brim will be generated (width = 0). ### Painted -Painted will generate a brim only on painted areas of the model in the Prepare tab. +Generates a brim only on areas that have been painted ![toolbar_brimears_dark](https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/toolbar_brimears_dark.svg?raw=true) in the Prepare tab . ### Outer -Outer will generate a brim around the outer perimeter of the model. -Easier to remove than inner brim but can affect the model's appearance if the brim is not removed cleanly. +Creates a brim around the model's outer perimeter. +Easier to remove than an inner brim, but may affect the model's appearance if not removed cleanly. + +![brim-outer](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/brim/brim-outer.png?raw=true) ### Inner -Inner will generate a brim around the inner perimeter of the model. -More difficult to remove than outer brim and may close the model's inner details, but can hide where the brim was removed. +Creates a brim around inner perimeters. +More difficult to remove and less effective than an outer brim and may obscure fine inner details, but it can hide the brim removal seam. + +![brim-inner](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/brim/brim-inner.png?raw=true) + +### Outer and Inner + +Creates a brim around both the outer and inner perimeters of the model. +This approach combines the **disadvantages** of both brim types, making it more difficult to remove while potentially obscuring fine details but improving overall adhesion. + +![brim-outer-inner](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/brim/brim-outer-inner.png?raw=true) + +> [!TIP] +>> Consider using a [raft](support_settings_raft) on complex models/materials. ### Mouse Ears -Mouse ears are small extensions added to the brim to help with adhesion and prevent warping. -Usually this ears are added in the corners of objects to provide additional support and affect the model's appearance less than a full brim. +Mouse ears are small, local brim extensions (typically placed near corners and sharp features) that improve bed adhesion and reduce warping while using less material than a full brim. +The geometry analysis routine selects candidate locations based on the configured angle threshold and detection radius. + +![brim-mouse-ears](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/brim/brim-mouse-ears.png?raw=true) #### Ear max angle -Maximum angle to let a brim ear appear. -If set to 0, no brim will be created. -If set to ~180, brim will be created on everything but straight sections. +Angle threshold (degrees) used to decide where mouse ears may be placed: + +- 0° — disabled; no mouse ears are generated. +- Between 0° and 180° — ears are created at features with local angles sharper (smaller) than the threshold. +- 180° — ears are allowed on almost any non-straight feature. #### Ear detection radius -The geometry will be decimated before detecting sharp angles. This parameter indicates the minimum length of the deviation for the decimation. +The geometry will be decimated before detecting sharp angles. +This parameter indicates the minimum length of the deviation for the decimation. 0 to deactivate. ## Width -Distance from model to the outermost brim line. +Distance between the model and the outermost brim line. +Increasing this value widens the brim, which can improve adhesion but increases material usage. ## Brim-Object Gap -A gap between innermost brim line and object can make brim be removed more easily. +Gap between the innermost brim line and the object. +Increasing the gap makes the brim easier to remove but reduces its adhesion benefit; very large gaps may eliminate contact and negate the brim's purpose. diff --git a/doc/print_settings/others/others_settings_fuzzy_skin.md b/doc/print_settings/others/others_settings_fuzzy_skin.md index 03234a1276..a02a11c96e 100644 --- a/doc/print_settings/others/others_settings_fuzzy_skin.md +++ b/doc/print_settings/others/others_settings_fuzzy_skin.md @@ -1,6 +1,9 @@ # Fuzzy Skin -Randomly jitter while printing the wall, so that the surface has a rough look. This setting controls the fuzzy position. +Fuzzy skin randomly perturbs the wall path to produce a deliberately rough, matte appearance on the model surface. +These settings control where the effect is applied, how the noise is generated, and how aggressive the displacement or extrusion modulation is. + +Useful for creating a textures or hide surface imperfections but will increase print time and will affect dimensional accuracy. - [Fuzzy Skin Mode](#fuzzy-skin-mode) - [Contour](#contour) @@ -26,21 +29,24 @@ Randomly jitter while printing the wall, so that the surface has a rough look. T ## Fuzzy Skin Mode +Choose which parts of the model receive the fuzzy-skin effect. + ### Contour -Use "Contour" to apply fuzzy skin only to the outer contour of the model. +Apply fuzzy skin only to the outermost contour (external perimeter) of the model. +Useful for creating a textured edge while keeping the inner surfaces smooth. ### Contour and Hole -Use "Contour and Hole" to apply fuzzy skin to the outer contour and holes of the model. This is useful for models with internal features that you want to highlight. +Apply fuzzy skin to both the outer contour and interior holes. Useful when you want the rough texture to appear on negative features as well. ### All Walls -Use "All Walls" to apply fuzzy skin to external and inner walls of the model. +Apply fuzzy skin to every wall (external and internal). This gives the strongest overall textured appearance but will increase slicing and print time considerably. ### Fuzzy Skin Generator Mode -Determines how the fuzzy skin effect will be reproduced: +Select the underlying method used to produce the fuzzy effect. Each mode has different trade-offs for strength, speed and mechanical load. ### Displacement @@ -70,39 +76,51 @@ This is a combination of Displacement and Extrusion modes. The clarity of the dr ## Noise Type -Noise type to use for fuzzy skin generation. +Select the noise algorithm used to generate the random offsets. Different noise types produce distinct visual textures. ### Classic -Classic uniform random noise. +Simple uniform random noise. Produces a coarse, irregular texture. + +![Fuzzy-skin-classic](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Fuzzy-skin/Fuzzy-skin-classic.png?raw=true) ### Perlin -Perlin noise, which gives a more consistent texture. +[Perlin noise](https://en.wikipedia.org/wiki/Perlin_noise) generates smooth, natural-looking variations with coherent structure. + +![Fuzzy-skin-perlin](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Fuzzy-skin/Fuzzy-skin-perlin.png?raw=true) ### Billow Billow noise is similar to Perlin noise, but has a clumpier appearance. It can create more pronounced features and is often used for natural textures. +![Fuzzy-skin-billow](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Fuzzy-skin/Fuzzy-skin-billow.png?raw=true) + ### Ridged Multifractal -Ridged noise with sharp, jagged features. Creates marble-like textures. +Creates sharp, jagged features and high-contrast detail. Useful for stone- or marble-like textures. + +![Fuzzy-skin-ridged-multifractal](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Fuzzy-skin/Fuzzy-skin-ridged-multifractal.png?raw=true) ### Voronoi -Voronoi noise divides the surface into voronoi cells, and displaces each one by a random amount. Creates a patchwork texture. +[Voronoi noise](https://en.wikipedia.org/wiki/Worley_noise) divides the surface into Voronoi cells and displaces each cell independently, creating a patchwork or cellular texture. + +![Fuzzy-skin-voronoi](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/Fuzzy-skin/Fuzzy-skin-voronoi.png?raw=true) ## Point distance -average distance between the random points introduced on each line segment. +Average distance between random sample points along each line segment. +Smaller values add more detail and increase computation; larger values produce coarser, faster results. ## Skin thickness -The width within which to jitter. It's advised to be below outer wall line width." +Maximum lateral width (in mm) over which points can be displaced. This defines how far the wall can be jittered. +Keep this below or near your outer wall line width and within nozzle/flow limits for reliable prints. ## Skin feature size -The base size of the coherent noise features, in mm. Higher values will result in larger features. +Base size of coherent noise features, in mm. Larger values yield bigger, more prominent structures; smaller values give fine-grained texture. ## Skin Noise Octaves @@ -110,11 +128,14 @@ The number of octaves of coherent noise to use. Higher values increase the detai ## Skin Noise Persistence -The decay rate for higher octaves of the coherent noise. Lower values will result in smoother noise. +Controls how amplitude decays across octaves. Lower persistence results in smoother noise; higher persistence keeps finer-scale detail stronger. ## Apply fuzzy skin to first layer -Whether to apply fuzzy skin on the first layer. +Enable to apply fuzzy skin to the first layer. + +> [!CAUTION] +> Can impact bed adhesion and surface contact. ## Credits diff --git a/doc/print_settings/others/others_settings_g_code_output.md b/doc/print_settings/others/others_settings_g_code_output.md index 6986d9c24e..d7a50a82bc 100644 --- a/doc/print_settings/others/others_settings_g_code_output.md +++ b/doc/print_settings/others/others_settings_g_code_output.md @@ -1,27 +1,52 @@ # G-Code Output -G-code output settings control how the G-code is generated and formatted. These settings can affect the readability of the G-code, the efficiency of the print, and compatibility with various firmware, printers and post-processing tools. +These settings control how G-code is generated and formatted. They impact readability, file size, print behavior, and compatibility with firmware and post-processing tools. + +- [Reduce Infill Retraction](#reduce-infill-retraction) +- [Add line number](#add-line-number) +- [Verbose G-code](#verbose-g-code) +- [Label Objects](#label-objects) +- [Exclude Objects](#exclude-objects) +- [Filename Format](#filename-format) ## Reduce Infill Retraction -Don't retract when the travel is in infill area absolutely. That means the oozing can't been seen. This can reduce times of retraction for complex model and save printing time, but make slicing and G-code generating slower. +When enabled, the slicer will skip retractions for travel moves that occur entirely inside infill regions. This reduces the number of retractions and can speed up printing for complex models, but it may increase oozing or stringing inside infill. Slicing time may also increase slightly. + +**Recommended** when internal cosmetic quality is not critical and you want fewer retractions. ## Add line number -Enable this to add line number(Nx) at the beginning of each G-code line. +Prefix each G-code line with a sequential line number (N1, N2, ...). Useful for debugging or tools that expect numbered G-code. ## Verbose G-code -Enable this to get a commented G-code file, with each line explained by a descriptive text. If you print from SD card, the additional weight of the file could make your firmware slow down. +Include descriptive comments for G-code lines and blocks to make the file human-readable and easier to debug. +Verbose mode produces much larger files and may slow down SD-card printing on some printers. ## Label Objects -Enable this to add comments into the G-code labeling print moves with what object they belong to, which is useful for the Octoprint CancelObject plugin. This settings is NOT compatible with Single Extruder Multi Material setup and Wipe into Object / Wipe into Infill. +Insert comments that label moves with the object they belong to (object index or name). This is useful for integrations such as OctoPrint's Cancel Object plugin and for human inspection of the G-code. + +> [!IMPORTANT] +> Object labelling is not compatible with Single-Extruder Multi-Material configurations or with "Wipe into Object" / "Wipe into Infill" strategies. +> When those features are active, labels may be omitted. ## Exclude Objects -Enable this option to add EXCLUDE OBJECT command in G-code. +Add an `EXCLUDE OBJECT` marker or command in the exported G-code for objects flagged as excluded. This helps post-processors or custom scripts recognise excluded parts. ## Filename Format -Users can define the project file name when exporting. +Define a filename template for exported G-code. Templates may include tokens like project name, date, or other metadata to produce consistent and informative filenames on export. + +For example: + +```c++ +{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode +``` + +Can be used to generate filenames like `OrcaCube_PLA_1h15m.gcode`. + +> [!TIP] +> Check [Built in placeholders variables](built-in-placeholders-variables) for available tokens and their meanings. diff --git a/doc/print_settings/others/others_settings_notes.md b/doc/print_settings/others/others_settings_notes.md index 0699e320fd..59b9472ae4 100644 --- a/doc/print_settings/others/others_settings_notes.md +++ b/doc/print_settings/others/others_settings_notes.md @@ -1,3 +1,11 @@ # Notes -You can put your notes regarding the filament here. +You can put your notes regarding the filament. +This will result in a commented note inside the G-code. + +```gcode +; notes: Sliced with OrcaSlicer, the best slicer. +``` + +> [!TIP] +> Check [Built in placeholders variables](built-in-placeholders-variables) for available tokens and their meanings. diff --git a/doc/print_settings/others/others_settings_post_processing_scripts.md b/doc/print_settings/others/others_settings_post_processing_scripts.md index 8b933b7d23..d78af523fd 100644 --- a/doc/print_settings/others/others_settings_post_processing_scripts.md +++ b/doc/print_settings/others/others_settings_post_processing_scripts.md @@ -1,3 +1,12 @@ # Post-Processing Scripts -Here you can set up post-processing scripts that will be executed after slicing. This allows you to modify the G-code output or perform additional tasks. +Here you can set up post-processing scripts that will be executed after slicing. +This allows you to modify the G-code output or perform additional tasks. + +Check the script's documentation for dependencies, available parameters and usage instructions. + +Example Python script: + +```shell +"C:\Your\Path\To\Python\python.exe" "C:\Your\Path\To\Script\pythonScript.py" -parameterToScript 1994; +``` diff --git a/doc/print_settings/others/others_settings_skirt.md b/doc/print_settings/others/others_settings_skirt.md index 6d695c9999..0f2ef8b4ab 100644 --- a/doc/print_settings/others/others_settings_skirt.md +++ b/doc/print_settings/others/others_settings_skirt.md @@ -1,15 +1,42 @@ # Skirt -Skirts are additional perimeters printed at the base of the model to prime the nozzle. +A skirt is one or more additional perimeters printed around the model outline on the first layer(s). It helps prime the hotend, stabilise extrusion before the model starts, and can act as a basic wind/draft shield when built taller. + +- [Loops](#loops) +- [Type](#type) + - [Combined](#combined) + - [Per object](#per-object) +- [Minimum extrusion Length](#minimum-extrusion-length) +- [Distance](#distance) +- [Start point](#start-point) +- [Speed](#speed) +- [Height](#height) +- [Shield](#shield) +- [Single loop after first layer](#single-loop-after-first-layer) ## Loops -Number of loops for the skirt. Zero means disabling skirt. +Number of skirt loops to print. +Usually 2 loops are recommended but increasing loops improve priming and give a larger buffer between the nozzle and the part, at the cost of extra filament and time. +Set to 0 to disable the skirt. + +![skirt](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/skirt/skirt.png?raw=true) ## Type -- Combined - single skirt for all objects. -- Per object - individual object skirt. +### Combined + +A single skirt that surrounds all objects on the bed. + Recommended for general use. + +![skirt-combined](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/skirt/skirt-combined.png?raw=true) + +### Per object + +Each object gets its own skirt printed separately. + Recommended when using [Print sequence by object](others_settings_special_mode#by-object). + +![skirt-per-object](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/skirt/skirt-per-object.png?raw=true) ## Minimum extrusion Length @@ -19,28 +46,34 @@ Final number of loops is not taking into account while arranging or validating o ## Distance -Distance from skirt to brim or object. +Distance from skirt to brim or object. +Increasing this distance can help avoid collisions with brims or supports, but will increase the footprint of the skirt and filament usage. ## Start point -Angle from the object center to skirt start point. Zero is the most right position, counter clockwise is positive angle. +Start angle for the skirt relative to the object centre. 0° is the right-most position (along the +X axis), angles increase counter-clockwise. +Use this to control where the skirt begins to better align with part features or prime locations. ## Speed -Speed of skirt, in mm/s. Zero means use default layer extrusion speed. +Printing speed for the skirt in mm/s. Set to 0 to use the default first-layer extrusion speed. +Slower speeds give a more reliable prime; very fast skirt speeds may not adhere properly and come off, causing problems with the part. ## Height -How many layers of skirt. Usually only one layer. +Number of layers the skirt should be printed for. Usually 1 layer for priming. Increase the height if you want a taller draft shield effect. ## Shield -A draft shield is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft. It is usually needed only with open frame printers, i.e. without an enclosure. -"Enabled = skirt is as tall as the highest printed object. Otherwise 'Skirt height' is used. +When enabled the skirt can be printed as a draft shield: a taller wall surrounding the part to help protect prints (especially ABS/ASA) from drafts and sudden temperature changes. +This is most useful for open-frame printers without an enclosure. + +- If set to follow the highest object, the shield will be as tall as the tallest printed model on the bed. +- Otherwise it will use the value specified in "Skirt height". > [!NOTE] -> With the draft shield active, the skirt will be printed at skirt distance from the object. Therefore, if brims are active it may intersect with them. To avoid this, increase the skirt distance value. +> With the draft shield active, the skirt will be printed at [skirt distance](#distance) from the object. Therefore, if brims are active it may intersect with them. To avoid this, increase the skirt distance value. ## Single loop after first layer -Limits the draft shield loops to one wall after the first layer. This is useful, on occasion, to conserve filament but may cause the draft shield to warp / crack. +When enabled, limits the draft shield to a single wall after the first layer (i.e. only one loop is printed on subsequent shield layers). This reduces filament and print time but makes the shield less robust and more prone to warping or cracking. diff --git a/doc/print_settings/others/others_settings_special_mode.md b/doc/print_settings/others/others_settings_special_mode.md index 26a224500b..7945cd819a 100644 --- a/doc/print_settings/others/others_settings_special_mode.md +++ b/doc/print_settings/others/others_settings_special_mode.md @@ -1,5 +1,7 @@ # Special Mode +These settings control advanced slicing and printing behaviours, such as how layers are processed, object printing order, and special effects like spiral vase mode. + - [Slicing Mode](#slicing-mode) - [Regular](#regular) - [Close Holes](#close-holes) @@ -21,54 +23,66 @@ The slicing mode determines how the model is sliced into layers and how the G-co ### Regular -This is the default slicing mode. It slices the model layer by layer, generating G-code for each layer. +This is the default slicing mode. It slices the model layer by layer, generating G-code for each layer. +Use this for most prints where no special modifications are needed. ### Close Holes -Use "Close holes" to close all holes in the model. +Use "Close holes" to automatically close all holes in the model during slicing in the XY plane. +This can help with models that have gaps or incomplete surfaces, ensuring a more solid print. + +![close-holes](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/slicing-mode/close-holes.png?raw=true) ### Even Odd -Use "Even-odd" for 3DLabPrint airplane models. +Use "Even-odd" for specific models like [3DLabPrint](https://3dlabprint.com) airplane models. This mode applies a special slicing algorithm that may be required for certain proprietary or experimental prints. ## Print Sequence -How multiple objects are printed in a single print job. +This setting controls how multiple objects are printed in a single print job. ### By Layer -This option prints all objects layer by layer, one layer at a time. +This option prints all objects layer by layer, one layer at a time. This is efficient for multi-part prints as it minimises travel time between objects and can improve overall print speed. #### Intra-layer order -Print order within a single layer. +Determines the print order within a single layer. -- **Default**: Prints objects based on their position in the bed and travel distance. -- **As object list**: Prints objects in the order they are listed in the object list. +- **Default**: Prints objects based on their position on the bed and travel distance to optimise movement. +- **As object list**: Prints objects in the order they appear in the object list, which can be useful for custom sequencing or debugging. ### By Object -This option prints each object completely before moving on to the next object. +This option prints each object completely before moving on to the next object. This is better for prints where objects need to cool separately or when using different materials per object, but it may increase total print time due to more travel moves. + +This setting requires more models separation and may not be suitable for all print scenarios. ## Spiral vase -Spiralize smooths out the z moves of the outer contour. And turns a solid model into a single walled print with solid bottom layers. The final generated model has no seam. +Spiral vase mode transforms a solid model into a single-walled print with solid bottom layers, eliminating seams by continuously spiralling the outer contour. +This creates a smooth, vase-like appearance. ### Smooth Spiral -Smooth Spiral smooths out X and Y moves as well, resulting in no visible seam at all, even in the XY directions on walls that are not vertical. +When enabled, Smooth Spiral smooths out X and Y moves as well, resulting in no visible seams even on non-vertical walls. +This produces the smoothest possible spiral print. #### Max XY Smoothing -Maximum distance to move points in XY to try to achieve a smooth spiral. If expressed as a %, it will be computed over nozzle diameter. +Maximum distance to move points in XY to achieve a smooth spiral. If expressed as a percentage, it is calculated relative to the nozzle diameter. +Higher values allow more smoothing but may distort the model slightly. ### Spiral starting flow ratio -Sets the starting flow ratio while transitioning from the last bottom layer to the spiral. Normally the spiral transition scales the flow ratio from 0% to 100% during the first loop which can in some cases lead to under extrusion at the start of the spiral. +Sets the starting flow ratio when transitioning from the last bottom layer to the spiral. +Normally, the flow scales from 0% to 100% during the first loop, which can sometimes cause under-extrusion at the start. +Adjust this to fine-tune the transition and prevent issues. ### Spiral finishing flow ratio -Sets the finishing flow ratio while ending the spiral. Normally the spiral transition scales the flow ratio from 100% to 0% during the last loop which can in some cases lead to under extrusion at the end of the spiral. +Sets the finishing flow ratio when ending the spiral. Normally, the flow scales from 100% to 0% during the last loop, which can lead to under-extrusion at the end. +Use this to control the ending and ensure consistent extrusion. ## Timelapse diff --git a/doc/print_settings/strength/infill_desc_calculator.xlsx b/doc/print_settings/strength/infill_desc_calculator.xlsx index 266ee309b6..a76f943a91 100644 Binary files a/doc/print_settings/strength/infill_desc_calculator.xlsx and b/doc/print_settings/strength/infill_desc_calculator.xlsx differ diff --git a/doc/print_settings/strength/strength_settings_infill.md b/doc/print_settings/strength/strength_settings_infill.md index 6ff90f7f5f..78c0ae54a4 100644 --- a/doc/print_settings/strength/strength_settings_infill.md +++ b/doc/print_settings/strength/strength_settings_infill.md @@ -14,6 +14,8 @@ Infill is the internal structure of a 3D print, providing strength and support. - [Anchor](#anchor) - [Internal Solid Infill](#internal-solid-infill) - [Extra Solid Infill](#extra-solid-infill) + - [Interval Pattern](#interval-pattern) + - [Explicit Layer List](#explicit-layer-list) - [Sparse Infill Pattern](#sparse-infill-pattern) - [Credits](#credits) @@ -60,7 +62,7 @@ This setting allows you to generate your selected [infill pattern](#sparse-infil - **Fire-retardant applications:** Some flame-resistant materials (like PolyMax PC-FR) require a minimum printed wall/infill thickness—often 1.5–3 mm—to comply with standards. Since infill contributes to overall part thickness, using multiple lines helps achieve the necessary thickness without switching to a large nozzle or printing with 100% infill. This is especially useful for high-temperature materials like PC, which are prone to warping when fully solid. - Creating **aesthetic** infill patterns (like [Grid](strength_settings_patterns#grid) or [Honeycomb](strength_settings_patterns#honeycomb)) with multiple line widths—without relying on CAD modeling or being limited to a single extrusion width. -![infill-multiline-esthetic](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/fill/infill-multiline-esthetic.gif?raw=true) +![infill-multiline-aesthetic](https://github.com/SoftFever/OrcaSlicer/blob/main/doc/images/fill/infill-multiline-aesthetic.gif?raw=true) > [!WARNING] > For self intersecting infills (e.g. [Cubic](strength_settings_patterns#cubic), [Grid](strength_settings_patterns#grid)) multiline count greater than 3 may cause layer shift, extruder clog or other issues due to overlapping of lines on intersection points. diff --git a/doc/print_settings/strength/strength_settings_patterns.md b/doc/print_settings/strength/strength_settings_patterns.md index d1ff653f86..5c75756a41 100644 --- a/doc/print_settings/strength/strength_settings_patterns.md +++ b/doc/print_settings/strength/strength_settings_patterns.md @@ -429,8 +429,8 @@ Fills the area with progressively smaller versions of the outer contour, creatin ## Hilbert Curve -Hilbert Curve is a space-filling curve that can be used to create a continuous infill pattern. It is known for its Esthetic appeal and ability to fill space efficiently. -Print speed is very low due to the complexity of the path, which can lead to longer print times. It is not recommended for structural parts but can be used for Esthetic purposes. +Hilbert Curve is a space-filling curve that can be used to create a continuous infill pattern. It is known for its Aesthetic appeal and ability to fill space efficiently. +Print speed is very low due to the complexity of the path, which can lead to longer print times. It is not recommended for structural parts but can be used for Aesthetic purposes. - **Horizontal Strength (X-Y):** Low - **Vertical Strength (Z):** Normal @@ -462,7 +462,7 @@ Spiral pattern that fills the area with concentric arcs, creating a smooth and c ## Octagram Spiral -Esthetic pattern with low strength and high print time. +Aesthetic pattern with low strength and high print time. - **Horizontal Strength (X-Y):** Low - **Vertical Strength (Z):** Normal diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 5dc2cd5328..98a5d6ad32 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -11371,7 +11371,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -11386,7 +11386,7 @@ msgstr "" msgid "°" msgstr "" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 995d10933c..6cef83f7fe 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -13039,7 +13039,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -13054,7 +13054,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index bc32064243..8e535a3913 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -12208,7 +12208,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12223,7 +12223,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index f98d26c1f3..bd91233462 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -13225,7 +13225,7 @@ msgstr "" "Dieser Parameter fügt jeder Schicht der Füllung eine leichte Verschiebung " "hinzu, um eine Kreuzstruktur zu erzeugen." -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "Infill-Rotationsvorlage" msgid "" @@ -13247,7 +13247,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "Rotationsvorlage für massive Füllung" msgid "" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 9fb6f0c341..0bcd4b915a 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -11684,7 +11684,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -11699,7 +11699,7 @@ msgstr "" msgid "°" msgstr "" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index af6ca84324..b2893dd789 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -12921,7 +12921,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12936,7 +12936,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 88cfbe4f7e..e2a2fbeb55 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -13205,7 +13205,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -13220,7 +13220,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index f97e36f5df..1d4cb1a9de 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -12012,7 +12012,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12027,7 +12027,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index d9558c7ae8..b1d46b60d5 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -13120,7 +13120,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -13135,7 +13135,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "Rotazione del riempimento solido" msgid "" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index ced5819a79..57079e0a13 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -11731,7 +11731,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -11746,7 +11746,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 7b139d5262..a199c7641e 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -12491,7 +12491,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12506,7 +12506,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index 74e55141bf..bc7d9d788c 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -12902,7 +12902,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12917,7 +12917,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index 10adce1ad3..2ca1d95f86 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -12190,7 +12190,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12205,7 +12205,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 78d566169d..e36bb131fb 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -12961,7 +12961,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12976,7 +12976,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 58f994dcce..cb79544a84 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -13057,7 +13057,7 @@ msgstr "" "Este parâmetro adiciona um leve deslocamento a cada camada de preenchimento " "para criar uma textura cruzada." -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "Gabarito de rotação de preenchimento esparso" msgid "" @@ -13079,7 +13079,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "Gabarito de rotação de preenchimento sólido" msgid "" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 9fdf5507ec..31dc40c67e 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -13197,7 +13197,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -13218,7 +13218,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "Поворот шаблона сплошного заполнения" msgid "" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 340684cf73..c92767b722 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -11950,7 +11950,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -11965,7 +11965,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 2a569b6734..8efe7ebce1 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -12327,7 +12327,7 @@ msgstr "" "Bu parametre, çapraz bir doku oluşturmak için her dolgu katmanına hafif bir yer " "değiştirme ekler." -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "Seyrek dolgu döndürme şablonu" msgid "" @@ -12346,7 +12346,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "Katı dolgu döndürme şablonu" msgid "" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index c8744d573a..20ba6eee2a 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -12966,7 +12966,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12981,7 +12981,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 0f18e2396f..7bfc92b261 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -11875,7 +11875,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -11890,7 +11890,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index b706724090..55a6e275cb 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -24,19 +24,19 @@ msgid "Current AMS humidity" msgstr "目前 AMS 濕度" msgid "Drying" -msgstr "" +msgstr "烘乾" msgid "Idle" msgstr "閒置" msgid "Humidity" -msgstr "" +msgstr "濕度" msgid "Temperature" msgstr "溫度" msgid "Left Time" -msgstr "" +msgstr "剩餘時間" msgid "Serial:" msgstr "序號:" @@ -190,10 +190,10 @@ msgid "Toggle Wireframe" msgstr "顯示/隱藏線框" msgid "Remap filaments" -msgstr "" +msgstr "重新配置列印線材" msgid "Remap" -msgstr "" +msgstr "重新配置" msgid "Cancel" msgstr "取消" @@ -260,19 +260,19 @@ msgid "mm" msgstr "mm" msgid "Part selection" -msgstr "" +msgstr "選擇零件" msgid "Fixed step drag" -msgstr "" +msgstr "以固定間距拖曳" msgid "Single sided scaling" -msgstr "" +msgstr "單側縮放" msgid "Position" msgstr "位置" msgid "Rotate (relative)" -msgstr "" +msgstr "旋轉(相對)" msgid "Scale ratios" msgstr "縮放比例" @@ -308,16 +308,16 @@ msgid "World coordinates" msgstr "世界座標" msgid "Reset current rotation to the value when open the rotation tool." -msgstr "" +msgstr "重設旋轉角度為開啟旋轉工具時的狀態。" msgid "Rotate (absolute)" -msgstr "" +msgstr "旋轉(絕對)" msgid "Reset current rotation to real zeros." -msgstr "" +msgstr "將旋轉角度歸零" msgid "Part coordinates" -msgstr "" +msgstr "零件座標" #. TRN - Input label. Be short as possible msgid "Size" @@ -2126,7 +2126,7 @@ msgid_plural "%1$d non-manifold edges" msgstr[0] "%1$d 個非流形邊緣" msgid "Click the icon to repair model object" -msgstr "" +msgstr "點擊圖示來修復模型" msgid "Right button click the icon to drop the object settings" msgstr "滑鼠右鍵點擊此圖示以放棄物件的列印設定" @@ -2173,7 +2173,7 @@ msgid "" msgstr "切換到物件設定模式編輯所選物件的列印參數。" msgid "Remove paint-on fuzzy skin" -msgstr "" +msgstr "移除塗刷的絨毛效果" msgid "Delete connector from object which is a part of cut" msgstr "刪除的連接件屬於切割物件的一部分" @@ -2208,7 +2208,7 @@ msgid "Deleting the last solid part is not allowed." msgstr "不允許刪除物件的最後一個實體零件。" msgid "The target object contains only one part and can not be split." -msgstr "" +msgstr "目標物件只有一個部件,無法進行拆分。" msgid "Assembly" msgstr "組合體" @@ -2399,7 +2399,7 @@ msgid "Pause:" msgstr "暫停:" msgid "Custom Template:" -msgstr "自訂模板:" +msgstr "自訂範本:" msgid "Custom G-code:" msgstr "自訂 G-code:" @@ -2429,7 +2429,7 @@ msgid "Insert custom G-code at the beginning of this layer." msgstr "在該層的初始位置插入自訂 G-code。" msgid "Add Custom Template" -msgstr "新增自訂模板" +msgstr "新增自訂範本" msgid "Insert template custom G-code at the beginning of this layer." msgstr "在該層的初始位置插入模板自訂 G-code。" @@ -2444,7 +2444,7 @@ msgid "Delete Pause" msgstr "刪除暫停列印" msgid "Delete Custom Template" -msgstr "刪除自訂模板" +msgstr "刪除自訂範本" msgid "Edit Custom G-code" msgstr "編輯自訂 G-code" @@ -2730,7 +2730,7 @@ msgstr "已成功傳送。將自動跳至 %ss 中的下一頁" #, c-format, boost-format msgid "Access code:%s IP address:%s" -msgstr "" +msgstr "訪問代碼:%s IP 位址:%s" msgid "An SD card needs to be inserted before printing via LAN." msgstr "透過區域網路列印之前需要插入 SD 記憶卡。" @@ -2985,10 +2985,10 @@ msgid "AMS Slots" msgstr "AMS 槽內線材" msgid "Left AMS" -msgstr "" +msgstr "左側 AMS" msgid "Right AMS" -msgstr "" +msgstr "右側 AMS" msgid "" "Note: Only the AMS slots loaded with the same material type can be selected." @@ -3713,11 +3713,13 @@ msgid "" "Lock depth should smaller than skin depth.\n" "Reset to 50% of skin depth." msgstr "" +"鎖定深度必須小於表面深度。\n" +"已重設為表面深度的 50%。" msgid "" "Both [Extrusion] and [Combined] modes of Fuzzy Skin require the Arachne Wall " "Generator to be enabled." -msgstr "" +msgstr "Fuzzy Skin 的 [擠出] 與 [結合] 模式需搭配啟用 Arachne Wall 產生器。" msgid "" "Change these settings automatically?\n" @@ -3725,6 +3727,9 @@ msgid "" "No - Disable Arachne Wall Generator and set [Displacement] mode of the " "Fuzzy Skin" msgstr "" +"要自動調整這些設定嗎?\n" +"是 - 啟用 Arachne Wall 產生器\n" +"否 - 關閉 Arachne Wall 產生器,並將 Fuzzy Skin 設定為 [位移] 模式" msgid "" "Spiral mode only works when wall loops is 1, support is disabled, top shell " @@ -4042,14 +4047,14 @@ msgid "Some extension in the input is invalid" msgstr "輸入的副檔名無效" msgid "This parameter expects a valid template." -msgstr "" +msgstr "此參數必須對應一個有效的範本" #, boost-format msgid "Invalid format. Expected vector format: \"%1%\"" msgstr "無效格式,應該是「%1%」這種格式" msgid "Pick" -msgstr "" +msgstr "選取" msgid "Layer Height" msgstr "層高" @@ -4506,7 +4511,7 @@ msgid "Connect Printer (LAN)" msgstr "連接列印設備(區域網路)" msgid "Please input the printer access code:" -msgstr "請輸入列印設備存取碼:" +msgstr "請輸入列印設備訪問代碼:" msgid "" "You can find it in \"Settings > Network > Connection code\"\n" @@ -4884,22 +4889,22 @@ msgid "Max flowrate" msgstr "最大體積流量" msgid "Junction Deviation" -msgstr "" +msgstr "轉折偏移值" msgid "Junction Deviation calibration" -msgstr "" +msgstr "轉折偏移校正" msgid "Cornering" -msgstr "" +msgstr "轉角控制" msgid "Input Shaping Frequency" -msgstr "" +msgstr "輸入震動抑制頻率" msgid "Input Shaping Damping/zeta factor" -msgstr "" +msgstr "輸入震動抑制的阻尼因子(ζ 值)" msgid "Input Shaping" -msgstr "" +msgstr "輸入震動補償" msgid "VFA" msgstr "VFA" @@ -5336,7 +5341,7 @@ msgid "Camera" msgstr "攝影機" msgid "Storage" -msgstr "" +msgstr "儲存空間" msgid "Camera Setting" msgstr "攝影機設定" @@ -5369,10 +5374,10 @@ msgid "Debug Info" msgstr "除錯資訊" msgid "No Storage" -msgstr "" +msgstr "沒有可用的儲存空間" msgid "Storage Abnormal" -msgstr "" +msgstr "儲存狀態異常" msgid "Cancel print" msgstr "取消列印" @@ -5741,7 +5746,7 @@ msgid "Cut connectors" msgstr "切割連接件" msgid "Paint-on fuzzy skin" -msgstr "" +msgstr "塗刷絨毛表面效果" msgid "Layers" msgstr "層" @@ -6565,11 +6570,11 @@ msgid "Enable network plugin" msgstr "啟用網路外掛程式" msgid "Use legacy network plugin (Takes effect after restarting Orca)" -msgstr "" +msgstr "使用舊版網路外掛(重新啟動 Orca 後生效)" msgid "" "Disable to use latest network plugin that supports new BambuLab firmwares." -msgstr "" +msgstr "停用此選項將改用最新網路外掛,該外掛支援新版 BambuLab 韌體。" msgid "Check for stable updates only" msgstr "僅檢查穩定版更新" @@ -6654,10 +6659,10 @@ msgid "If enabled, reverses the direction of zoom with mouse wheel." msgstr "啟用後,改變滑鼠滾輪縮放方向。" msgid "Orbit speed multiplier" -msgstr "" +msgstr "視角旋轉速度倍率" msgid "Multiplies the orbit speed for finer or coarser camera movement." -msgstr "" +msgstr "調整視角速度,使鏡頭移動更細緻或更快速。" msgid "Show splash screen" msgstr "顯示啟動動畫" @@ -6693,11 +6698,11 @@ msgid "" msgstr "啟用後,Orca 會記住且自動切換各機臺線材與列印設定。" msgid "Show the step mesh parameter setting dialog." -msgstr "" +msgstr "顯示 STEP 網格參數設定視窗。" msgid "" "If enabled,a parameter settings dialog will appear during STEP file import." -msgstr "" +msgstr "啟用後,匯入 STEP 檔案時會顯示參數設定視窗。" msgid "Multi-device Management (Take effect after restarting Orca Slicer)." msgstr "多臺設備管理 (需重開 Orca)" @@ -7283,7 +7288,7 @@ msgid "" msgstr "正在連接列印設備。連接過程中無法取消。" msgid "Input access code" -msgstr "輸入存取碼" +msgstr "輸入訪問代碼" msgid "" "Caution to use! Flow calibration on Textured PEI Plate may fail due to the " @@ -7477,7 +7482,7 @@ msgstr "" msgid "" "Enabling both precise Z height and the prime tower may cause the size of " "prime tower to increase. Do you still want to enable?" -msgstr "" +msgstr "同時啟用精確 Z 軸高度與換料塔功能,可能會讓換料塔變大。是否仍要啟用?" msgid "" "A prime tower is required for smooth timelapse. There may be flaws on the " @@ -7967,7 +7972,7 @@ msgid "Pause G-code" msgstr "暫停 G-code" msgid "Template Custom G-code" -msgstr "模板自訂 G-code" +msgstr "自訂 G-code 範本" msgid "Motion ability" msgstr "移動能力" @@ -7976,10 +7981,10 @@ msgid "Normal" msgstr "普通" msgid "Resonance Avoidance" -msgstr "" +msgstr "避免共振" msgid "Resonance Avoidance Speed" -msgstr "" +msgstr "避免共振速度" msgid "Speed limitation" msgstr "速度限制" @@ -8017,7 +8022,7 @@ msgstr "單擠出機多線材參數" #, c-format, boost-format msgid "Extruder %d" -msgstr "" +msgstr "擠出機 %d" msgid "" "This is a single extruder multi-material printer, diameters of all extruders " @@ -8078,6 +8083,9 @@ msgid "" "If the preset corresponds to a filament currently in use on your printer, " "please reset the filament information for that slot." msgstr "" +"確定要刪除這個預設設定嗎? \n" +"若該預設目前正用於列印機中的某個材料," +"請務必重新設定該位置的材料資訊。" #, boost-format msgid "Are you sure to %1% the selected preset?" @@ -8383,16 +8391,16 @@ msgstr "" #, boost-format msgid "For constant flow rate, hold %1% while dragging." -msgstr "" +msgstr "若要保持固定流速,拖曳時請按住 %1%。" msgid "Total ramming" -msgstr "" +msgstr "總擠出量" msgid "Volume" -msgstr "" +msgstr "體積" msgid "Ramming line" -msgstr "" +msgstr "擠出線" msgid "Auto-Calc" msgstr "自動計算" @@ -8542,7 +8550,7 @@ msgstr "" "没有选择零件时调整当项目所有零件的朝向" msgid "Shift+Q" -msgstr "" +msgstr "Shift+Q" msgid "Auto orients all objects on the active plate." msgstr "自动调整活动板上的所有物体的方向。" @@ -8662,7 +8670,7 @@ msgid "Gizmo mesh boolean" msgstr "線框網格布林運算" msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "" +msgstr "Gizmo FDM 塗刷絨毛表面效果" msgid "Gizmo SLA support points" msgstr "SLA 支撐點" @@ -8674,13 +8682,13 @@ msgid "Gizmo text emboss/engrave" msgstr "浮雕/雕刻文字工具" msgid "Gizmo measure" -msgstr "Gizmo " +msgstr "測量" msgid "Gizmo assemble" -msgstr "Gizmo " +msgstr "組裝" msgid "Gizmo brim ears" -msgstr "Gizmo " +msgstr "擴邊耳工具" msgid "Zoom in" msgstr "放大" @@ -8830,7 +8838,7 @@ msgid "Confirm and Update Nozzle" msgstr "確認並更新噴嘴" msgid "Connect the printer using IP and access code" -msgstr "透過 IP 和存取碼連接列印設備" +msgstr "透過 IP 和訪問代碼連接列印設備" msgid "" "Step 1. Please confirm Orca Slicer and your printer are in the same LAN." @@ -8839,7 +8847,7 @@ msgstr "步驟 1. 請確保 Orca Slicer 與列印設備在同一區域網路(L msgid "" "Step 2. If the IP and Access Code below are different from the actual values " "on your printer, please correct them." -msgstr "步驟 2. 若下方的 IP 和存取碼與印表機上的實際數值不符,請進行修正。" +msgstr "步驟 2. 若下方的 IP 和訪問代碼與印表機上的實際數值不符,請進行修正。" msgid "" "Step 3. Please obtain the device SN from the printer side; it is usually " @@ -8852,7 +8860,7 @@ msgid "IP" msgstr "IP" msgid "Access Code" -msgstr "存取碼" +msgstr "訪問代碼" msgid "Printer model" msgstr "列印設備型號" @@ -8861,7 +8869,7 @@ msgid "Printer name" msgstr "列印設備名稱" msgid "Where to find your printer's IP and Access Code?" -msgstr "在哪裡可以找到列印設備的 IP 和存取碼?" +msgstr "在哪裡可以找到列印設備的 IP 和訪問代碼?" msgid "Connect" msgstr "連線" @@ -8888,26 +8896,26 @@ msgid "Connecting to printer... The dialog will close later" msgstr "正在連接印表機… 對話框將在稍後自動關閉" msgid "Connection failed, please double check IP and Access Code" -msgstr "連接失敗,請再次檢查 IP 和存取碼" +msgstr "連接失敗,請再次檢查 IP 和訪問代碼" msgid "" "Connection failed! If your IP and Access Code is correct, \n" "please move to step 3 for troubleshooting network issues" msgstr "" -"連接失敗!如果 IP 和存取碼正確,\n" +"連接失敗!如果 IP 和訪問代碼正確,\n" "請進入第 3 步進行網路問題排解" msgid "Air Pump" -msgstr "" +msgstr "氣泵" msgid "Laser 10 W" -msgstr "" +msgstr "10瓦 雷射" msgid "Laser 40 W" -msgstr "" +msgstr "40瓦 雷射" msgid "Cutting Module" -msgstr "" +msgstr "切割模組" msgid "Model:" msgstr "型號:" @@ -12083,7 +12091,7 @@ msgid "" "a cross texture." msgstr "" -msgid "Sparse infill rotatation template" +msgid "Sparse infill rotation template" msgstr "" msgid "" @@ -12098,7 +12106,7 @@ msgstr "" msgid "°" msgstr "°" -msgid "Solid infill rotatation template" +msgid "Solid infill rotation template" msgstr "" msgid "" @@ -16368,13 +16376,13 @@ msgid "Printer Preset" msgstr "列印設備預設設定" msgid "Filament Preset Template" -msgstr "線材預設設定模板" +msgstr "線材預設設定範本" msgid "Deselect All" msgstr "取消全選" msgid "Process Preset Template" -msgstr "處理預設設定模板" +msgstr "處理預設設定範本" msgid "" "You have not yet chosen which printer preset to create based on. Please " @@ -17640,7 +17648,7 @@ msgstr "" #~ msgstr "修改列印設備名稱" #~ msgid "Bind with Access Code" -#~ msgstr "透過存取碼綁定" +#~ msgstr "透過訪問代碼綁定" #~ msgid "" #~ "When using support material for the support interface, we recommend the " @@ -18006,13 +18014,13 @@ msgstr "" #~ "Step 2, if the IP and Access Code below are different from the actual " #~ "values on your printer, please correct them." #~ msgstr "" -#~ "步驟2, 如果下面的 IP 和存取碼與列印設備上的實際值不同,請輸入正確的數值。" +#~ "步驟2, 如果下面的 IP 和訪問代碼與列印設備上的實際值不同,請輸入正確的數值。" #~ msgid "Step 3: Ping the IP address to check for packet loss and latency." #~ msgstr "步驟 3:Ping 該 IP 地址以檢查封包遺失和延遲。" #~ msgid "IP and Access Code Verified! You may close the window" -#~ msgstr "IP 和存取碼已驗證!可以關閉視窗" +#~ msgstr "IP 和訪問代碼已驗證!可以關閉視窗" #~ msgid "Force cooling for overhang and bridge" #~ msgstr "懸空/橋接強制冷卻" diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 6ec894dd04..363a4680b6 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -43,50 +43,26 @@ "name": "fdm_process_single_common", "sub_path": "process/fdm_process_single_common.json" }, + { + "name": "fdm_process_single_0.06_nozzle_0.2", + "sub_path": "process/fdm_process_single_0.06_nozzle_0.2.json" + }, { "name": "fdm_process_single_0.08", "sub_path": "process/fdm_process_single_0.08.json" }, + { + "name": "fdm_process_single_0.08_nozzle_0.2", + "sub_path": "process/fdm_process_single_0.08_nozzle_0.2.json" + }, { "name": "fdm_process_single_0.10_nozzle_0.2", "sub_path": "process/fdm_process_single_0.10_nozzle_0.2.json" }, - { - "name": "fdm_process_single_0.40_nozzle_0.8", - "sub_path": "process/fdm_process_single_0.40_nozzle_0.8.json" - }, - { - "name": "fdm_process_single_0.30_nozzle_0.6", - "sub_path": "process/fdm_process_single_0.30_nozzle_0.6.json" - }, { "name": "fdm_process_single_0.12", "sub_path": "process/fdm_process_single_0.12.json" }, - { - "name": "fdm_process_single_0.16", - "sub_path": "process/fdm_process_single_0.16.json" - }, - { - "name": "fdm_process_single_0.20", - "sub_path": "process/fdm_process_single_0.20.json" - }, - { - "name": "fdm_process_single_0.24", - "sub_path": "process/fdm_process_single_0.24.json" - }, - { - "name": "fdm_process_single_0.28", - "sub_path": "process/fdm_process_single_0.28.json" - }, - { - "name": "fdm_process_single_0.06_nozzle_0.2", - "sub_path": "process/fdm_process_single_0.06_nozzle_0.2.json" - }, - { - "name": "fdm_process_single_0.08_nozzle_0.2", - "sub_path": "process/fdm_process_single_0.08_nozzle_0.2.json" - }, { "name": "fdm_process_single_0.12_nozzle_0.2", "sub_path": "process/fdm_process_single_0.12_nozzle_0.2.json" @@ -95,30 +71,54 @@ "name": "fdm_process_single_0.14_nozzle_0.2", "sub_path": "process/fdm_process_single_0.14_nozzle_0.2.json" }, + { + "name": "fdm_process_single_0.16", + "sub_path": "process/fdm_process_single_0.16.json" + }, { "name": "fdm_process_single_0.18_nozzle_0.6", "sub_path": "process/fdm_process_single_0.18_nozzle_0.6.json" }, + { + "name": "fdm_process_single_0.20", + "sub_path": "process/fdm_process_single_0.20.json" + }, + { + "name": "fdm_process_single_0.24", + "sub_path": "process/fdm_process_single_0.24.json" + }, { "name": "fdm_process_single_0.24_nozzle_0.6", "sub_path": "process/fdm_process_single_0.24_nozzle_0.6.json" }, - { - "name": "fdm_process_single_0.36_nozzle_0.6", - "sub_path": "process/fdm_process_single_0.36_nozzle_0.6.json" - }, - { - "name": "fdm_process_single_0.42_nozzle_0.6", - "sub_path": "process/fdm_process_single_0.42_nozzle_0.6.json" - }, { "name": "fdm_process_single_0.24_nozzle_0.8", "sub_path": "process/fdm_process_single_0.24_nozzle_0.8.json" }, + { + "name": "fdm_process_single_0.28", + "sub_path": "process/fdm_process_single_0.28.json" + }, + { + "name": "fdm_process_single_0.30_nozzle_0.6", + "sub_path": "process/fdm_process_single_0.30_nozzle_0.6.json" + }, { "name": "fdm_process_single_0.32_nozzle_0.8", "sub_path": "process/fdm_process_single_0.32_nozzle_0.8.json" }, + { + "name": "fdm_process_single_0.36_nozzle_0.6", + "sub_path": "process/fdm_process_single_0.36_nozzle_0.6.json" + }, + { + "name": "fdm_process_single_0.40_nozzle_0.8", + "sub_path": "process/fdm_process_single_0.40_nozzle_0.8.json" + }, + { + "name": "fdm_process_single_0.42_nozzle_0.6", + "sub_path": "process/fdm_process_single_0.42_nozzle_0.6.json" + }, { "name": "fdm_process_single_0.48_nozzle_0.8", "sub_path": "process/fdm_process_single_0.48_nozzle_0.8.json" @@ -128,236 +128,8 @@ "sub_path": "process/fdm_process_single_0.56_nozzle_0.8.json" }, { - "name": "0.08mm Extra Fine @BBL X1C", - "sub_path": "process/0.08mm Extra Fine @BBL X1C.json" - }, - { - "name": "0.08mm Extra Fine @BBL P1P", - "sub_path": "process/0.08mm Extra Fine @BBL P1P.json" - }, - { - "name": "0.08mm Extra Fine @BBL A1M", - "sub_path": "process/0.08mm Extra Fine @BBL A1M.json" - }, - { - "name": "0.08mm Extra Fine @BBL A1", - "sub_path": "process/0.08mm Extra Fine @BBL A1.json" - }, - { - "name": "0.08mm High Quality @BBL X1C", - "sub_path": "process/0.08mm High Quality @BBL X1C.json" - }, - { - "name": "0.08mm High Quality @BBL P1P", - "sub_path": "process/0.08mm High Quality @BBL P1P.json" - }, - { - "name": "0.08mm High Quality @BBL A1M", - "sub_path": "process/0.08mm High Quality @BBL A1M.json" - }, - { - "name": "0.08mm High Quality @BBL A1", - "sub_path": "process/0.08mm High Quality @BBL A1.json" - }, - { - "name": "0.10mm Standard @BBL X1C 0.2 nozzle", - "sub_path": "process/0.10mm Standard @BBL X1C 0.2 nozzle.json" - }, - { - "name": "0.10mm Standard @BBL P1P 0.2 nozzle", - "sub_path": "process/0.10mm Standard @BBL P1P 0.2 nozzle.json" - }, - { - "name": "0.10mm Standard @BBL A1 0.2 nozzle", - "sub_path": "process/0.10mm Standard @BBL A1 0.2 nozzle.json" - }, - { - "name": "0.10mm High Quality @BBL X1C 0.2 nozzle", - "sub_path": "process/0.10mm High Quality @BBL X1C 0.2 nozzle.json" - }, - { - "name": "0.10mm High Quality @BBL P1P 0.2 nozzle", - "sub_path": "process/0.10mm High Quality @BBL P1P 0.2 nozzle.json" - }, - { - "name": "0.10mm High Quality @BBL A1M 0.2 nozzle", - "sub_path": "process/0.10mm High Quality @BBL A1M 0.2 nozzle.json" - }, - { - "name": "0.10mm High Quality @BBL A1 0.2 nozzle", - "sub_path": "process/0.10mm High Quality @BBL A1 0.2 nozzle.json" - }, - { - "name": "0.40mm Standard @BBL X1C 0.8 nozzle", - "sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json" - }, - { - "name": "0.40mm Standard @BBL X1 0.8 nozzle", - "sub_path": "process/0.40mm Standard @BBL X1 0.8 nozzle.json" - }, - { - "name": "0.40mm Standard @BBL P1P 0.8 nozzle", - "sub_path": "process/0.40mm Standard @BBL P1P 0.8 nozzle.json" - }, - { - "name": "0.40mm Standard @BBL A1 0.8 nozzle", - "sub_path": "process/0.40mm Standard @BBL A1 0.8 nozzle.json" - }, - { - "name": "0.30mm Standard @BBL X1C 0.6 nozzle", - "sub_path": "process/0.30mm Standard @BBL X1C 0.6 nozzle.json" - }, - { - "name": "0.30mm Standard @BBL X1 0.6 nozzle", - "sub_path": "process/0.30mm Standard @BBL X1 0.6 nozzle.json" - }, - { - "name": "0.30mm Standard @BBL P1P 0.6 nozzle", - "sub_path": "process/0.30mm Standard @BBL P1P 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @BBL X1C 0.6 nozzle", - "sub_path": "process/0.30mm Strength @BBL X1C 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @BBL A1M 0.6 nozzle", - "sub_path": "process/0.30mm Strength @BBL A1M 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @BBL P1P 0.6 nozzle", - "sub_path": "process/0.30mm Strength @BBL P1P 0.6 nozzle.json" - }, - { - "name": "0.30mm Standard @BBL A1 0.6 nozzle", - "sub_path": "process/0.30mm Standard @BBL A1 0.6 nozzle.json" - }, - { - "name": "0.30mm Strength @BBL A1 0.6 nozzle", - "sub_path": "process/0.30mm Strength @BBL A1 0.6 nozzle.json" - }, - { - "name": "0.12mm Fine @BBL X1C", - "sub_path": "process/0.12mm Fine @BBL X1C.json" - }, - { - "name": "0.12mm Fine @BBL P1P", - "sub_path": "process/0.12mm Fine @BBL P1P.json" - }, - { - "name": "0.12mm Fine @BBL A1M", - "sub_path": "process/0.12mm Fine @BBL A1M.json" - }, - { - "name": "0.12mm Fine @BBL A1", - "sub_path": "process/0.12mm Fine @BBL A1.json" - }, - { - "name": "0.12mm High Quality @BBL X1C", - "sub_path": "process/0.12mm High Quality @BBL X1C.json" - }, - { - "name": "0.12mm High Quality @BBL P1P", - "sub_path": "process/0.12mm High Quality @BBL P1P.json" - }, - { - "name": "0.12mm High Quality @BBL A1M", - "sub_path": "process/0.12mm High Quality @BBL A1M.json" - }, - { - "name": "0.12mm High Quality @BBL A1", - "sub_path": "process/0.12mm High Quality @BBL A1.json" - }, - { - "name": "0.16mm Optimal @BBL X1C", - "sub_path": "process/0.16mm Optimal @BBL X1C.json" - }, - { - "name": "0.16mm Optimal @BBL P1P", - "sub_path": "process/0.16mm Optimal @BBL P1P.json" - }, - { - "name": "0.16mm Optimal @BBL A1M", - "sub_path": "process/0.16mm Optimal @BBL A1M.json" - }, - { - "name": "0.16mm Optimal @BBL A1", - "sub_path": "process/0.16mm Optimal @BBL A1.json" - }, - { - "name": "0.16mm High Quality @BBL X1C", - "sub_path": "process/0.16mm High Quality @BBL X1C.json" - }, - { - "name": "0.16mm High Quality @BBL P1P", - "sub_path": "process/0.16mm High Quality @BBL P1P.json" - }, - { - "name": "0.16mm High Quality @BBL A1M", - "sub_path": "process/0.16mm High Quality @BBL A1M.json" - }, - { - "name": "0.16mm High Quality @BBL A1", - "sub_path": "process/0.16mm High Quality @BBL A1.json" - }, - { - "name": "0.20mm Standard @BBL X1C", - "sub_path": "process/0.20mm Standard @BBL X1C.json" - }, - { - "name": "0.20mm Strength @BBL X1C", - "sub_path": "process/0.20mm Strength @BBL X1C.json" - }, - { - "name": "0.20mm Standard @BBL P1P", - "sub_path": "process/0.20mm Standard @BBL P1P.json" - }, - { - "name": "0.20mm Strength @BBL P1P", - "sub_path": "process/0.20mm Strength @BBL P1P.json" - }, - { - "name": "0.20mm Standard @BBL A1", - "sub_path": "process/0.20mm Standard @BBL A1.json" - }, - { - "name": "0.20mm Strength @BBL A1", - "sub_path": "process/0.20mm Strength @BBL A1.json" - }, - { - "name": "0.24mm Draft @BBL X1C", - "sub_path": "process/0.24mm Draft @BBL X1C.json" - }, - { - "name": "0.24mm Draft @BBL P1P", - "sub_path": "process/0.24mm Draft @BBL P1P.json" - }, - { - "name": "0.24mm Draft @BBL A1M", - "sub_path": "process/0.24mm Draft @BBL A1M.json" - }, - { - "name": "0.24mm Draft @BBL A1", - "sub_path": "process/0.24mm Draft @BBL A1.json" - }, - { - "name": "0.28mm Extra Draft @BBL X1C", - "sub_path": "process/0.28mm Extra Draft @BBL X1C.json" - }, - { - "name": "0.28mm Extra Draft @BBL P1P", - "sub_path": "process/0.28mm Extra Draft @BBL P1P.json" - }, - { - "name": "0.28mm Extra Draft @BBL A1M", - "sub_path": "process/0.28mm Extra Draft @BBL A1M.json" - }, - { - "name": "0.28mm Extra Draft @BBL A1", - "sub_path": "process/0.28mm Extra Draft @BBL A1.json" - }, - { - "name": "0.06mm Standard @BBL X1C 0.2 nozzle", - "sub_path": "process/0.06mm Standard @BBL X1C 0.2 nozzle.json" + "name": "0.06mm Fine @BBL A1 0.2 nozzle", + "sub_path": "process/0.06mm Fine @BBL A1 0.2 nozzle.json" }, { "name": "0.06mm Fine @BBL A1M 0.2 nozzle", @@ -368,40 +140,56 @@ "sub_path": "process/0.06mm Fine @BBL P1P 0.2 nozzle.json" }, { - "name": "0.06mm Fine @BBL A1 0.2 nozzle", - "sub_path": "process/0.06mm Fine @BBL A1 0.2 nozzle.json" - }, - { - "name": "0.06mm High Quality @BBL X1C 0.2 nozzle", - "sub_path": "process/0.06mm High Quality @BBL X1C 0.2 nozzle.json" - }, - { - "name": "0.06mm High Quality @BBL P1P 0.2 nozzle", - "sub_path": "process/0.06mm High Quality @BBL P1P 0.2 nozzle.json" + "name": "0.06mm High Quality @BBL A1 0.2 nozzle", + "sub_path": "process/0.06mm High Quality @BBL A1 0.2 nozzle.json" }, { "name": "0.06mm High Quality @BBL A1M 0.2 nozzle", "sub_path": "process/0.06mm High Quality @BBL A1M 0.2 nozzle.json" }, { - "name": "0.06mm High Quality @BBL A1 0.2 nozzle", - "sub_path": "process/0.06mm High Quality @BBL A1 0.2 nozzle.json" + "name": "0.06mm High Quality @BBL P1P 0.2 nozzle", + "sub_path": "process/0.06mm High Quality @BBL P1P 0.2 nozzle.json" }, { - "name": "0.08mm Standard @BBL X1C 0.2 nozzle", - "sub_path": "process/0.08mm Standard @BBL X1C 0.2 nozzle.json" + "name": "0.06mm High Quality @BBL X1C 0.2 nozzle", + "sub_path": "process/0.06mm High Quality @BBL X1C 0.2 nozzle.json" }, { - "name": "0.08mm Optimal @BBL A1M 0.2 nozzle", - "sub_path": "process/0.08mm Optimal @BBL A1M 0.2 nozzle.json" + "name": "0.06mm Standard @BBL X1C 0.2 nozzle", + "sub_path": "process/0.06mm Standard @BBL X1C 0.2 nozzle.json" }, { - "name": "0.08mm Optimal @BBL P1P 0.2 nozzle", - "sub_path": "process/0.08mm Optimal @BBL P1P 0.2 nozzle.json" + "name": "0.08mm Extra Fine @BBL A1", + "sub_path": "process/0.08mm Extra Fine @BBL A1.json" }, { - "name": "0.08mm Optimal @BBL A1 0.2 nozzle", - "sub_path": "process/0.08mm Optimal @BBL A1 0.2 nozzle.json" + "name": "0.08mm Extra Fine @BBL A1M", + "sub_path": "process/0.08mm Extra Fine @BBL A1M.json" + }, + { + "name": "0.08mm Extra Fine @BBL P1P", + "sub_path": "process/0.08mm Extra Fine @BBL P1P.json" + }, + { + "name": "0.08mm Extra Fine @BBL X1C", + "sub_path": "process/0.08mm Extra Fine @BBL X1C.json" + }, + { + "name": "0.08mm High Quality @BBL A1", + "sub_path": "process/0.08mm High Quality @BBL A1.json" + }, + { + "name": "0.08mm High Quality @BBL A1M", + "sub_path": "process/0.08mm High Quality @BBL A1M.json" + }, + { + "name": "0.08mm High Quality @BBL P1P", + "sub_path": "process/0.08mm High Quality @BBL P1P.json" + }, + { + "name": "0.08mm High Quality @BBL X1C", + "sub_path": "process/0.08mm High Quality @BBL X1C.json" }, { "name": "0.08mm High Quality @BBL A1 0.2 nozzle", @@ -420,8 +208,84 @@ "sub_path": "process/0.08mm High Quality @BBL X1C 0.2 nozzle.json" }, { - "name": "0.12mm Standard @BBL X1C 0.2 nozzle", - "sub_path": "process/0.12mm Standard @BBL X1C 0.2 nozzle.json" + "name": "0.08mm Optimal @BBL A1 0.2 nozzle", + "sub_path": "process/0.08mm Optimal @BBL A1 0.2 nozzle.json" + }, + { + "name": "0.08mm Optimal @BBL A1M 0.2 nozzle", + "sub_path": "process/0.08mm Optimal @BBL A1M 0.2 nozzle.json" + }, + { + "name": "0.08mm Optimal @BBL P1P 0.2 nozzle", + "sub_path": "process/0.08mm Optimal @BBL P1P 0.2 nozzle.json" + }, + { + "name": "0.08mm Standard @BBL X1C 0.2 nozzle", + "sub_path": "process/0.08mm Standard @BBL X1C 0.2 nozzle.json" + }, + { + "name": "0.10mm High Quality @BBL A1 0.2 nozzle", + "sub_path": "process/0.10mm High Quality @BBL A1 0.2 nozzle.json" + }, + { + "name": "0.10mm High Quality @BBL A1M 0.2 nozzle", + "sub_path": "process/0.10mm High Quality @BBL A1M 0.2 nozzle.json" + }, + { + "name": "0.10mm High Quality @BBL P1P 0.2 nozzle", + "sub_path": "process/0.10mm High Quality @BBL P1P 0.2 nozzle.json" + }, + { + "name": "0.10mm High Quality @BBL X1C 0.2 nozzle", + "sub_path": "process/0.10mm High Quality @BBL X1C 0.2 nozzle.json" + }, + { + "name": "0.10mm Standard @BBL A1 0.2 nozzle", + "sub_path": "process/0.10mm Standard @BBL A1 0.2 nozzle.json" + }, + { + "name": "0.10mm Standard @BBL P1P 0.2 nozzle", + "sub_path": "process/0.10mm Standard @BBL P1P 0.2 nozzle.json" + }, + { + "name": "0.10mm Standard @BBL X1C 0.2 nozzle", + "sub_path": "process/0.10mm Standard @BBL X1C 0.2 nozzle.json" + }, + { + "name": "0.12mm Fine @BBL A1", + "sub_path": "process/0.12mm Fine @BBL A1.json" + }, + { + "name": "0.12mm Fine @BBL A1M", + "sub_path": "process/0.12mm Fine @BBL A1M.json" + }, + { + "name": "0.12mm Fine @BBL P1P", + "sub_path": "process/0.12mm Fine @BBL P1P.json" + }, + { + "name": "0.12mm Fine @BBL X1C", + "sub_path": "process/0.12mm Fine @BBL X1C.json" + }, + { + "name": "0.12mm High Quality @BBL A1", + "sub_path": "process/0.12mm High Quality @BBL A1.json" + }, + { + "name": "0.12mm High Quality @BBL A1M", + "sub_path": "process/0.12mm High Quality @BBL A1M.json" + }, + { + "name": "0.12mm High Quality @BBL P1P", + "sub_path": "process/0.12mm High Quality @BBL P1P.json" + }, + { + "name": "0.12mm High Quality @BBL X1C", + "sub_path": "process/0.12mm High Quality @BBL X1C.json" + }, + { + "name": "0.12mm Draft @BBL A1 0.2 nozzle", + "sub_path": "process/0.12mm Draft @BBL A1 0.2 nozzle.json" }, { "name": "0.12mm Draft @BBL A1M 0.2 nozzle", @@ -432,12 +296,12 @@ "sub_path": "process/0.12mm Draft @BBL P1P 0.2 nozzle.json" }, { - "name": "0.12mm Draft @BBL A1 0.2 nozzle", - "sub_path": "process/0.12mm Draft @BBL A1 0.2 nozzle.json" + "name": "0.12mm Standard @BBL X1C 0.2 nozzle", + "sub_path": "process/0.12mm Standard @BBL X1C 0.2 nozzle.json" }, { - "name": "0.14mm Standard @BBL X1C 0.2 nozzle", - "sub_path": "process/0.14mm Standard @BBL X1C 0.2 nozzle.json" + "name": "0.14mm Extra Draft @BBL A1 0.2 nozzle", + "sub_path": "process/0.14mm Extra Draft @BBL A1 0.2 nozzle.json" }, { "name": "0.14mm Extra Draft @BBL A1M 0.2 nozzle", @@ -448,12 +312,44 @@ "sub_path": "process/0.14mm Extra Draft @BBL P1P 0.2 nozzle.json" }, { - "name": "0.14mm Extra Draft @BBL A1 0.2 nozzle", - "sub_path": "process/0.14mm Extra Draft @BBL A1 0.2 nozzle.json" + "name": "0.14mm Standard @BBL X1C 0.2 nozzle", + "sub_path": "process/0.14mm Standard @BBL X1C 0.2 nozzle.json" }, { - "name": "0.18mm Standard @BBL X1C 0.6 nozzle", - "sub_path": "process/0.18mm Standard @BBL X1C 0.6 nozzle.json" + "name": "0.16mm High Quality @BBL A1", + "sub_path": "process/0.16mm High Quality @BBL A1.json" + }, + { + "name": "0.16mm High Quality @BBL A1M", + "sub_path": "process/0.16mm High Quality @BBL A1M.json" + }, + { + "name": "0.16mm High Quality @BBL P1P", + "sub_path": "process/0.16mm High Quality @BBL P1P.json" + }, + { + "name": "0.16mm High Quality @BBL X1C", + "sub_path": "process/0.16mm High Quality @BBL X1C.json" + }, + { + "name": "0.16mm Optimal @BBL A1", + "sub_path": "process/0.16mm Optimal @BBL A1.json" + }, + { + "name": "0.16mm Optimal @BBL A1M", + "sub_path": "process/0.16mm Optimal @BBL A1M.json" + }, + { + "name": "0.16mm Optimal @BBL P1P", + "sub_path": "process/0.16mm Optimal @BBL P1P.json" + }, + { + "name": "0.16mm Optimal @BBL X1C", + "sub_path": "process/0.16mm Optimal @BBL X1C.json" + }, + { + "name": "0.18mm Fine @BBL A1 0.6 nozzle", + "sub_path": "process/0.18mm Fine @BBL A1 0.6 nozzle.json" }, { "name": "0.18mm Fine @BBL A1M 0.6 nozzle", @@ -464,12 +360,56 @@ "sub_path": "process/0.18mm Fine @BBL P1P 0.6 nozzle.json" }, { - "name": "0.18mm Fine @BBL A1 0.6 nozzle", - "sub_path": "process/0.18mm Fine @BBL A1 0.6 nozzle.json" + "name": "0.18mm Standard @BBL X1C 0.6 nozzle", + "sub_path": "process/0.18mm Standard @BBL X1C 0.6 nozzle.json" }, { - "name": "0.24mm Standard @BBL X1C 0.6 nozzle", - "sub_path": "process/0.24mm Standard @BBL X1C 0.6 nozzle.json" + "name": "0.20mm Bambu Support W @BBL X1C", + "sub_path": "process/0.20mm Bambu Support W @BBL X1C.json" + }, + { + "name": "0.20mm Standard @BBL A1", + "sub_path": "process/0.20mm Standard @BBL A1.json" + }, + { + "name": "0.20mm Standard @BBL P1P", + "sub_path": "process/0.20mm Standard @BBL P1P.json" + }, + { + "name": "0.20mm Standard @BBL X1C", + "sub_path": "process/0.20mm Standard @BBL X1C.json" + }, + { + "name": "0.20mm Strength @BBL A1", + "sub_path": "process/0.20mm Strength @BBL A1.json" + }, + { + "name": "0.20mm Strength @BBL P1P", + "sub_path": "process/0.20mm Strength @BBL P1P.json" + }, + { + "name": "0.20mm Strength @BBL X1C", + "sub_path": "process/0.20mm Strength @BBL X1C.json" + }, + { + "name": "0.24mm Draft @BBL A1", + "sub_path": "process/0.24mm Draft @BBL A1.json" + }, + { + "name": "0.24mm Draft @BBL A1M", + "sub_path": "process/0.24mm Draft @BBL A1M.json" + }, + { + "name": "0.24mm Draft @BBL P1P", + "sub_path": "process/0.24mm Draft @BBL P1P.json" + }, + { + "name": "0.24mm Draft @BBL X1C", + "sub_path": "process/0.24mm Draft @BBL X1C.json" + }, + { + "name": "0.24mm Optimal @BBL A1 0.6 nozzle", + "sub_path": "process/0.24mm Optimal @BBL A1 0.6 nozzle.json" }, { "name": "0.24mm Optimal @BBL A1M 0.6 nozzle", @@ -480,44 +420,12 @@ "sub_path": "process/0.24mm Optimal @BBL P1P 0.6 nozzle.json" }, { - "name": "0.24mm Optimal @BBL A1 0.6 nozzle", - "sub_path": "process/0.24mm Optimal @BBL A1 0.6 nozzle.json" + "name": "0.24mm Standard @BBL X1C 0.6 nozzle", + "sub_path": "process/0.24mm Standard @BBL X1C 0.6 nozzle.json" }, { - "name": "0.36mm Standard @BBL X1C 0.6 nozzle", - "sub_path": "process/0.36mm Standard @BBL X1C 0.6 nozzle.json" - }, - { - "name": "0.36mm Draft @BBL A1M 0.6 nozzle", - "sub_path": "process/0.36mm Draft @BBL A1M 0.6 nozzle.json" - }, - { - "name": "0.36mm Draft @BBL P1P 0.6 nozzle", - "sub_path": "process/0.36mm Draft @BBL P1P 0.6 nozzle.json" - }, - { - "name": "0.36mm Draft @BBL A1 0.6 nozzle", - "sub_path": "process/0.36mm Draft @BBL A1 0.6 nozzle.json" - }, - { - "name": "0.42mm Standard @BBL X1C 0.6 nozzle", - "sub_path": "process/0.42mm Standard @BBL X1C 0.6 nozzle.json" - }, - { - "name": "0.42mm Extra Draft @BBL A1M 0.6 nozzle", - "sub_path": "process/0.42mm Extra Draft @BBL A1M 0.6 nozzle.json" - }, - { - "name": "0.42mm Extra Draft @BBL P1P 0.6 nozzle", - "sub_path": "process/0.42mm Extra Draft @BBL P1P 0.6 nozzle.json" - }, - { - "name": "0.42mm Extra Draft @BBL A1 0.6 nozzle", - "sub_path": "process/0.42mm Extra Draft @BBL A1 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @BBL X1C 0.8 nozzle", - "sub_path": "process/0.24mm Standard @BBL X1C 0.8 nozzle.json" + "name": "0.24mm Fine @BBL A1 0.8 nozzle", + "sub_path": "process/0.24mm Fine @BBL A1 0.8 nozzle.json" }, { "name": "0.24mm Fine @BBL A1M 0.8 nozzle", @@ -528,12 +436,60 @@ "sub_path": "process/0.24mm Fine @BBL P1P 0.8 nozzle.json" }, { - "name": "0.24mm Fine @BBL A1 0.8 nozzle", - "sub_path": "process/0.24mm Fine @BBL A1 0.8 nozzle.json" + "name": "0.24mm Standard @BBL X1C 0.8 nozzle", + "sub_path": "process/0.24mm Standard @BBL X1C 0.8 nozzle.json" }, { - "name": "0.32mm Standard @BBL X1C 0.8 nozzle", - "sub_path": "process/0.32mm Standard @BBL X1C 0.8 nozzle.json" + "name": "0.28mm Extra Draft @BBL A1", + "sub_path": "process/0.28mm Extra Draft @BBL A1.json" + }, + { + "name": "0.28mm Extra Draft @BBL A1M", + "sub_path": "process/0.28mm Extra Draft @BBL A1M.json" + }, + { + "name": "0.28mm Extra Draft @BBL P1P", + "sub_path": "process/0.28mm Extra Draft @BBL P1P.json" + }, + { + "name": "0.28mm Extra Draft @BBL X1C", + "sub_path": "process/0.28mm Extra Draft @BBL X1C.json" + }, + { + "name": "0.30mm Standard @BBL A1 0.6 nozzle", + "sub_path": "process/0.30mm Standard @BBL A1 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @BBL P1P 0.6 nozzle", + "sub_path": "process/0.30mm Standard @BBL P1P 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @BBL X1 0.6 nozzle", + "sub_path": "process/0.30mm Standard @BBL X1 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @BBL X1C 0.6 nozzle", + "sub_path": "process/0.30mm Standard @BBL X1C 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @BBL A1 0.6 nozzle", + "sub_path": "process/0.30mm Strength @BBL A1 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @BBL A1M 0.6 nozzle", + "sub_path": "process/0.30mm Strength @BBL A1M 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @BBL P1P 0.6 nozzle", + "sub_path": "process/0.30mm Strength @BBL P1P 0.6 nozzle.json" + }, + { + "name": "0.30mm Strength @BBL X1C 0.6 nozzle", + "sub_path": "process/0.30mm Strength @BBL X1C 0.6 nozzle.json" + }, + { + "name": "0.32mm Optimal @BBL A1 0.8 nozzle", + "sub_path": "process/0.32mm Optimal @BBL A1 0.8 nozzle.json" }, { "name": "0.32mm Optimal @BBL A1M 0.8 nozzle", @@ -544,12 +500,60 @@ "sub_path": "process/0.32mm Optimal @BBL P1P 0.8 nozzle.json" }, { - "name": "0.32mm Optimal @BBL A1 0.8 nozzle", - "sub_path": "process/0.32mm Optimal @BBL A1 0.8 nozzle.json" + "name": "0.32mm Standard @BBL X1C 0.8 nozzle", + "sub_path": "process/0.32mm Standard @BBL X1C 0.8 nozzle.json" }, { - "name": "0.48mm Standard @BBL X1C 0.8 nozzle", - "sub_path": "process/0.48mm Standard @BBL X1C 0.8 nozzle.json" + "name": "0.36mm Draft @BBL A1 0.6 nozzle", + "sub_path": "process/0.36mm Draft @BBL A1 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @BBL A1M 0.6 nozzle", + "sub_path": "process/0.36mm Draft @BBL A1M 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @BBL P1P 0.6 nozzle", + "sub_path": "process/0.36mm Draft @BBL P1P 0.6 nozzle.json" + }, + { + "name": "0.36mm Standard @BBL X1C 0.6 nozzle", + "sub_path": "process/0.36mm Standard @BBL X1C 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @BBL A1 0.8 nozzle", + "sub_path": "process/0.40mm Standard @BBL A1 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @BBL P1P 0.8 nozzle", + "sub_path": "process/0.40mm Standard @BBL P1P 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @BBL X1 0.8 nozzle", + "sub_path": "process/0.40mm Standard @BBL X1 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @BBL X1C 0.8 nozzle", + "sub_path": "process/0.40mm Standard @BBL X1C 0.8 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @BBL A1 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @BBL A1 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @BBL A1M 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @BBL A1M 0.6 nozzle.json" + }, + { + "name": "0.42mm Extra Draft @BBL P1P 0.6 nozzle", + "sub_path": "process/0.42mm Extra Draft @BBL P1P 0.6 nozzle.json" + }, + { + "name": "0.42mm Standard @BBL X1C 0.6 nozzle", + "sub_path": "process/0.42mm Standard @BBL X1C 0.6 nozzle.json" + }, + { + "name": "0.48mm Draft @BBL A1 0.8 nozzle", + "sub_path": "process/0.48mm Draft @BBL A1 0.8 nozzle.json" }, { "name": "0.48mm Draft @BBL A1M 0.8 nozzle", @@ -560,12 +564,12 @@ "sub_path": "process/0.48mm Draft @BBL P1P 0.8 nozzle.json" }, { - "name": "0.48mm Draft @BBL A1 0.8 nozzle", - "sub_path": "process/0.48mm Draft @BBL A1 0.8 nozzle.json" + "name": "0.48mm Standard @BBL X1C 0.8 nozzle", + "sub_path": "process/0.48mm Standard @BBL X1C 0.8 nozzle.json" }, { - "name": "0.56mm Standard @BBL X1C 0.8 nozzle", - "sub_path": "process/0.56mm Standard @BBL X1C 0.8 nozzle.json" + "name": "0.56mm Extra Draft @BBL A1 0.8 nozzle", + "sub_path": "process/0.56mm Extra Draft @BBL A1 0.8 nozzle.json" }, { "name": "0.56mm Extra Draft @BBL A1M 0.8 nozzle", @@ -576,21 +580,13 @@ "sub_path": "process/0.56mm Extra Draft @BBL P1P 0.8 nozzle.json" }, { - "name": "0.56mm Extra Draft @BBL A1 0.8 nozzle", - "sub_path": "process/0.56mm Extra Draft @BBL A1 0.8 nozzle.json" + "name": "0.56mm Standard @BBL X1C 0.8 nozzle", + "sub_path": "process/0.56mm Standard @BBL X1C 0.8 nozzle.json" }, { "name": "0.10mm Standard @BBL A1M 0.2 nozzle", "sub_path": "process/0.10mm Standard @BBL A1M 0.2 nozzle.json" }, - { - "name": "0.40mm Standard @BBL A1M 0.8 nozzle", - "sub_path": "process/0.40mm Standard @BBL A1M 0.8 nozzle.json" - }, - { - "name": "0.30mm Standard @BBL A1M 0.6 nozzle", - "sub_path": "process/0.30mm Standard @BBL A1M 0.6 nozzle.json" - }, { "name": "0.20mm Standard @BBL A1M", "sub_path": "process/0.20mm Standard @BBL A1M.json" @@ -598,6 +594,14 @@ { "name": "0.20mm Strength @BBL A1M", "sub_path": "process/0.20mm Strength @BBL A1M.json" + }, + { + "name": "0.30mm Standard @BBL A1M 0.6 nozzle", + "sub_path": "process/0.30mm Standard @BBL A1M 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @BBL A1M 0.8 nozzle", + "sub_path": "process/0.40mm Standard @BBL A1M 0.8 nozzle.json" } ], "filament_list": [ @@ -605,6 +609,10 @@ "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, + { + "name": "FusRock ABS-GF @base", + "sub_path": "filament/FusRock/FusRock ABS-GF @base.json" + }, { "name": "fdm_filament_abs", "sub_path": "filament/fdm_filament_abs.json" @@ -677,6 +685,22 @@ "name": "fdm_filament_tpu", "sub_path": "filament/fdm_filament_tpu.json" }, + { + "name": "FusRock ABS-GF @BBL A1", + "sub_path": "filament/FusRock/FusRock ABS-GF @BBL A1.json" + }, + { + "name": "FusRock ABS-GF @BBL H2D", + "sub_path": "filament/FusRock/FusRock ABS-GF @BBL H2D.json" + }, + { + "name": "FusRock ABS-GF @BBL P1P", + "sub_path": "filament/FusRock/FusRock ABS-GF @BBL P1P.json" + }, + { + "name": "FusRock ABS-GF @BBL X1C", + "sub_path": "filament/FusRock/FusRock ABS-GF @BBL X1C.json" + }, { "name": "Bambu ABS @base", "sub_path": "filament/Bambu ABS @base.json" @@ -955,20 +979,100 @@ }, { "name": "Overture Matte PLA @base", - "sub_path": "filament/Overture Matte PLA @base.json" + "sub_path": "filament/Overture/Overture Matte PLA @base.json" }, { "name": "Overture PLA @base", - "sub_path": "filament/Overture PLA @base.json" + "sub_path": "filament/Overture/Overture PLA @base.json" + }, + { + "name": "Overture PLA Pro @base", + "sub_path": "filament/Overture/Overture PLA Pro @base.json" + }, + { + "name": "Panchroma CoPE @base", + "sub_path": "filament/Polymaker/Panchroma CoPE @base.json" + }, + { + "name": "Panchroma PLA @base", + "sub_path": "filament/Polymaker/Panchroma PLA @base.json" + }, + { + "name": "Panchroma PLA Celestial @base", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @base.json" + }, + { + "name": "Panchroma PLA Galaxy @base", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @base.json" + }, + { + "name": "Panchroma PLA Glow @base", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @base.json" + }, + { + "name": "Panchroma PLA Luminous @base", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @base.json" + }, + { + "name": "Panchroma PLA Marble @base", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @base.json" + }, + { + "name": "Panchroma PLA Matte @base", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @base.json" + }, + { + "name": "Panchroma PLA Metallic @base", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @base.json" + }, + { + "name": "Panchroma PLA Neon @base", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" + }, + { + "name": "Panchroma PLA Silk @base", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" + }, + { + "name": "Panchroma PLA Stain @base", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" + }, + { + "name": "Panchroma PLA Starlight @base", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @base.json" + }, + { + "name": "Panchroma PLA Temp Shift @base", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @base.json" + }, + { + "name": "Panchroma PLA Translucent @base", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @base.json" + }, + { + "name": "Panchroma PLA UV Shift @base", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" }, { "name": "PolyLite PLA @base", "sub_path": "filament/Polymaker/PolyLite PLA @base.json" }, + { + "name": "PolyLite PLA Pro @base", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" + }, { "name": "PolyTerra PLA @base", "sub_path": "filament/Polymaker/PolyTerra PLA @base.json" }, + { + "name": "Polymaker HT-PLA @base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" + }, + { + "name": "Polymaker HT-PLA-GF @base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" + }, { "name": "SUNLU PLA Marble @base", "sub_path": "filament/SUNLU/SUNLU Marble PLA @base.json" @@ -1165,26 +1269,6 @@ "name": "Bambu ASA @BBL A1 0.4 nozzle", "sub_path": "filament/Bambu ASA @BBL A1 0.4 nozzle.json" }, - { - "name": "FusRock ABS-GF @base", - "sub_path": "filament/FusRock/FusRock ABS-GF @base.json" - }, - { - "name": "FusRock ABS-GF @BBL P1P", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL P1P.json" - }, - { - "name": "FusRock ABS-GF @BBL H2D", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL H2D.json" - }, - { - "name": "FusRock ABS-GF @BBL A1", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL A1.json" - }, - { - "name": "FusRock ABS-GF @BBL X1C", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL X1C.json" - }, { "name": "Bambu ASA @BBL A1 0.6 nozzle", "sub_path": "filament/Bambu ASA @BBL A1 0.6 nozzle.json" @@ -2495,51 +2579,731 @@ }, { "name": "Overture Matte PLA @BBL A1", - "sub_path": "filament/Overture Matte PLA @BBL A1.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL A1.json" }, { "name": "Overture Matte PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture Matte PLA @BBL A1 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL A1 0.2 nozzle.json" }, { "name": "Overture Matte PLA @BBL A1M", - "sub_path": "filament/Overture Matte PLA @BBL A1M.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL A1M.json" }, { "name": "Overture Matte PLA @BBL P1P", - "sub_path": "filament/Overture Matte PLA @BBL P1P.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL P1P.json" }, { "name": "Overture Matte PLA @BBL X1", - "sub_path": "filament/Overture Matte PLA @BBL X1.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL X1.json" }, { "name": "Overture Matte PLA @BBL X1C", - "sub_path": "filament/Overture Matte PLA @BBL X1C.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL X1C.json" }, { "name": "Overture PLA @BBL A1", - "sub_path": "filament/Overture PLA @BBL A1.json" + "sub_path": "filament/Overture/Overture PLA @BBL A1.json" }, { "name": "Overture PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture PLA @BBL A1 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture PLA @BBL A1 0.2 nozzle.json" }, { "name": "Overture PLA @BBL A1M", - "sub_path": "filament/Overture PLA @BBL A1M.json" + "sub_path": "filament/Overture/Overture PLA @BBL A1M.json" }, { "name": "Overture PLA @BBL P1P", - "sub_path": "filament/Overture PLA @BBL P1P.json" + "sub_path": "filament/Overture/Overture PLA @BBL P1P.json" }, { "name": "Overture PLA @BBL X1", - "sub_path": "filament/Overture PLA @BBL X1.json" + "sub_path": "filament/Overture/Overture PLA @BBL X1.json" }, { "name": "Overture PLA @BBL X1C", - "sub_path": "filament/Overture PLA @BBL X1C.json" + "sub_path": "filament/Overture/Overture PLA @BBL X1C.json" + }, + { + "name": "Overture PLA Pro @BBL A1", + "sub_path": "filament/Overture/Overture PLA Pro @BBL A1.json" + }, + { + "name": "Overture PLA Pro @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL A1M", + "sub_path": "filament/Overture/Overture PLA Pro @BBL A1M.json" + }, + { + "name": "Overture PLA Pro @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL P1P", + "sub_path": "filament/Overture/Overture PLA Pro @BBL P1P.json" + }, + { + "name": "Overture PLA Pro @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL X1", + "sub_path": "filament/Overture/Overture PLA Pro @BBL X1.json" + }, + { + "name": "Overture PLA Pro @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL X1C", + "sub_path": "filament/Overture/Overture PLA Pro @BBL X1C.json" + }, + { + "name": "Overture PLA Pro @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL A1", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1.json" + }, + { + "name": "Panchroma CoPE @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M.json" + }, + { + "name": "Panchroma CoPE @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P.json" + }, + { + "name": "Panchroma CoPE @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL X1", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1.json" + }, + { + "name": "Panchroma CoPE @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C.json" + }, + { + "name": "Panchroma CoPE @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1.json" + }, + { + "name": "Panchroma PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M.json" + }, + { + "name": "Panchroma PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P.json" + }, + { + "name": "Panchroma PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1.json" + }, + { + "name": "Panchroma PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C.json" + }, + { + "name": "Panchroma PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json" + }, + { + "name": "Panchroma PLA Celestial @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P.json" + }, + { + "name": "Panchroma PLA Glow @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json" + }, + { + "name": "Panchroma PLA Luminous @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P.json" + }, + { + "name": "Panchroma PLA Marble @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P.json" + }, + { + "name": "Panchroma PLA Matte @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json" + }, + { + "name": "Panchroma PLA Metallic @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P.json" + }, + { + "name": "Panchroma PLA Neon @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P.json" + }, + { + "name": "Panchroma PLA Silk @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C.json" + }, + { + "name": "Panchroma PLA Stain @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1.json" + }, + { + "name": "Panchroma PLA Stain @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Stain @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M.json" + }, + { + "name": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Stain @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P.json" + }, + { + "name": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Stain @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1.json" + }, + { + "name": "Panchroma PLA Stain @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Stain @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C.json" + }, + { + "name": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json" + }, + { + "name": "Panchroma PLA Starlight @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json" + }, + { + "name": "Panchroma PLA Translucent @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1M", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL P1P", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1C", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json" }, { "name": "PolyLite PLA @BBL A1", @@ -2569,6 +3333,46 @@ "name": "PolyLite PLA @BBL X1C", "sub_path": "filament/Polymaker/PolyLite PLA @BBL X1C.json" }, + { + "name": "PolyLite PLA Pro @BBL A1", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1M", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL P1P", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P.json" + }, + { + "name": "PolyLite PLA Pro @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1C", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json" + }, { "name": "PolyTerra PLA @BBL A1", "sub_path": "filament/Polymaker/PolyTerra PLA @BBL A1.json" @@ -2597,6 +3401,86 @@ "name": "PolyTerra PLA @BBL X1C", "sub_path": "filament/Polymaker/PolyTerra PLA @BBL X1C.json" }, + { + "name": "Polymaker HT-PLA @BBL A1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1M", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL P1P", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P.json" + }, + { + "name": "Polymaker HT-PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1C", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1M", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL P1P", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1C", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json" + }, { "name": "SUNLU PLA Marble @BBL A1", "sub_path": "filament/SUNLU/SUNLU Marble PLA @BBL A1.json" @@ -3235,27 +4119,27 @@ }, { "name": "Overture Matte PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture Matte PLA @BBL A1M 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL A1M 0.2 nozzle.json" }, { "name": "Overture Matte PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL P1P 0.2 nozzle.json" }, { "name": "Overture Matte PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture Matte PLA @BBL X1C 0.2 nozzle.json" }, { "name": "Overture PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture PLA @BBL A1M 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture PLA @BBL A1M 0.2 nozzle.json" }, { "name": "Overture PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture PLA @BBL P1P 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture PLA @BBL P1P 0.2 nozzle.json" }, { "name": "Overture PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture PLA @BBL X1C 0.2 nozzle.json" + "sub_path": "filament/Overture/Overture PLA @BBL X1C 0.2 nozzle.json" }, { "name": "PolyLite PLA @BBL P1P 0.2 nozzle", @@ -3302,840 +4186,260 @@ "sub_path": "filament/AliZ/AliZ PLA @P1-X1.json" }, { - "name": "Panchroma CoPE @base", - "sub_path": "filament/Polymaker/Panchroma CoPE @base.json" + "name": "Overture ASA @BBL X1", + "sub_path": "filament/Overture/Overture ASA @BBL X1.json" }, { - "name": "Panchroma CoPE @BBL A1", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1.json" + "name": "Overture ASA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma CoPE @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json" + "name": "Overture ASA @BBL X1C", + "sub_path": "filament/Overture/Overture ASA @BBL X1C.json" }, { - "name": "Panchroma CoPE @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M.json" + "name": "Overture ASA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma CoPE @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json" + "name": "Overture Air PLA @BBL A1", + "sub_path": "filament/Overture/Overture Air PLA @BBL A1.json" }, { - "name": "Panchroma CoPE @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P.json" + "name": "Overture Air PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma CoPE @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json" + "name": "Overture Air PLA @BBL A1M", + "sub_path": "filament/Overture/Overture Air PLA @BBL A1M.json" }, { - "name": "Panchroma CoPE @BBL X1", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1.json" + "name": "Overture Air PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma CoPE @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json" + "name": "Overture Air PLA @BBL P1P", + "sub_path": "filament/Overture/Overture Air PLA @BBL P1P.json" }, { - "name": "Panchroma CoPE @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C.json" + "name": "Overture Air PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma CoPE @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json" + "name": "Overture Air PLA @BBL X1", + "sub_path": "filament/Overture/Overture Air PLA @BBL X1.json" }, { - "name": "Panchroma PLA @base", - "sub_path": "filament/Polymaker/Panchroma PLA @base.json" + "name": "Overture Air PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1.json" + "name": "Overture Air PLA @BBL X1C", + "sub_path": "filament/Overture/Overture Air PLA @BBL X1C.json" }, { - "name": "Panchroma PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json" + "name": "Overture Air PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma PLA @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M.json" + "name": "Overture Easy PLA @BBL A1", + "sub_path": "filament/Overture/Overture Easy PLA @BBL A1.json" }, { - "name": "Panchroma PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json" + "name": "Overture Easy PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma PLA @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P.json" + "name": "Overture Easy PLA @BBL A1M", + "sub_path": "filament/Overture/Overture Easy PLA @BBL A1M.json" }, { - "name": "Panchroma PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json" + "name": "Overture Easy PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma PLA @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1.json" + "name": "Overture Easy PLA @BBL P1P", + "sub_path": "filament/Overture/Overture Easy PLA @BBL P1P.json" }, { - "name": "Panchroma PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json" + "name": "Overture Easy PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma PLA @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C.json" + "name": "Overture Easy PLA @BBL X1", + "sub_path": "filament/Overture/Overture Easy PLA @BBL X1.json" }, { - "name": "Panchroma PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json" + "name": "Overture Easy PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @base", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @base.json" + "name": "Overture Easy PLA @BBL X1C", + "sub_path": "filament/Overture/Overture Easy PLA @BBL X1C.json" }, { - "name": "Panchroma PLA Celestial @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1.json" + "name": "Overture Easy PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json" + "name": "Overture Rock PLA @BBL A1", + "sub_path": "filament/Overture/Overture Rock PLA @BBL A1.json" }, { - "name": "Panchroma PLA Celestial @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json" + "name": "Overture Rock PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json" + "name": "Overture Rock PLA @BBL A1M", + "sub_path": "filament/Overture/Overture Rock PLA @BBL A1M.json" }, { - "name": "Panchroma PLA Celestial @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json" + "name": "Overture Rock PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json" + "name": "Overture Rock PLA @BBL P1P", + "sub_path": "filament/Overture/Overture Rock PLA @BBL P1P.json" }, { - "name": "Panchroma PLA Celestial @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1.json" + "name": "Overture Rock PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json" + "name": "Overture Rock PLA @BBL X1", + "sub_path": "filament/Overture/Overture Rock PLA @BBL X1.json" }, { - "name": "Panchroma PLA Celestial @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json" + "name": "Overture Rock PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Celestial @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json" + "name": "Overture Rock PLA @BBL X1C", + "sub_path": "filament/Overture/Overture Rock PLA @BBL X1C.json" }, { - "name": "Panchroma PLA Galaxy @base", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @base.json" + "name": "Overture Rock PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma PLA Galaxy @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json" + "name": "Overture Silk PLA @BBL A1", + "sub_path": "filament/Overture/Overture Silk PLA @BBL A1.json" }, { - "name": "Panchroma PLA Galaxy @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json" + "name": "Overture Silk PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Galaxy @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json" + "name": "Overture Silk PLA @BBL A1M", + "sub_path": "filament/Overture/Overture Silk PLA @BBL A1M.json" }, { - "name": "Panchroma PLA Galaxy @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json" + "name": "Overture Silk PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma PLA Galaxy @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json" + "name": "Overture Silk PLA @BBL P1P", + "sub_path": "filament/Overture/Overture Silk PLA @BBL P1P.json" }, { - "name": "Panchroma PLA Galaxy @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json" + "name": "Overture Silk PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma PLA Galaxy @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json" + "name": "Overture Silk PLA @BBL X1", + "sub_path": "filament/Overture/Overture Silk PLA @BBL X1.json" }, { - "name": "Panchroma PLA Galaxy @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json" + "name": "Overture Silk PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Galaxy @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json" + "name": "Overture Silk PLA @BBL X1C", + "sub_path": "filament/Overture/Overture Silk PLA @BBL X1C.json" }, { - "name": "Panchroma PLA Galaxy @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json" + "name": "Overture Silk PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @base", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @base.json" + "name": "Overture Super PLA+ @BBL A1", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1.json" }, { - "name": "Panchroma PLA Glow @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1.json" + "name": "Overture Super PLA+ @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json" + "name": "Overture Super PLA+ @BBL A1M", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1M.json" }, { - "name": "Panchroma PLA Glow @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M.json" + "name": "Overture Super PLA+ @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json" + "name": "Overture Super PLA+ @BBL P1P", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL P1P.json" }, { - "name": "Panchroma PLA Glow @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P.json" + "name": "Overture Super PLA+ @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json" + "name": "Overture Super PLA+ @BBL X1", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1.json" }, { - "name": "Panchroma PLA Glow @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1.json" + "name": "Overture Super PLA+ @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json" + "name": "Overture Super PLA+ @BBL X1C", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1C.json" }, { - "name": "Panchroma PLA Glow @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C.json" + "name": "Overture Super PLA+ @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json" }, { - "name": "Panchroma PLA Glow @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json" + "name": "Overture TPU @BBL A1", + "sub_path": "filament/Overture/Overture TPU @BBL A1.json" }, { - "name": "Panchroma PLA Luminous @base", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @base.json" + "name": "Overture TPU @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Luminous @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1.json" + "name": "Overture TPU @BBL A1M", + "sub_path": "filament/Overture/Overture TPU @BBL A1M.json" }, { - "name": "Panchroma PLA Luminous @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json" + "name": "Overture TPU @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json" }, { - "name": "Panchroma PLA Luminous @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json" + "name": "Overture TPU @BBL P1P", + "sub_path": "filament/Overture/Overture TPU @BBL P1P.json" }, { - "name": "Panchroma PLA Luminous @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json" + "name": "Overture TPU @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json" }, { - "name": "Panchroma PLA Luminous @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json" + "name": "Overture TPU @BBL X1", + "sub_path": "filament/Overture/Overture TPU @BBL X1.json" }, { - "name": "Panchroma PLA Luminous @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json" + "name": "Overture TPU @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json" }, { - "name": "Panchroma PLA Luminous @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1.json" + "name": "Overture TPU @BBL X1C", + "sub_path": "filament/Overture/Overture TPU @BBL X1C.json" }, { - "name": "Panchroma PLA Luminous @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @base", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @base.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P.json" - }, - { - "name": "Panchroma PLA Marble @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @base", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @base.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P.json" - }, - { - "name": "Panchroma PLA Matte @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @base", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @base.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json" - }, - { - "name": "Panchroma PLA Metallic @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @base", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P.json" - }, - { - "name": "Panchroma PLA Neon @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @base", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P.json" - }, - { - "name": "Panchroma PLA Silk @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @base", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M.json" - }, - { - "name": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P.json" - }, - { - "name": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C.json" - }, - { - "name": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @base", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @base.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json" - }, - { - "name": "Panchroma PLA Starlight @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @base.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @base", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @base.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json" - }, - { - "name": "Panchroma PLA Translucent @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @base", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P.json" - }, - { - "name": "PolyLite PLA Pro @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1C", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1M", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL P1P", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P.json" - }, - { - "name": "Polymaker HT-PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1C", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1M", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL P1P", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1C", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json" + "name": "Overture TPU @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json" } ], "machine_list": [ diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..5b373d8720 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture ASA @BBL X1 0.2 nozzle", + "inherits": "Overture ASA @base", + "from": "system", + "setting_id": "GFOT009_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json new file mode 100644 index 0000000000..3a2077f59d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture ASA @BBL X1", + "inherits": "Overture ASA @base", + "from": "system", + "setting_id": "GFOT009_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..d1ef0f94f0 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture ASA @BBL X1C 0.2 nozzle", + "inherits": "Overture ASA @base", + "from": "system", + "setting_id": "GFOT009_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json new file mode 100644 index 0000000000..3b0efbc190 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture ASA @BBL X1C", + "inherits": "Overture ASA @base", + "from": "system", + "setting_id": "GFOT009_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..564990d8db --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL A1 0.2 nozzle", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json new file mode 100644 index 0000000000..d5d2baae64 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL A1", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..a6bb28c435 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL A1M 0.2 nozzle", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json new file mode 100644 index 0000000000..0765f7027f --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL A1M", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..4a59ebc07e --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL P1P 0.2 nozzle", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json new file mode 100644 index 0000000000..dfe519b03b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL P1P", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "8" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..d2845105bb --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL X1 0.2 nozzle", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json new file mode 100644 index 0000000000..6928fa42ef --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL X1", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "8" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..c92aae8c8b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL X1C 0.2 nozzle", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json new file mode 100644 index 0000000000..e8f98a8b14 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Air PLA @BBL X1C", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "GFOT006_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_max_volumetric_speed": [ + "8" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..7eb9ef3b29 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL A1 0.2 nozzle", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json new file mode 100644 index 0000000000..32ee667a1b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL A1", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..7d872128b2 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL A1M 0.2 nozzle", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json new file mode 100644 index 0000000000..ec2ba68888 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL A1M", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..b428062ea0 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL P1P 0.2 nozzle", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json new file mode 100644 index 0000000000..d8fbdb757a --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL P1P", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..b5ab0360bb --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL X1 0.2 nozzle", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json new file mode 100644 index 0000000000..e4ca174d34 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL X1", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..1c45b8d50a --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL X1C 0.2 nozzle", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json new file mode 100644 index 0000000000..dde9ad7c20 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @BBL X1C", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "GFOT003_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL A1.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1M 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1M 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1M.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL A1M.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL A1M.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL P1P 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL P1P 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL P1P.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL P1P.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1C 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1C 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1C.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @BBL X1C.json diff --git a/resources/profiles/BBL/filament/Overture Matte PLA @base.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json similarity index 100% rename from resources/profiles/BBL/filament/Overture Matte PLA @base.json rename to resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL A1.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1M 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1M 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1M.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL A1M.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL A1M.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL P1P 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL P1P 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL P1P.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL P1P.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL P1P.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL X1.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1C 0.2 nozzle.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1C 0.2 nozzle.json diff --git a/resources/profiles/BBL/filament/Overture PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1C.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @BBL X1C.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @BBL X1C.json diff --git a/resources/profiles/BBL/filament/Overture PLA @base.json b/resources/profiles/BBL/filament/Overture/Overture PLA @base.json similarity index 100% rename from resources/profiles/BBL/filament/Overture PLA @base.json rename to resources/profiles/BBL/filament/Overture/Overture PLA @base.json diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..90a5999916 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL A1 0.2 nozzle", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json new file mode 100644 index 0000000000..b9b55fe2bc --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL A1", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..83f410e5ce --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL A1M 0.2 nozzle", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json new file mode 100644 index 0000000000..05747076d5 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL A1M", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..f8aa0d68af --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL P1P 0.2 nozzle", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json new file mode 100644 index 0000000000..5f015ecdff --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL P1P", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..8c8540e534 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL X1 0.2 nozzle", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json new file mode 100644 index 0000000000..82bac8f6ba --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL X1", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..84898e825d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL X1C 0.2 nozzle", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json new file mode 100644 index 0000000000..4e1902505f --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL X1C", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "GFOT001_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json new file mode 100644 index 0000000000..a4512dd03e --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT001", + "instantiation": "false", + "filament_cost": [ + "26.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "64" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..b4520fefc2 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL A1 0.2 nozzle", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json new file mode 100644 index 0000000000..212593634b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL A1", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..896ca62106 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL A1M 0.2 nozzle", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json new file mode 100644 index 0000000000..b773c0422e --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL A1M", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..e214bf463d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL P1P 0.2 nozzle", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json new file mode 100644 index 0000000000..237e505397 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL P1P", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..3e3fd51870 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL X1 0.2 nozzle", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json new file mode 100644 index 0000000000..cdc6d2e117 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL X1", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..5d75c00081 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL X1C 0.2 nozzle", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json new file mode 100644 index 0000000000..6c36ff098d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @BBL X1C", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "GFOT004_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..6d8db9eff1 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL A1 0.2 nozzle", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json new file mode 100644 index 0000000000..9dbb955d9a --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL A1", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..41dbef4a73 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL A1M 0.2 nozzle", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json new file mode 100644 index 0000000000..4069af26b4 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL A1M", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "2" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..0908a0d995 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL P1P 0.2 nozzle", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json new file mode 100644 index 0000000000..a41785c887 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL P1P", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..107d56465b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL X1 0.2 nozzle", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json new file mode 100644 index 0000000000..bdcb4d828d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL X1", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..1605f96859 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL X1C 0.2 nozzle", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json new file mode 100644 index 0000000000..46ee4962e3 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @BBL X1C", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "GFOT002_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..56cd756693 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL A1 0.2 nozzle", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "9" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json new file mode 100644 index 0000000000..4d5ff1ac1b --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL A1", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "9" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..2c57cd286a --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL A1M 0.2 nozzle", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "9" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json new file mode 100644 index 0000000000..81524272eb --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL A1M", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "9" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..dcd5735c6a --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL P1P 0.2 nozzle", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json new file mode 100644 index 0000000000..eaec9a6a79 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL P1P", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..48d2fd6225 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL X1 0.2 nozzle", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json new file mode 100644 index 0000000000..eba0a2d3e7 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL X1", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..c07c56f6a3 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json @@ -0,0 +1,28 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL X1C 0.2 nozzle", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json new file mode 100644 index 0000000000..4b85f840e5 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @BBL X1C", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "GFOT005_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "21" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json new file mode 100644 index 0000000000..589b09df6d --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL A1 0.2 nozzle", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_01", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json new file mode 100644 index 0000000000..ac46b7d49f --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL A1", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_00", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 0.4 nozzle", + "Bambu Lab A1 0.6 nozzle", + "Bambu Lab A1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json new file mode 100644 index 0000000000..960fbf49dd --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL A1M 0.2 nozzle", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_03", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json new file mode 100644 index 0000000000..c5223e9a62 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL A1M", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_02", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab A1 mini 0.4 nozzle", + "Bambu Lab A1 mini 0.6 nozzle", + "Bambu Lab A1 mini 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json new file mode 100644 index 0000000000..04406588e0 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL P1P 0.2 nozzle", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_05", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json new file mode 100644 index 0000000000..2d017c6645 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL P1P", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_04", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json new file mode 100644 index 0000000000..3bc9104f68 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL X1 0.2 nozzle", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_07", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json new file mode 100644 index 0000000000..9b3f5bcea6 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL X1", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_06", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json new file mode 100644 index 0000000000..9096b73f78 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL X1C 0.2 nozzle", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_09", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab P1S 0.2 nozzle", + "Bambu Lab X1E 0.2 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "1.6" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json new file mode 100644 index 0000000000..64bf6da618 --- /dev/null +++ b/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Overture TPU @BBL X1C", + "inherits": "Overture TPU @base", + "from": "system", + "setting_id": "GFOT008_08", + "instantiation": "true", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "10" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index 9cc8b4ad05..568a19f610 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -8,6 +8,10 @@ "name": "fdm_filament_common", "sub_path": "filament/base/fdm_filament_common.json" }, + { + "name": "FusRock ABS-GF @base", + "sub_path": "filament/FusRock/FusRock ABS-GF @base.json" + }, { "name": "fdm_filament_abs", "sub_path": "filament/base/fdm_filament_abs.json" @@ -80,6 +84,10 @@ "name": "fdm_filament_tpu", "sub_path": "filament/base/fdm_filament_tpu.json" }, + { + "name": "FusRock ABS-GF @System", + "sub_path": "filament/FusRock/FusRock ABS-GF @System.json" + }, { "name": "Bambu ABS @base", "sub_path": "filament/Bambu/Bambu ABS @base.json" @@ -92,10 +100,22 @@ "name": "Bambu Support for ABS @base", "sub_path": "filament/Bambu/Bambu Support for ABS @base.json" }, + { + "name": "FDplast ABS @base", + "sub_path": "filament/FDplast/FDplast ABS @base.json" + }, { "name": "Generic ABS @System", "sub_path": "filament/Generic ABS @System.json" }, + { + "name": "NIT ABS @base", + "sub_path": "filament/NIT/NIT ABS @base.json" + }, + { + "name": "Overture ABS Basic @base", + "sub_path": "filament/Overture/Overture ABS Basic @base.json" + }, { "name": "PolyLite ABS @base", "sub_path": "filament/Polymaker/PolyLite ABS @base.json" @@ -116,6 +136,10 @@ "name": "Generic ASA @System", "sub_path": "filament/Generic ASA @System.json" }, + { + "name": "Overture ASA @base", + "sub_path": "filament/Overture/Overture ASA @base.json" + }, { "name": "PolyLite ASA @base", "sub_path": "filament/Polymaker/PolyLite ASA @base.json" @@ -128,6 +152,10 @@ "name": "Generic EVA @System", "sub_path": "filament/Generic EVA @System.json" }, + { + "name": "FDplast HIPS @base", + "sub_path": "filament/FDplast/FDplast HIPS @base.json" + }, { "name": "Generic HIPS @System", "sub_path": "filament/Generic HIPS @System.json" @@ -232,6 +260,10 @@ "name": "Bambu PETG-CF @base", "sub_path": "filament/Bambu/Bambu PETG-CF @base.json" }, + { + "name": "FDplast PETG @base", + "sub_path": "filament/FDplast/FDplast PETG @base.json" + }, { "name": "Fiberon PET-CF @base", "sub_path": "filament/Polymaker/Fiberon PET-CF @base.json" @@ -256,6 +288,10 @@ "name": "Generic PETG-CF @System", "sub_path": "filament/Generic PETG-CF @System.json" }, + { + "name": "NIT PETG @base", + "sub_path": "filament/NIT/NIT PETG @base.json" + }, { "name": "PolyLite PETG @base", "sub_path": "filament/Polymaker/PolyLite PETG @base.json" @@ -264,6 +300,10 @@ "name": "SUNLU PETG @base", "sub_path": "filament/SUNLU/SUNLU PETG @base.json" }, + { + "name": "eSUN PETG @base", + "sub_path": "filament/eSUN/eSUN PETG @base.json" + }, { "name": "Generic PHA @System", "sub_path": "filament/Generic PHA @System.json" @@ -344,6 +384,10 @@ "name": "Bambu Support W @base", "sub_path": "filament/Bambu/Bambu Support W @base.json" }, + { + "name": "FDplast PLA @base", + "sub_path": "filament/FDplast/FDplast PLA @base.json" + }, { "name": "Generic PLA @System", "sub_path": "filament/Generic PLA @System.json" @@ -360,6 +404,18 @@ "name": "Generic PLA-CF @System", "sub_path": "filament/Generic PLA-CF @System.json" }, + { + "name": "NIT PLA @base", + "sub_path": "filament/NIT/NIT PLA @base.json" + }, + { + "name": "Overture Air PLA @base", + "sub_path": "filament/Overture/Overture Air PLA @base.json" + }, + { + "name": "Overture Easy PLA @base", + "sub_path": "filament/Overture/Overture Easy PLA @base.json" + }, { "name": "Overture Matte PLA @base", "sub_path": "filament/Overture/Overture Matte PLA @base.json" @@ -369,37 +425,105 @@ "sub_path": "filament/Overture/Overture PLA @base.json" }, { - "name": "Overture TPU @base", - "sub_path": "filament/Overture/Overture TPU @base.json" + "name": "Overture PLA Pro @base", + "sub_path": "filament/Overture/Overture PLA Pro @base.json" }, { - "name": "Overture ABS Basic @base", - "sub_path": "filament/Overture/Overture ABS Basic @base.json" + "name": "Overture Rock PLA @base", + "sub_path": "filament/Overture/Overture Rock PLA @base.json" }, { - "name": "Valment PLA @base", - "sub_path": "filament/Valment/Valment PLA @base.json" + "name": "Overture Silk PLA @base", + "sub_path": "filament/Overture/Overture Silk PLA @base.json" }, { - "name": "Valment PLA Silk @base", - "sub_path": "filament/Valment/Valment PLA Silk @base.json" + "name": "Overture Super PLA+ @base", + "sub_path": "filament/Overture/Overture Super PLA+ @base.json" }, { - "name": "Valment PLA-CF @base", - "sub_path": "filament/Valment/Valment PLA-CF @base.json" + "name": "Panchroma CoPE @base", + "sub_path": "filament/Polymaker/Panchroma CoPE @base.json" }, { - "name": "Valment PLA Galaxy @base", - "sub_path": "filament/Valment/Valment PLA Galaxy @base.json" + "name": "Panchroma PLA @base", + "sub_path": "filament/Polymaker/Panchroma PLA @base.json" + }, + { + "name": "Panchroma PLA Celestial @base", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @base.json" + }, + { + "name": "Panchroma PLA Galaxy @base", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @base.json" + }, + { + "name": "Panchroma PLA Glow @base", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @base.json" + }, + { + "name": "Panchroma PLA Luminous @base", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @base.json" + }, + { + "name": "Panchroma PLA Marble @base", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @base.json" + }, + { + "name": "Panchroma PLA Matte @base", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @base.json" + }, + { + "name": "Panchroma PLA Metallic @base", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @base.json" + }, + { + "name": "Panchroma PLA Neon @base", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" + }, + { + "name": "Panchroma PLA Silk @base", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" + }, + { + "name": "Panchroma PLA Stain @base", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" + }, + { + "name": "Panchroma PLA Starlight @base", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @base.json" + }, + { + "name": "Panchroma PLA Temp Shift @base", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @base.json" + }, + { + "name": "Panchroma PLA Translucent @base", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @base.json" + }, + { + "name": "Panchroma PLA UV Shift @base", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" }, { "name": "PolyLite PLA @base", "sub_path": "filament/Polymaker/PolyLite PLA @base.json" }, + { + "name": "PolyLite PLA Pro @base", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" + }, { "name": "PolyTerra PLA @base", "sub_path": "filament/Polymaker/PolyTerra PLA @base.json" }, + { + "name": "Polymaker HT-PLA @base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" + }, + { + "name": "Polymaker HT-PLA-GF @base", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" + }, { "name": "SUNLU PLA Marble @base", "sub_path": "filament/SUNLU/SUNLU Marble PLA @base.json" @@ -424,13 +548,29 @@ "name": "SUNLU Wood PLA @base", "sub_path": "filament/SUNLU/SUNLU Wood PLA @base.json" }, + { + "name": "Valment PLA @base", + "sub_path": "filament/Valment/Valment PLA @base.json" + }, + { + "name": "Valment PLA Galaxy @base", + "sub_path": "filament/Valment/Valment PLA Galaxy @base.json" + }, + { + "name": "Valment PLA Silk @base", + "sub_path": "filament/Valment/Valment PLA Silk @base.json" + }, + { + "name": "Valment PLA-CF @base", + "sub_path": "filament/Valment/Valment PLA-CF @base.json" + }, { "name": "eSUN PLA+ @base", "sub_path": "filament/eSUN/eSUN PLA+ @base.json" }, { - "name": "eSUN PETG @base", - "sub_path": "filament/eSUN/eSUN PETG @base.json" + "name": "eSUN ePLA-LW @System", + "sub_path": "filament/eSUN/eSUN ePLA-LW @System.json" }, { "name": "fdm_filament_pla_silk", @@ -472,6 +612,10 @@ "name": "Generic PVA @System", "sub_path": "filament/Generic PVA @System.json" }, + { + "name": "FDplast SBS @base", + "sub_path": "filament/FDplast/FDplast SBS @base.json" + }, { "name": "Generic SBS @System", "sub_path": "filament/Generic SBS @System.json" @@ -484,10 +628,18 @@ "name": "Bambu TPU 95A HF @base", "sub_path": "filament/Bambu/Bambu TPU 95A HF @base.json" }, + { + "name": "FDplast TPU @base", + "sub_path": "filament/FDplast/FDplast TPU @base.json" + }, { "name": "Generic TPU @System", "sub_path": "filament/Generic TPU @System.json" }, + { + "name": "Overture TPU @base", + "sub_path": "filament/Overture/Overture TPU @base.json" + }, { "name": "Bambu ABS @System", "sub_path": "filament/Bambu/Bambu ABS @System.json" @@ -500,6 +652,18 @@ "name": "Bambu Support for ABS @System", "sub_path": "filament/Bambu/Bambu Support for ABS @System.json" }, + { + "name": "FDplast ABS @System", + "sub_path": "filament/FDplast/FDplast ABS @System.json" + }, + { + "name": "NIT ABS @System", + "sub_path": "filament/NIT/NIT ABS @System.json" + }, + { + "name": "Overture ABS Basic @System", + "sub_path": "filament/Overture/Overture ABS Basic @System.json" + }, { "name": "PolyLite ABS @System", "sub_path": "filament/Polymaker/PolyLite ABS @System.json" @@ -516,10 +680,18 @@ "name": "Bambu ASA-CF @System", "sub_path": "filament/Bambu/Bambu ASA-CF @System.json" }, + { + "name": "Overture ASA @System", + "sub_path": "filament/Overture/Overture ASA @System.json" + }, { "name": "PolyLite ASA @System", "sub_path": "filament/Polymaker/PolyLite ASA @System.json" }, + { + "name": "FDplast HIPS @System", + "sub_path": "filament/FDplast/FDplast HIPS @System.json" + }, { "name": "AliZ PA-CF @System", "sub_path": "filament/AliZ/AliZ PA-CF @System.json" @@ -604,6 +776,10 @@ "name": "Bambu PETG-CF @System", "sub_path": "filament/Bambu/Bambu PETG-CF @System.json" }, + { + "name": "FDplast PETG @System", + "sub_path": "filament/FDplast/FDplast PETG @System.json" + }, { "name": "Fiberon PET-CF @System", "sub_path": "filament/Polymaker/Fiberon PET-CF @System.json" @@ -616,6 +792,10 @@ "name": "Fiberon PETG-rCF @System", "sub_path": "filament/Polymaker/Fiberon PETG-rCF @System.json" }, + { + "name": "NIT PETG @System", + "sub_path": "filament/NIT/NIT PETG @System.json" + }, { "name": "PolyLite PETG @System", "sub_path": "filament/Polymaker/PolyLite PETG @System.json" @@ -624,6 +804,10 @@ "name": "SUNLU PETG @System", "sub_path": "filament/SUNLU/SUNLU PETG @System.json" }, + { + "name": "eSUN PETG @System", + "sub_path": "filament/eSUN/eSUN PETG @System.json" + }, { "name": "AliZ PLA @System", "sub_path": "filament/AliZ/AliZ PLA @System.json" @@ -700,6 +884,22 @@ "name": "Bambu Support W @System", "sub_path": "filament/Bambu/Bambu Support W @System.json" }, + { + "name": "FDplast PLA @System", + "sub_path": "filament/FDplast/FDplast PLA @System.json" + }, + { + "name": "NIT PLA @System", + "sub_path": "filament/NIT/NIT PLA @System.json" + }, + { + "name": "Overture Air PLA @System", + "sub_path": "filament/Overture/Overture Air PLA @System.json" + }, + { + "name": "Overture Easy PLA @System", + "sub_path": "filament/Overture/Overture Easy PLA @System.json" + }, { "name": "Overture Matte PLA @System", "sub_path": "filament/Overture/Overture Matte PLA @System.json" @@ -709,28 +909,84 @@ "sub_path": "filament/Overture/Overture PLA @System.json" }, { - "name": "Overture TPU @System", - "sub_path": "filament/Overture/Overture TPU @System.json" + "name": "Overture PLA Pro @System", + "sub_path": "filament/Overture/Overture PLA Pro @System.json" }, { - "name": "Overture ABS Basic @System", - "sub_path": "filament/Overture/Overture ABS Basic @System.json" + "name": "Overture Rock PLA @System", + "sub_path": "filament/Overture/Overture Rock PLA @System.json" }, { - "name": "Valment PLA @System", - "sub_path": "filament/Valment/Valment PLA @System.json" + "name": "Overture Silk PLA @System", + "sub_path": "filament/Overture/Overture Silk PLA @System.json" }, { - "name": "Valment PLA Silk @System", - "sub_path": "filament/Valment/Valment PLA Silk @System.json" + "name": "Overture Super PLA+ @System", + "sub_path": "filament/Overture/Overture Super PLA+ @System.json" }, { - "name": "Valment PLA-CF @System", - "sub_path": "filament/Valment/Valment PLA-CF @System.json" + "name": "Panchroma CoPE @System", + "sub_path": "filament/Polymaker/Panchroma CoPE @System.json" }, { - "name": "Valment PLA Galaxy @System", - "sub_path": "filament/Valment/Valment PLA Galaxy @System.json" + "name": "Panchroma PLA @System", + "sub_path": "filament/Polymaker/Panchroma PLA @System.json" + }, + { + "name": "Panchroma PLA Celestial @System", + "sub_path": "filament/Polymaker/Panchroma PLA Celestial @System.json" + }, + { + "name": "Panchroma PLA Galaxy @System", + "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @System.json" + }, + { + "name": "Panchroma PLA Glow @System", + "sub_path": "filament/Polymaker/Panchroma PLA Glow @System.json" + }, + { + "name": "Panchroma PLA Luminous @System", + "sub_path": "filament/Polymaker/Panchroma PLA Luminous @System.json" + }, + { + "name": "Panchroma PLA Marble @System", + "sub_path": "filament/Polymaker/Panchroma PLA Marble @System.json" + }, + { + "name": "Panchroma PLA Matte @System", + "sub_path": "filament/Polymaker/Panchroma PLA Matte @System.json" + }, + { + "name": "Panchroma PLA Metallic @System", + "sub_path": "filament/Polymaker/Panchroma PLA Metallic @System.json" + }, + { + "name": "Panchroma PLA Neon @System", + "sub_path": "filament/Polymaker/Panchroma PLA Neon @System.json" + }, + { + "name": "Panchroma PLA Silk @System", + "sub_path": "filament/Polymaker/Panchroma PLA Silk @System.json" + }, + { + "name": "Panchroma PLA Stain @System", + "sub_path": "filament/Polymaker/Panchroma PLA Stain @System.json" + }, + { + "name": "Panchroma PLA Starlight @System", + "sub_path": "filament/Polymaker/Panchroma PLA Starlight @System.json" + }, + { + "name": "Panchroma PLA Temp Shift @System", + "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @System.json" + }, + { + "name": "Panchroma PLA Translucent @System", + "sub_path": "filament/Polymaker/Panchroma PLA Translucent @System.json" + }, + { + "name": "Panchroma PLA UV Shift @System", + "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @System.json" }, { "name": "PolyLite Dual PLA @System", @@ -740,6 +996,10 @@ "name": "PolyLite PLA @System", "sub_path": "filament/Polymaker/PolyLite PLA @System.json" }, + { + "name": "PolyLite PLA Pro @System", + "sub_path": "filament/Polymaker/PolyLite PLA Pro @System.json" + }, { "name": "PolyTerra Dual PLA @System", "sub_path": "filament/Polymaker/PolyTerra Dual PLA @System.json" @@ -748,6 +1008,14 @@ "name": "PolyTerra PLA @System", "sub_path": "filament/Polymaker/PolyTerra PLA @System.json" }, + { + "name": "Polymaker HT-PLA @System", + "sub_path": "filament/Polymaker/Polymaker HT-PLA @System.json" + }, + { + "name": "Polymaker HT-PLA-GF @System", + "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @System.json" + }, { "name": "SUNLU PLA Marble @System", "sub_path": "filament/SUNLU/SUNLU Marble PLA @System.json" @@ -772,18 +1040,26 @@ "name": "SUNLU Wood PLA @System", "sub_path": "filament/SUNLU/SUNLU Wood PLA @System.json" }, + { + "name": "Valment PLA @System", + "sub_path": "filament/Valment/Valment PLA @System.json" + }, + { + "name": "Valment PLA Galaxy @System", + "sub_path": "filament/Valment/Valment PLA Galaxy @System.json" + }, + { + "name": "Valment PLA Silk @System", + "sub_path": "filament/Valment/Valment PLA Silk @System.json" + }, + { + "name": "Valment PLA-CF @System", + "sub_path": "filament/Valment/Valment PLA-CF @System.json" + }, { "name": "eSUN PLA+ @System", "sub_path": "filament/eSUN/eSUN PLA+ @System.json" }, - { - "name": "eSUN ePLA-LW @System", - "sub_path": "filament/eSUN/eSUN ePLA-LW @System.json" - }, - { - "name": "eSUN PETG @System", - "sub_path": "filament/eSUN/eSUN PETG @System.json" - }, { "name": "Generic PLA Silk @System", "sub_path": "filament/Generic PLA Silk @System.json" @@ -796,6 +1072,10 @@ "name": "Bambu PVA @System", "sub_path": "filament/Bambu/Bambu PVA @System.json" }, + { + "name": "FDplast SBS @System", + "sub_path": "filament/FDplast/FDplast SBS @System.json" + }, { "name": "Bambu TPU 95A @System", "sub_path": "filament/Bambu/Bambu TPU 95A @System.json" @@ -805,12 +1085,12 @@ "sub_path": "filament/Bambu/Bambu TPU 95A HF @System.json" }, { - "name": "FusRock ABS-GF @base", - "sub_path": "filament/FusRock/FusRock ABS-GF @base.json" + "name": "FDplast TPU @System", + "sub_path": "filament/FDplast/FDplast TPU @System.json" }, { - "name": "FusRock ABS-GF @System", - "sub_path": "filament/FusRock/FusRock ABS-GF @System.json" + "name": "Overture TPU @System", + "sub_path": "filament/Overture/Overture TPU @System.json" }, { "name": "AliZ PETG-CF @System", @@ -819,230 +1099,7 @@ { "name": "AliZ PETG-Metal @System", "sub_path": "filament/AliZ/AliZ PETG-Metal @System.json" - }, - { - "name": "Panchroma CoPE @base", - "sub_path": "filament/Polymaker/Panchroma CoPE @base.json" - }, - { - "name": "Panchroma CoPE @System", - "sub_path": "filament/Polymaker/Panchroma CoPE @System.json" - }, - { - "name": "Panchroma PLA @base", - "sub_path": "filament/Polymaker/Panchroma PLA @base.json" - }, - { - "name": "Panchroma PLA @System", - "sub_path": "filament/Polymaker/Panchroma PLA @System.json" - }, - { - "name": "Panchroma PLA Celestial @base", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @base.json" - }, - { - "name": "Panchroma PLA Celestial @System", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @System.json" - }, - { - "name": "Panchroma PLA Galaxy @base", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @base.json" - }, - { - "name": "Panchroma PLA Galaxy @System", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @System.json" - }, - { - "name": "Panchroma PLA Glow @base", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @base.json" - }, - { - "name": "Panchroma PLA Glow @System", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @System.json" - }, - { - "name": "Panchroma PLA Luminous @base", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @base.json" - }, - { - "name": "Panchroma PLA Luminous @System", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @System.json" - }, - { - "name": "Panchroma PLA Marble @base", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @base.json" - }, - { - "name": "Panchroma PLA Marble @System", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @System.json" - }, - { - "name": "Panchroma PLA Matte @base", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @base.json" - }, - { - "name": "Panchroma PLA Matte @System", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @System.json" - }, - { - "name": "Panchroma PLA Metallic @base", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @base.json" - }, - { - "name": "Panchroma PLA Metallic @System", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @System.json" - }, - { - "name": "Panchroma PLA Neon @base", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" - }, - { - "name": "Panchroma PLA Neon @System", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @System.json" - }, - { - "name": "Panchroma PLA Silk @base", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" - }, - { - "name": "Panchroma PLA Silk @System", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @System.json" - }, - { - "name": "Panchroma PLA Stain @base", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @base.json" - }, - { - "name": "Panchroma PLA Stain @System", - "sub_path": "filament/Polymaker/Panchroma PLA Stain @System.json" - }, - { - "name": "Panchroma PLA Starlight @base", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @base.json" - }, - { - "name": "Panchroma PLA Starlight @System", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @System.json" - }, - { - "name": "Panchroma PLA Temp Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @base.json" - }, - { - "name": "Panchroma PLA Temp Shift @System", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @System.json" - }, - { - "name": "Panchroma PLA Translucent @base", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @base.json" - }, - { - "name": "Panchroma PLA Translucent @System", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @System.json" - }, - { - "name": "Panchroma PLA UV Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" - }, - { - "name": "Panchroma PLA UV Shift @System", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @System.json" - }, - { - "name": "PolyLite PLA Pro @base", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" - }, - { - "name": "PolyLite PLA Pro @System", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @System.json" - }, - { - "name": "Polymaker HT-PLA @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" - }, - { - "name": "Polymaker HT-PLA @System", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @System.json" - }, - { - "name": "Polymaker HT-PLA-GF @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" - }, - { - "name": "Polymaker HT-PLA-GF @System", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @System.json" - }, - { - "name": "NIT ABS @base", - "sub_path": "filament/NIT/NIT ABS @base.json" - }, - { - "name": "NIT ABS @System", - "sub_path": "filament/NIT/NIT ABS @System.json" - }, - { - "name": "NIT PETG @base", - "sub_path": "filament/NIT/NIT PETG @base.json" - }, - { - "name": "NIT PETG @System", - "sub_path": "filament/NIT/NIT PETG @System.json" - }, - { - "name": "NIT PLA @base", - "sub_path": "filament/NIT/NIT PLA @base.json" - }, - { - "name": "NIT PLA @System", - "sub_path": "filament/NIT/NIT PLA @System.json" - }, - { - "name": "FDplast ABS @base", - "sub_path": "filament/FDplast/FDplast ABS @base.json" - }, - { - "name": "FDplast ABS @System", - "sub_path": "filament/FDplast/FDplast ABS @System.json" - }, - { - "name": "FDplast HIPS @base", - "sub_path": "filament/FDplast/FDplast HIPS @base.json" - }, - { - "name": "FDplast HIPS @System", - "sub_path": "filament/FDplast/FDplast HIPS @System.json" - }, - { - "name": "FDplast PETG @base", - "sub_path": "filament/FDplast/FDplast PETG @base.json" - }, - { - "name": "FDplast PETG @System", - "sub_path": "filament/FDplast/FDplast PETG @System.json" - }, - { - "name": "FDplast PLA @base", - "sub_path": "filament/FDplast/FDplast PLA @base.json" - }, - { - "name": "FDplast PLA @System", - "sub_path": "filament/FDplast/FDplast PLA @System.json" - }, - { - "name": "FDplast SBS @base", - "sub_path": "filament/FDplast/FDplast SBS @base.json" - }, - { - "name": "FDplast SBS @System", - "sub_path": "filament/FDplast/FDplast SBS @System.json" - }, - { - "name": "FDplast TPU @base", - "sub_path": "filament/FDplast/FDplast TPU @base.json" - }, - { - "name": "FDplast TPU @System", - "sub_path": "filament/FDplast/FDplast TPU @System.json" } - ] + ], + "process_list": [] } \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @System.json new file mode 100644 index 0000000000..0729389fed --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture ASA @System", + "inherits": "Overture ASA @base", + "from": "system", + "setting_id": "OGFOT009", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json new file mode 100644 index 0000000000..e9d21afe42 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Overture ASA @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "GFOT009", + "instantiation": "false", + "fan_cooling_layer_time": [ + "45" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.14" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_vendor": [ + "Overture" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "slow_down_layer_time": [ + "2" + ], + "temperature_vitrification": [ + "106" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @System.json new file mode 100644 index 0000000000..5e69c5ec23 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture Air PLA @System", + "inherits": "Overture Air PLA @base", + "from": "system", + "setting_id": "OGFOT006", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json new file mode 100644 index 0000000000..966bf32c7f --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture Air PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT006", + "instantiation": "false", + "filament_cost": [ + "27.99" + ], + "filament_density": [ + "0.82" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "64" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @System.json new file mode 100644 index 0000000000..89bf0aacdb --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @System", + "inherits": "Overture Easy PLA @base", + "from": "system", + "setting_id": "OGFOT003", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json new file mode 100644 index 0000000000..9292f95c8e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture Easy PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT003", + "instantiation": "false", + "filament_cost": [ + "17.99" + ], + "filament_density": [ + "1.2" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "66" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @System.json new file mode 100644 index 0000000000..7303099b5e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @System", + "inherits": "Overture PLA Pro @base", + "from": "system", + "setting_id": "OGFOT001", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json new file mode 100644 index 0000000000..a4512dd03e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT001", + "instantiation": "false", + "filament_cost": [ + "26.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "64" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @System.json new file mode 100644 index 0000000000..2959486c91 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @System", + "inherits": "Overture Rock PLA @base", + "from": "system", + "setting_id": "OGFOT004", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json new file mode 100644 index 0000000000..cc94b9e36c --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture Rock PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT004", + "instantiation": "false", + "filament_cost": [ + "24.99" + ], + "filament_density": [ + "1.3" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "63" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @System.json new file mode 100644 index 0000000000..6418cf8b04 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @System", + "inherits": "Overture Silk PLA @base", + "from": "system", + "setting_id": "OGFOT002", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json new file mode 100644 index 0000000000..7e6dfdeebd --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture Silk PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT002", + "instantiation": "false", + "filament_cost": [ + "25.99" + ], + "filament_density": [ + "1.19" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "220" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "58" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @System.json new file mode 100644 index 0000000000..c1b992982c --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @System", + "inherits": "Overture Super PLA+ @base", + "from": "system", + "setting_id": "OGFOT005", + "instantiation": "true", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json new file mode 100644 index 0000000000..c2bc006270 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json @@ -0,0 +1,41 @@ +{ + "type": "filament", + "name": "Overture Super PLA+ @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFOT005", + "instantiation": "false", + "filament_cost": [ + "28.99" + ], + "filament_density": [ + "1.21" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Overture" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "slow_down_layer_time": [ + "4" + ], + "temperature_vitrification": [ + "63" + ] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @System.json index 4f004c6c12..2108412d3b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @System.json @@ -3,12 +3,12 @@ "name": "Overture TPU @System", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "OFOVT08", + "setting_id": "OGFOT008", "instantiation": "true", - "filament_max_volumetric_speed": [ - "4" + "filament_flow_ratio": [ + "0.95" ], - "filament_long_retractions_when_cut": ["0"], - "filament_retraction_distances_when_cut": ["0"], - "compatible_printers": [] + "filament_max_volumetric_speed": [ + "8" + ] } \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json index 9485dd5fe9..7d1debdd99 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json @@ -3,50 +3,10 @@ "name": "Overture TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OGFOVT08", + "filament_id": "GFOT008", "instantiation": "false", - "description": "Overture TPU settings from https://overture3d.com/.", - "activate_air_filtration": [ - "0" - ], - "additional_cooling_fan_speed": [ - "100" - ], - "chamber_temperatures": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "70" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "during_print_exhaust_fan_speed": [ - "70" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "0" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], "fan_cooling_layer_time": [ - "120" + "100" ], "fan_max_speed": [ "100" @@ -55,92 +15,25 @@ "100" ], "filament_cost": [ - "0" + "29.99" ], "filament_density": [ "1.18" ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode \nM106 P3 S0\n" - ], "filament_flow_ratio": [ - "0.95" + "1" ], - "filament_is_support": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_notes": "", - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "0.4" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_soluble": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" - ], - "filament_type": [ - "TPU" + "filament_max_volumetric_speed": [ + "10" ], "filament_vendor": [ - "OVERTURE" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "35" - ], - "hot_plate_temp_initial_layer": [ - "35" + "Overture" ], "nozzle_temperature": [ - "230" + "220" ], "nozzle_temperature_initial_layer": [ - "230" + "220" ], "nozzle_temperature_range_high": [ "230" @@ -148,37 +41,10 @@ "nozzle_temperature_range_low": [ "210" ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "95%" - ], - "pressure_advance": [ - "0.02" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], "slow_down_layer_time": [ - "120" - ], - "slow_down_min_speed": [ - "20" + "15" ], "temperature_vitrification": [ - "0" - ], - "textured_plate_temp": [ - "35" - ], - "textured_plate_temp_initial_layer": [ - "35" - ] + "30" + ] } \ No newline at end of file diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 5bff4feb00..e8294ea673 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -845,7 +845,6 @@ std::vector group_fills(const Layer &layer, LockRegionParam &lock_p params.extruder = layerm.region().extruder(extrusion_role); params.pattern = region_config.sparse_infill_pattern.value; params.density = float(region_config.sparse_infill_density); - params.multiline = int(region_config.fill_multiline); params.lateral_lattice_angle_1 = region_config.lateral_lattice_angle_1; params.lateral_lattice_angle_2 = region_config.lateral_lattice_angle_2; params.infill_overhang_angle = region_config.infill_overhang_angle; @@ -896,6 +895,9 @@ std::vector group_fills(const Layer &layer, LockRegionParam &lock_p params.extrusion_role = erSolidInfill; } } + // Orca: apply fill multiline only for sparse infill + params.multiline = params.extrusion_role == erInternalInfill ? int(region_config.fill_multiline) : 1; + if (params.extrusion_role == erInternalInfill) { params.angle = calculate_infill_rotation_angle(layer.object(), layer.id(), region_config.infill_direction.value, region_config.sparse_infill_rotate_template.value); diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.hpp b/src/libslic3r/Fill/Fill3DHoneycomb.hpp index ccb37a36a0..2d6664ddf4 100644 --- a/src/libslic3r/Fill/Fill3DHoneycomb.hpp +++ b/src/libslic3r/Fill/Fill3DHoneycomb.hpp @@ -15,8 +15,9 @@ public: Fill* clone() const override { return new Fill3DHoneycomb(*this); }; ~Fill3DHoneycomb() override {} - // require bridge flow since most of this pattern hangs in air - bool use_bridge_flow() const override { return true; } + // note: updated 3D Honeycomb doesn't need bridge flow because the + // pattern is placed on top of previous layers + bool use_bridge_flow() const override { return false; } bool is_self_crossing() override { return false; } protected: diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 3644860c1a..4138ef0511 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -3044,7 +3044,7 @@ Polylines FillRectilinear::fill_surface(const Surface *surface, const FillParams { Polylines polylines_out; // Orca Todo: fow now don't use fill_surface_by_multilines for zipzag infill - if (params.full_infill() || params.pattern == ipCrossZag || params.pattern == ipZigZag || params.pattern == ipLockedZag) { + if (params.full_infill() || params.multiline == 1 || params.pattern == ipCrossZag || params.pattern == ipZigZag || params.pattern == ipLockedZag) { if (!fill_surface_by_lines(surface, params, 0.f, 0.f, polylines_out)) BOOST_LOG_TRIVIAL(error) << "FillRectilinear::fill_surface() fill_surface_by_lines() failed to fill a region."; } else { diff --git a/src/libslic3r/Fill/FillTpmsFK.cpp b/src/libslic3r/Fill/FillTpmsFK.cpp index aa4a9442f6..189c479cc8 100644 --- a/src/libslic3r/Fill/FillTpmsFK.cpp +++ b/src/libslic3r/Fill/FillTpmsFK.cpp @@ -7,7 +7,6 @@ #include #include #include -#include namespace Slic3r { @@ -157,8 +156,8 @@ vector getGridValues(int i, int j, vector>& data) values.push_back(data[i][j]); return values; } -bool needContour(double value, double contourValue) { return value >= contourValue; } -Point interpolate(std::vector>& posxy, +static bool needContour(double value, double contourValue) { return value >= contourValue; } +static Point interpolate(std::vector>& posxy, std::vector p1ij, std::vector p2ij, double v1, @@ -186,7 +185,7 @@ Point interpolate(std::vector>& posxy, return p; } -void process_block(int i, +static void process_block(int i, int j, vector>& data, double contourValue, @@ -288,43 +287,7 @@ void process_block(int i, } } -// --- Chaikin Smooth --- - -static Polyline chaikin_smooth(Polyline poly, int iterations , double weight ) -{ - if (poly.points.size() < 3) return poly; - - const double w1 = 1.0 - weight; - decltype(poly.points) buffer; - buffer.reserve(poly.points.size() * 2); - - for (int it = 0; it < iterations; ++it) { - buffer.clear(); - buffer.push_back(poly.points.front()); - - for (size_t i = 0; i < poly.points.size() - 1; ++i) { - const auto &p0 = poly.points[i]; - const auto &p1 = poly.points[i + 1]; - - buffer.emplace_back( - p0.x() * w1 + p1.x() * weight, - p0.y() * w1 + p1.y() * weight - ); - buffer.emplace_back( - p0.x() * weight + p1.x() * w1, - p0.y() * weight + p1.y() * w1 - ); - } - - buffer.push_back(poly.points.back()); - poly.points.swap(buffer); - } - - return poly; -} - - -void drawContour(double contourValue, +static void drawContour(double contourValue, int gridSize_w, int gridSize_h, vector>& data, @@ -382,62 +345,18 @@ void drawContour(double contourValue, for (myPoint& pt : p) { repltmp.points.push_back(Slic3r::Point(pt.x, pt.y)); } - // symplify tolerance based on density - const float min_tolerance = 0.005f; - const float max_tolerance = 0.2f; - float simplify_tolerance = (0.005f / params.density); - simplify_tolerance = std::clamp(simplify_tolerance, min_tolerance, max_tolerance); - repltmp.simplify(scale_(simplify_tolerance)); - repltmp = chaikin_smooth(repltmp, 2, 0.25); repls.push_back(repltmp); } } } // namespace MarchingSquares -static float sin_table[360]; -static float cos_table[360]; -static std::once_flag trig_tables_once_flag; - -#define PIratio 57.29577951308232 // 180/PI - -static void initialize_lookup_tables() -{ - for (int i = 0; i < 360; ++i) { - float angle = i * (M_PI / 180.0); - sin_table[i] = std::sin(angle); - cos_table[i] = std::cos(angle); - } -} - - -inline static void ensure_trig_tables_initialized() -{ - std::call_once(trig_tables_once_flag, initialize_lookup_tables); -} - -inline static float get_sin(float angle) -{ - angle = angle * PIratio; - int index = static_cast(std::fmod(angle, 360) + 360) % 360; - return sin_table[index]; -} - -inline static float get_cos(float angle) -{ - angle = angle * PIratio; - int index = static_cast(std::fmod(angle, 360) + 360) % 360; - return cos_table[index]; -} - void FillTpmsFK::_fill_surface_single(const FillParams& params, unsigned int thickness_layers, const std::pair& direction, ExPolygon expolygon, Polylines& polylines_out) { - ensure_trig_tables_initialized(); - auto infill_angle = float(this->angle + (CorrectionAngle * 2 * M_PI) / 360.); if(std::abs(infill_angle) >= EPSILON) expolygon.rotate(-infill_angle); @@ -452,40 +371,29 @@ void FillTpmsFK::_fill_surface_single(const FillParams& params, float xlen = boxsize.x(); float ylen = boxsize.y(); - const float delta = 0.5f; // mesh step (adjust for quality/performance) - + const float delta = 0.4f; // mesh step (adjust for quality/performance) float myperiod = 2 * PI / vari_T; float c_z = myperiod * this->z; // z height // scalar field Fischer-Koch - auto scalar_field = [&](float x, float y) { - float a_x = myperiod * x; - float b_y = myperiod * y; - + auto scalar_field = [&](float x, float y) -> float { + const float a_x = myperiod * x; + const float b_y = myperiod * y; + // Fischer - Koch S equation: // cos(2x)sin(y)cos(z) + cos(2y)sin(z)cos(x) + cos(2z)sin(x)cos(y) = 0 - const float cos2ax = get_cos(2*a_x); - const float cos2by = get_cos(2*b_y); - const float cos2cz = get_cos(2*c_z); - const float sinby = get_sin(b_y); - const float cosax = get_cos(a_x); - const float sinax = get_sin(a_x); - const float cosby = get_cos(b_y); - const float sincz = get_sin(c_z); - const float coscz = get_cos(c_z); - - return cos2ax * sinby * coscz - + cos2by * sincz * cosax - + cos2cz * sinax * cosby; + return cosf(2 * a_x) * sinf(b_y) * cosf(c_z) + + cosf(2 * b_y) * sinf(c_z) * cosf(a_x) + + cosf(2 * c_z) * sinf(a_x) * cosf(b_y); }; // Mesh generation std::vector> posxy; int i = 0, j = 0; - for (float y = -(ylen) / 2.0f - 2; y < (ylen) / 2.0f + 2; y = y + delta, i++) { + for (float y = -(ylen) / 2.0f - 0.5f; y < (ylen) / 2.0f + 0.5f; y = y + delta, i++) { j = 0; std::vector colposxy; - for (float x = -(xlen) / 2.0f - 2; x < (xlen) / 2.0f + 2; x = x + delta, j++) { + for (float x = -(xlen) / 2.0f - 0.5f; x < (xlen) / 2.0f + 0.5f; x = x + delta, j++) { MarchingSquares::Point pt; pt.x = cenpos.x() + x; pt.y = cenpos.y() + y; @@ -510,33 +418,36 @@ void FillTpmsFK::_fill_surface_single(const FillParams& params, Polylines polylines; - const double contour_value = 0.075; // offset from zero to avoid numerical issues + const double contour_value = 0; // offset from theoretical surface MarchingSquares::drawContour(contour_value, width , height , data, posxy, polylines, params); - if (!polylines.empty()) { - // Apply multiline offset if needed - multiline_fill(polylines, params, spacing); + // Apply multiline offset if needed + multiline_fill(polylines, params, spacing); + polylines = intersection_pl(polylines, expolygon); - polylines = intersection_pl(polylines, expolygon); - - // Remove very small bits, but be careful to not remove infill lines connecting thin walls! + if (! polylines.empty()) { + // Remove very small bits, but be careful to not remove infill lines connecting thin walls! // The infill perimeter lines should be separated by around a single infill line width. const double minlength = scale_(0.8 * this->spacing); polylines.erase( std::remove_if(polylines.begin(), polylines.end(), [minlength](const Polyline &pl) { return pl.length() < minlength; }), polylines.end()); + } + if (! polylines.empty()) { // connect lines size_t polylines_out_first_idx = polylines_out.size(); - chain_or_connect_infill(std::move(polylines), expolygon, polylines_out, this->spacing, params); + + //chain_or_connect_infill(std::move(polylines), expolygon, polylines_out, this->spacing, params); + //chain_infill not situable for this pattern due to internal "islands", this also affect performance a lot. + connect_infill(std::move(polylines), expolygon, polylines_out, this->spacing, params); // new paths must be rotated back if (std::abs(infill_angle) >= EPSILON) { for (auto it = polylines_out.begin() + polylines_out_first_idx; it != polylines_out.end(); ++ it) it->rotate(infill_angle); } - } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 17a207165f..c9a6a74e8c 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3189,7 +3189,7 @@ void PrintConfigDef::init_fff_params() //Orca def = this->add("sparse_infill_rotate_template", coString); - def->label = L("Sparse infill rotatation template"); + def->label = L("Sparse infill rotation template"); def->category = L("Strength"); def->tooltip = L("Rotate the sparse infill direction per layer using a template of angles. " "Enter comma-separated degrees (e.g., '0,30,60,90'). " @@ -3203,7 +3203,7 @@ void PrintConfigDef::init_fff_params() //Orca def = this->add("solid_infill_rotate_template", coString); - def->label = L("Solid infill rotatation template"); + def->label = L("Solid infill rotation template"); def->category = L("Strength"); def->tooltip = L("This parameter adds a rotation of solid infill direction to each layer according to the specified template. " "The template is a comma-separated list of angles in degrees, e.g. '0,90'. " diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3585c411b9..30cf0ad3fd 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -302,10 +302,10 @@ void GLCanvas3D::LayersEditing::render_variable_layer_height_dialog(const GLCanv float get_cur_y = ImGui::GetContentRegionMax().y + ImGui::GetFrameHeight() + canvas.m_main_toolbar.get_height(); std::map captions_texts = { - {_L("Left mouse button:") ,_L("Add detail")}, - {_L("Right mouse button:"), _L("Remove detail")}, - {_L("Shift + Left mouse button:"),_L("Reset to base")}, - {_L("Shift + Right mouse button:"), _L("Smoothing")}, + {_L("Left mouse button") + ":" , _L("Add detail")}, + {_L("Right mouse button") + ":", _L("Remove detail")}, + {_L("Shift+") + _L("Left mouse button") + ":", _L("Reset to base")}, + {_L("Shift+") + _L("Right mouse button") + ":", _L("Smoothing")}, {_L("Mouse wheel:"), _L("Increase/decrease edit area")} }; show_tooltip_information(canvas, captions_texts, x, get_cur_y); @@ -1170,7 +1170,8 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed) m_assembly_view_desc["object_selection_caption"] = _L("Left mouse button"); m_assembly_view_desc["object_selection"] = _L("object selection"); - m_assembly_view_desc["part_selection_caption"] = "Alt +" + _L("Left mouse button"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + m_assembly_view_desc["part_selection_caption"] = _L("Alt+") + _L("Left mouse button"); m_assembly_view_desc["part_selection"] = _L("part selection"); m_assembly_view_desc["number_key_caption"] = "1~16 " + _L("number keys"); m_assembly_view_desc["number_key"] = _L("number keys can quickly change the color of objects"); @@ -6469,7 +6470,7 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "orient"; item.icon_filename = m_is_dark ? "toolbar_orient_dark.svg" : "toolbar_orient.svg"; - item.tooltip = _utf8(L("Auto orient all/selected objects")) + " [Q]\n" + _utf8(L("Auto orient all objects on current plate")) + " [Shift+Q]"; + item.tooltip = _utf8(L("Auto orient all/selected objects")) + " [Q]\n" + _utf8(L("Auto orient all objects on current plate")) + " [" + _utf8(L("Shift+")) + "Q]"; item.sprite_id++; item.left.render_callback = nullptr; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; @@ -6491,7 +6492,7 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "arrange"; item.icon_filename = m_is_dark ? "toolbar_arrange_dark.svg" : "toolbar_arrange.svg"; - item.tooltip = _utf8(L("Arrange all objects")) + " [A]\n" + _utf8(L("Arrange objects on selected plates")) + " [Shift+A]"; + item.tooltip = _utf8(L("Arrange all objects")) + " [A]\n" + _utf8(L("Arrange objects on selected plates")) + " [" + _utf8(L("Shift+")) + "A]"; item.sprite_id++; item.left.action_callback = []() {}; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 715512ced4..b4da0fecf1 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -82,7 +82,7 @@ const std::string& shortkey_ctrl_prefix() { static const std::string str = #ifdef __APPLE__ - "⌘+" + u8"\u2318+" // "⌘+" (Mac Command+) #else _u8L("Ctrl+") #endif @@ -94,9 +94,9 @@ const std::string& shortkey_alt_prefix() { static const std::string str = #ifdef __APPLE__ - "⌥+" + u8"\u2325+" // "⌥+" (Mac Option+) #else - "Alt+" + _u8L("Alt+") #endif ; return str; diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index ac9ce3b4b4..c59a217408 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -489,7 +489,7 @@ void MenuFactory::append_menu_item_delete(wxMenu* menu) [](wxCommandEvent&) { plater()->remove_selected(); }, "menu_delete", nullptr, []() { return plater()->can_delete(); }, m_parent); #else - append_menu_item(menu, wxID_ANY, _L("Delete") + "\tBackSpace", _L("Delete the selected object"), + append_menu_item(menu, wxID_ANY, _L("Delete") + "\t" + _L("Backspace"), _L("Delete the selected object"), [](wxCommandEvent&) { plater()->remove_selected(); }, "", nullptr, []() { return plater()->can_delete(); }, m_parent); #endif @@ -1792,6 +1792,7 @@ void MenuFactory::append_menu_item_clone(wxMenu* menu) #ifdef __APPLE__ static const wxString ctrl = ("Ctrl+"); #else + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? static const wxString ctrl = _L("Ctrl+"); #endif append_menu_item(menu, wxID_ANY, _L("Clone") + "\t" + ctrl + "K", "", diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 35cc3c7700..21944ecb95 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -357,7 +357,7 @@ bool GLGizmoAdvancedCut::on_init() // initiate info shortcuts const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); - const wxString shift = "Shift+"; + const wxString shift = _L("Shift+"); m_shortcuts.push_back(std::make_pair(_L("Left click"), _L("Add connector"))); m_shortcuts.push_back(std::make_pair(_L("Right click"), _L("Remove connector"))); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 2b7e7bc9fe..cda8e1e09c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -40,11 +40,15 @@ GLGizmoBrimEars::GLGizmoBrimEars(GLCanvas3D &parent, const std::string &icon_fil bool GLGizmoBrimEars::on_init() { - m_new_point_head_diameter = get_brim_default_radius(); m_shortcut_key = WXK_CONTROL_E; + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + const wxString ctrl = _L("Ctrl+"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + const wxString alt = _L("Alt+"); + m_desc["head_diameter"] = _L("Head diameter"); m_desc["max_angle"] = _L("Max angle"); m_desc["detection_radius"] = _L("Detection radius"); @@ -57,9 +61,9 @@ bool GLGizmoBrimEars::on_init() m_desc["left_click"] = _L("Add a brim ear"); m_desc["right_click_caption"] = _L("Right click"); m_desc["right_click"] = _L("Delete a brim ear"); - m_desc["ctrl_mouse_wheel_caption"] = _L("Ctrl+Mouse wheel"); + m_desc["ctrl_mouse_wheel_caption"] = ctrl + _L("Mouse wheel"); m_desc["ctrl_mouse_wheel"] = _L("Adjust head diameter"); - m_desc["alt_mouse_wheel_caption"] = _L("Alt + Mouse wheel"); + m_desc["alt_mouse_wheel_caption"] = alt + _L("Mouse wheel"); m_desc["alt_mouse_wheel"] = _L("Adjust section view"); return true; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index a2e0df35b3..e0c24dc87f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -1183,7 +1183,7 @@ bool GLGizmoCut3D::on_init() // initiate info shortcuts const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); - const wxString shift = "Shift+"; + const wxString shift = _L("Shift+"); m_shortcuts_cut.push_back(std::make_pair(shift + _L("Drag"), _L("Draw cut line"))); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 3c831aa98c..f216c444a3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -79,25 +79,31 @@ bool GLGizmoFdmSupports::on_init() // BBS m_shortcut_key = WXK_CONTROL_L; - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + const wxString ctrl = _L("Ctrl+"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + const wxString alt = _L("Alt+"); + const wxString shift = _L("Shift+"); + + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"] = ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Pen size"); m_desc["enforce_caption"] = _L("Left mouse button"); m_desc["enforce"] = _L("Enforce supports"); m_desc["block_caption"] = _L("Right mouse button"); m_desc["block"] = _L("Block supports"); - m_desc["remove_caption"] = _L("Shift + Left mouse button"); + m_desc["remove_caption"] = shift + _L("Left mouse button"); m_desc["remove"] = _L("Erase"); m_desc["remove_all"] = _L("Erase all painting"); m_desc["highlight_by_angle"] = _L("Highlight overhang areas"); m_desc["gap_fill"] = _L("Gap fill"); m_desc["perform"] = _L("Perform"); - m_desc["gap_area_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["gap_area_caption"] = ctrl + _L("Mouse wheel"); m_desc["gap_area"] = _L("Gap area"); m_desc["tool_type"] = _L("Tool type"); - m_desc["smart_fill_angle_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["smart_fill_angle_caption"] = ctrl + _L("Mouse wheel"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); m_desc["on_overhangs_only"] = _L("On overhangs only"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index 49d8008df4..ec0883d8a9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -31,15 +31,21 @@ bool GLGizmoFuzzySkin::on_init() { m_shortcut_key = WXK_CONTROL_H; - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + const wxString ctrl = _L("Ctrl+"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + const wxString alt = _L("Alt+"); + const wxString shift = _L("Shift+"); + + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"] = ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Brush size"); m_desc["cursor_type"] = _L("Brush shape") ; m_desc["add_fuzzy_skin_caption"] = _L("Left mouse button"); m_desc["add_fuzzy_skin"] = _L("Add fuzzy skin"); - m_desc["remove_fuzzy_skin_caption"] = _L("Shift + Left mouse button"); + m_desc["remove_fuzzy_skin_caption"] = shift + _L("Left mouse button"); m_desc["remove_fuzzy_skin"] = _L("Remove fuzzy skin"); m_desc["remove_all"] = _L("Erase all painting"); m_desc["circle"] = _L("Circle"); @@ -48,7 +54,7 @@ bool GLGizmoFuzzySkin::on_init() m_desc["tool_type"] = _L("Tool type"); m_desc["tool_brush"] = _L("Brush"); m_desc["tool_smart_fill"] = _L("Smart fill"); - m_desc["smart_fill_angle_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["smart_fill_angle_caption"] = ctrl + _L("Mouse wheel"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); return true; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 299e4da3d9..a6be7afee6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -444,8 +444,10 @@ bool GLGizmoMeasure::on_init() { m_shortcut_key = WXK_CONTROL_U; + const wxString shift = _L("Shift+"); + m_desc["feature_selection"] = _L("Select feature"); - m_desc["point_selection_caption"] = _L("Shift + Left mouse button"); + m_desc["point_selection_caption"] = shift + _L("Left mouse button"); m_desc["point_selection"] = _L("Select point"); m_desc["reset_caption"] = _L("Delete"); m_desc["reset"] = _L("Restart selection"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 4e216bd81c..9dfd36f56a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -103,21 +103,27 @@ bool GLGizmoMmuSegmentation::on_init() // BBS m_shortcut_key = WXK_CONTROL_N; - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + const wxString ctrl = _L("Ctrl+"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + const wxString alt = _L("Alt+"); + const wxString shift = _L("Shift+"); + + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"] = ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Pen size"); m_desc["cursor_type"] = _L("Pen shape"); m_desc["paint_caption"] = _L("Left mouse button"); m_desc["paint"] = _L("Paint"); - m_desc["erase_caption"] = _L("Shift + Left mouse button"); + m_desc["erase_caption"] = shift + _L("Left mouse button"); m_desc["erase"] = _L("Erase"); m_desc["shortcut_key_caption"] = _L("Key 1~9"); m_desc["shortcut_key"] = _L("Choose filament"); m_desc["edge_detection"] = _L("Edge detection"); - m_desc["gap_area_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["gap_area_caption"] = ctrl + _L("Mouse wheel"); m_desc["gap_area"] = _L("Gap area"); m_desc["perform"] = _L("Perform"); @@ -132,14 +138,14 @@ bool GLGizmoMmuSegmentation::on_init() m_desc["tool_smart_fill"] = _L("Smart fill"); m_desc["tool_bucket_fill"] = _L("Bucket fill"); - m_desc["smart_fill_angle_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["smart_fill_angle_caption"] = ctrl + _L("Mouse wheel"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); - m_desc["height_range_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["height_range_caption"] = ctrl + _L("Mouse wheel"); m_desc["height_range"] = _L("Height range"); //add toggle wire frame hint - m_desc["toggle_wireframe_caption"] = _L("Alt + Shift + Enter"); + m_desc["toggle_wireframe_caption"] = alt + shift + _L("Enter"); m_desc["toggle_wireframe"] = _L("Toggle Wireframe"); // Filament remapping descriptions diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index 19f4efb9f6..6a8317e132 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -29,17 +29,23 @@ bool GLGizmoSeam::on_init() { m_shortcut_key = WXK_CONTROL_P; - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + const wxString ctrl = _L("Ctrl+"); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + const wxString alt = _L("Alt+"); + const wxString shift = _L("Shift+"); + + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"] = ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Brush size"); m_desc["cursor_type"] = _L("Brush shape"); m_desc["enforce_caption"] = _L("Left mouse button"); m_desc["enforce"] = _L("Enforce seam"); m_desc["block_caption"] = _L("Right mouse button"); m_desc["block"] = _L("Block seam"); - m_desc["remove_caption"] = _L("Shift + Left mouse button"); + m_desc["remove_caption"] = shift + _L("Left mouse button"); m_desc["remove"] = _L("Erase"); m_desc["remove_all"] = _L("Erase all painting"); m_desc["circle"] = _L("Circle"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index ef46c7d002..00c78df2ab 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -1175,9 +1175,10 @@ SlaGizmoHelpDialog::SlaGizmoHelpDialog() : wxDialog(nullptr, wxID_ANY, _L("SLA gizmo keyboard shortcuts"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) { SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); - + const wxString shift = _L("Shift+"); // fonts const wxFont& font = wxGetApp().small_font(); @@ -1206,14 +1207,14 @@ SlaGizmoHelpDialog::SlaGizmoHelpDialog() shortcuts.push_back(std::make_pair(_L("Drag"), _L("Move point"))); shortcuts.push_back(std::make_pair(ctrl+_L("Left click"), _L("Add point to selection"))); shortcuts.push_back(std::make_pair(alt+_L("Left click"), _L("Remove point from selection"))); - shortcuts.push_back(std::make_pair(wxString("Shift+")+_L("Drag"), _L("Select by rectangle"))); + shortcuts.push_back(std::make_pair(shift+_L("Drag"), _L("Select by rectangle"))); shortcuts.push_back(std::make_pair(alt+_(L("Drag")), _L("Deselect by rectangle"))); shortcuts.push_back(std::make_pair(ctrl+"A", _L("Select all points"))); - shortcuts.push_back(std::make_pair("Delete", _L("Remove selected points"))); + shortcuts.push_back(std::make_pair(_L"Del", _L("Remove selected points"))); shortcuts.push_back(std::make_pair(ctrl+_L("Mouse wheel"), _L("Move clipping plane"))); shortcuts.push_back(std::make_pair("R", _L("Reset clipping plane"))); - shortcuts.push_back(std::make_pair("Enter", _L("Apply changes"))); - shortcuts.push_back(std::make_pair("Esc", _L("Discard changes"))); + shortcuts.push_back(std::make_pair(_L("Enter"), _L("Apply changes"))); + shortcuts.push_back(std::make_pair(_L("Esc"), _L("Discard changes"))); shortcuts.push_back(std::make_pair("M", _L("Switch to editing mode"))); shortcuts.push_back(std::make_pair("A", _L("Auto-generate points"))); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 8717e8571d..865f12c9dd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -278,7 +278,7 @@ bool GLGizmoText::on_init() m_desc["surface"] = _L("Surface"); m_desc["horizontal_text"] = _L("Horizontal text"); - m_desc["rotate_text_caption"] = _L("Shift + Mouse move up or down"); + m_desc["rotate_text_caption"] = _L("Shift+") + _L("Mouse move up or down"); m_desc["rotate_text"] = _L("Rotate text"); return true; diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index d5f25146ba..3e27bd8cb3 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -55,9 +55,10 @@ GizmoObjectManipulation::GizmoObjectManipulation(GLCanvas3D& glcanvas) m_imperial_units = wxGetApp().app_config->get("use_inches") == "1"; m_new_unit_string = m_imperial_units ? L("in") : L("mm"); - const wxString shift = "Shift+"; + const wxString shift = _L("Shift+"); const wxString alt = GUI::shortkey_alt_prefix(); const wxString ctrl = GUI::shortkey_ctrl_prefix(); + m_desc_move["part_selection_caption"] = alt + _L("Left mouse button"); m_desc_move["part_selection"] = _L("Part selection"); m_desc_move["snap_step_caption"] = shift + _L("Left mouse button"); diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 58ed58758f..42898270e4 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -163,8 +163,9 @@ void KBShortcutsDialog::on_dpi_changed(const wxRect& suggested_rect) void KBShortcutsDialog::fill_shortcuts() { - const std::string& ctrl = GUI::shortkey_ctrl_prefix(); - const std::string& alt = GUI::shortkey_alt_prefix(); + const std::string ctrl = GUI::shortkey_ctrl_prefix(); + const std::string alt = GUI::shortkey_alt_prefix(); + const std::string shift = L("Shift+"); if (wxGetApp().is_editor()) { Shortcuts global_shortcuts = { @@ -172,7 +173,7 @@ void KBShortcutsDialog::fill_shortcuts() { ctrl + "N", L("New Project") }, { ctrl + "O", L("Open Project") }, { ctrl + "S", L("Save Project") }, - { ctrl + "Shift+S", L("Save Project as")}, + { ctrl + shift + "S", L("Save Project as")}, // File>Import { ctrl + "I", L("Import geometry data from STL/STEP/3MF/OBJ/AMF files") }, // File>Export @@ -180,12 +181,7 @@ void KBShortcutsDialog::fill_shortcuts() // Slice plate { ctrl + "R", L("Slice plate")}, // Send to Print -#ifdef __APPLE__ - { L("⌘+Shift+G"), L("Print plate")}, -#else - { L("Ctrl+Shift+G"), L("Print plate")}, -#endif // __APPLE - + { ctrl + shift + "G", L("Print plate")}, // Edit { ctrl + "X", L("Cut") }, { ctrl + "C", L("Copy to clipboard") }, @@ -194,13 +190,13 @@ void KBShortcutsDialog::fill_shortcuts() { ctrl + "P", L("Preferences") }, //3D control #ifdef __APPLE__ - { ctrl + "Shift+M", L("Show/Hide 3Dconnexion devices settings dialog") }, + { ctrl + shift + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, #else { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, #endif // __APPLE // Switch table page - { ctrl + "Tab", L("Switch table page")}, + { ctrl + L("Tab"), L("Switch table page")}, //DEL #ifdef __APPLE__ {"fn+⌫", L("Delete selected")}, @@ -217,28 +213,21 @@ void KBShortcutsDialog::fill_shortcuts() { L("Right mouse button"), L("Pan View") }, { L("Mouse wheel"), L("Zoom View") }, { "A", L("Arrange all objects") }, - { L("Shift+A"), L("Arrange objects on selected plates") }, + { shift + "A", L("Arrange objects on selected plates") }, { "Q", L("Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project.") }, - {L("Shift+Q"), L("Auto orients all objects on the active plate.")}, + { shift + "Q", L("Auto orients all objects on the active plate.") }, - {L("Shift+Tab"), L("Collapse/Expand the sidebar")}, - #ifdef __APPLE__ - {L("⌘+Any arrow"), L("Movement in camera space")}, - {L("⌥+Left mouse button"), L("Select a part")}, - {L("⌘+Left mouse button"), L("Select multiple objects")}, - #else - {L("Ctrl+Any arrow"), L("Movement in camera space")}, - {L("Alt+Left mouse button"), L("Select a part")}, - {L("Ctrl+Left mouse button"), L("Select multiple objects")}, - - #endif - {L("Shift+Left mouse button"), L("Select objects by rectangle")}, + {shift + L("Tab"), L("Collapse/Expand the sidebar")}, + {ctrl + L("Any arrow"), L("Movement in camera space")}, + {alt + L("Left mouse button"), L("Select a part")}, + {ctrl + L("Left mouse button"), L("Select multiple objects")}, + {shift + L("Left mouse button"), L("Select objects by rectangle")}, {L("Arrow Up"), L("Move selection 10 mm in positive Y direction")}, {L("Arrow Down"), L("Move selection 10 mm in negative Y direction")}, {L("Arrow Left"), L("Move selection 10 mm in negative X direction")}, {L("Arrow Right"), L("Move selection 10 mm in positive X direction")}, - {L("Shift+Any arrow"), L("Movement step set to 1 mm")}, + {shift + L("Any arrow"), L("Movement step set to 1 mm")}, {L("Esc"), L("Deselect all")}, {"1-9", L("keyboard 1-9: set filament for object/part")}, {ctrl + "0", L("Camera view - Default")}, @@ -268,21 +257,16 @@ void KBShortcutsDialog::fill_shortcuts() { "E", L("Gizmo brim ears") }, { "I", L("Zoom in") }, { "O", L("Zoom out") }, - { "Tab", L("Switch between Prepare/Preview") }, + { L("Tab"), L("Switch between Prepare/Preview") }, }; m_full_shortcuts.push_back({ { _L("Plater"), "" }, plater_shortcuts }); Shortcuts gizmos_shortcuts = { {L("Esc"), L("Deselect all")}, - {L("Shift+"), L("Move: press to snap by 1mm")}, - #ifdef __APPLE__ - {L("⌘+Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, - {L("⌥+Mouse wheel"), L("Support/Color Painting: adjust section position")}, - #else - {L("Ctrl+Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, - {L("Alt+Mouse wheel"), L("Support/Color Painting: adjust section position")}, - #endif + {shift, L("Move: press to snap by 1mm")}, + {ctrl + L("Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, + {alt + L("Mouse wheel"), L("Support/Color Painting: adjust section position")}, }; m_full_shortcuts.push_back({{_L("Gizmo"), ""}, gizmos_shortcuts}); @@ -310,16 +294,11 @@ void KBShortcutsDialog::fill_shortcuts() { L("Arrow Right"), L("Horizontal slider - Move active thumb Right")}, { "L", L("On/Off one layer mode of the vertical slider")}, { "C", L("On/Off G-code window")}, - { "Tab", L("Switch between Prepare/Preview") }, - {L("Shift+Any arrow"), L("Move slider 5x faster")}, - {L("Shift+Mouse wheel"), L("Move slider 5x faster")}, - #ifdef __APPLE__ - {L("⌘+Any arrow"), L("Move slider 5x faster")}, - {L("⌘+Mouse wheel"), L("Move slider 5x faster")}, - #else - {L("Ctrl+Any arrow"), L("Move slider 5x faster")}, - {L("Ctrl+Mouse wheel"), L("Move slider 5x faster")}, - #endif + { L("Tab"), L("Switch between Prepare/Preview")}, + {shift + L("Any arrow"), L("Move slider 5x faster")}, + {shift + L("Mouse wheel"), L("Move slider 5x faster")}, + {ctrl + L("Any arrow"), L("Move slider 5x faster")}, + {ctrl + L("Mouse wheel"), L("Move slider 5x faster")}, { L("Home"), L("Horizontal slider - Move to start position")}, { L("End"), L("Horizontal slider - Move to last position")}, }; diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index ff030e111b..df1dc541c4 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -168,11 +168,14 @@ wxDEFINE_EVENT(EVT_SYNC_CLOUD_PRESET, SimpleEvent); #ifdef __APPLE__ static const wxString ctrl = ("Ctrl+"); -static const std::string ctrl_t = "⌘"; +// FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? +static const std::string ctrl_t = u8"\u2318+"; // "⌘" (Mac Command) #else static const wxString ctrl = _L("Ctrl+"); +// FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? static const wxString ctrl_t = ctrl; #endif +static const wxString shift = _L("Shift+"); MainFrame::MainFrame() : DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_STYLE, "mainframe") @@ -2358,13 +2361,12 @@ void MainFrame::init_menubar_as_editor() [this](){return m_plater != nullptr && can_save(); }, this); #endif - #ifndef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + _L("Shift+") + "S", _L("Save current project as"), + append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + shift + "S", _L("Save current project as"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(true); }, "menu_save", nullptr, [this](){return m_plater != nullptr && can_save_as(); }, this); #else - append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + _L("Shift+") + "S", _L("Save current project as"), + append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + shift + "S", _L("Save current project as"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(true); }, "", nullptr, [this](){return m_plater != nullptr && can_save_as(); }, this); #endif @@ -2388,7 +2390,7 @@ void MainFrame::init_menubar_as_editor() append_menu_item(import_menu, wxID_ANY, _L("Import Zip Archive") + dots, _L("Load models contained within a zip archive"), [this](wxCommandEvent&) { if (m_plater) m_plater->import_zip_archive(); }, "menu_import", nullptr, [this]() { return can_add_models(); }); - append_menu_item(import_menu, wxID_ANY, _L("Import Configs") + dots /*+ "\tCtrl+I"*/, _L("Load configs"), + append_menu_item(import_menu, wxID_ANY, _L("Import Configs") + dots /*+ "\t" + ctrl + "I"*/, _L("Load configs"), [this](wxCommandEvent&) { load_config_file(); }, "menu_import", nullptr, [this](){return true; }, this); @@ -2403,7 +2405,7 @@ void MainFrame::init_menubar_as_editor() append_menu_item(export_menu, wxID_ANY, _L("Export all objects as STLs") + dots, _L("Export all objects as STLs"), [this](wxCommandEvent&) { if (m_plater) m_plater->export_stl(false, false, true); }, "menu_export_stl", nullptr, [this](){return can_export_model(); }, this); - append_menu_item(export_menu, wxID_ANY, _L("Export Generic 3MF") + dots/* + "\tCtrl+G"*/, _L("Export 3mf file without using some 3mf-extensions"), + append_menu_item(export_menu, wxID_ANY, _L("Export Generic 3MF") + dots/* + "\t" + ctrl + "G"*/, _L("Export 3mf file without using some 3mf-extensions"), [this](wxCommandEvent&) { if (m_plater) m_plater->export_core_3mf(); }, "menu_export_sliced_file", nullptr, [this](){return can_export_model(); }, this); // BBS export .gcode.3mf @@ -2411,15 +2413,15 @@ void MainFrame::init_menubar_as_editor() [this](wxCommandEvent&) { if (m_plater) wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_SLICED_FILE)); }, "menu_export_sliced_file", nullptr, [this](){return can_export_gcode(); }, this); - append_menu_item(export_menu, wxID_ANY, _L("Export all plate sliced file") + dots/* + "\tCtrl+G"*/, _L("Export all plate sliced file"), + append_menu_item(export_menu, wxID_ANY, _L("Export all plate sliced file") + dots/* + "\t" + ctrl + "G"*/, _L("Export all plate sliced file"), [this](wxCommandEvent&) { if (m_plater) wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_ALL_SLICED_FILE)); }, "menu_export_sliced_file", nullptr, [this]() {return can_export_all_gcode(); }, this); - append_menu_item(export_menu, wxID_ANY, _L("Export G-code") + dots/* + "\tCtrl+G"*/, _L("Export current plate as G-code"), + append_menu_item(export_menu, wxID_ANY, _L("Export G-code") + dots/* + "\t" + ctrl + "G"*/, _L("Export current plate as G-code"), [this](wxCommandEvent&) { if (m_plater) m_plater->export_gcode(false); }, "menu_export_gcode", nullptr, [this]() {return can_export_gcode(); }, this); append_menu_item( - export_menu, wxID_ANY, _L("Export Preset Bundle") + dots /* + "\tCtrl+E"*/, _L("Export current configuration to files"), + export_menu, wxID_ANY, _L("Export Preset Bundle") + dots /* + "\t" + ctrl + "E"*/, _L("Export current configuration to files"), [this](wxCommandEvent &) { export_config(); }, "menu_export_config", nullptr, []() { return true; }, this); @@ -2442,12 +2444,6 @@ void MainFrame::init_menubar_as_editor() if (m_plater != nullptr) { editMenu = new wxMenu(); - #ifdef __APPLE__ - // Backspace sign - wxString hotkey_delete = "\u232b"; - #else - wxString hotkey_delete = "Del"; - #endif auto handle_key_event = [](wxKeyEvent& evt) { if (wxGetApp().imgui()->update_key_data(evt)) { @@ -2488,7 +2484,7 @@ void MainFrame::init_menubar_as_editor() "menu_remove", nullptr, [this](){return can_delete_all(); }, this); editMenu->AppendSeparator(); // BBS Clone Selected - append_menu_item(editMenu, wxID_ANY, _L("Clone selected") /*+ "\tCtrl+M"*/, + append_menu_item(editMenu, wxID_ANY, _L("Clone selected") /*+ "\t" + ctrl + "M"*/, _L("Clone copies of selections"),[this](wxCommandEvent&) { m_plater->clone_selection(); }, @@ -2564,7 +2560,7 @@ void MainFrame::init_menubar_as_editor() "", nullptr, [this](){return m_plater->can_paste_from_clipboard(); }, this); #if 0 // BBS Delete selected - append_menu_item(editMenu, wxID_ANY, _L("Delete selected") + "\tBackSpace", + append_menu_item(editMenu, wxID_ANY, _L("Delete selected") + "\t" + _L("Backspace"), _L("Deletes the current selection"),[this](wxCommandEvent&) { m_plater->remove_selected(); }, @@ -2619,7 +2615,7 @@ void MainFrame::init_menubar_as_editor() m_plater->select_all(); }, "", nullptr, [this](){return can_select(); }, this); // BBS Deslect All - append_menu_item(editMenu, wxID_ANY, _L("Deselect all") + sep + "Esc", + append_menu_item(editMenu, wxID_ANY, _L("Deselect all") + sep + _L("Esc"), _L("Deselects all objects"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -2738,7 +2734,7 @@ void MainFrame::init_menubar_as_editor() [this]() { return wxGetApp().show_outline(); }, this); /*viewMenu->AppendSeparator(); - append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Wireframe") + "\tCtrl+Shift+Enter", _L("Show wireframes in 3D scene."), + append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Wireframe") + "\t" + ctrl + shift + _L("Enter"), _L("Show wireframes in 3D scene."), [this](wxCommandEvent&) { m_plater->toggle_show_wireframe(); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this, [this]() { return m_plater->is_wireframe_enabled(); }, [this]() { return m_plater->is_show_wireframe(); }, this);*/ @@ -2761,7 +2757,7 @@ void MainFrame::init_menubar_as_editor() #ifdef __APPLE__ wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2)); wxMenu* parent_menu = m_menubar->OSXGetAppleMenu(); - //auto preference_item = new wxMenuItem(parent_menu, OrcaSlicerMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", ""); + //auto preference_item = new wxMenuItem(parent_menu, OrcaSlicerMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\t" + ctrl + ",", ""); #else wxMenu* parent_menu = m_topbar->GetTopMenu(); auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\t" + ctrl + "P", ""); @@ -3204,11 +3200,11 @@ void MainFrame::init_menubar_as_gcodeviewer() #if 0 wxMenu* fileMenu = new wxMenu; { - append_menu_item(fileMenu, wxID_ANY, _L("&Open G-code") + dots + "\tCtrl+O", _L("Open a G-code file"), + append_menu_item(fileMenu, wxID_ANY, _L("&Open G-code") + dots + "\t" + ctrl + "O", _L("Open a G-code file"), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->load_gcode(); }, "open", nullptr, [this]() {return m_plater != nullptr; }, this); #ifdef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Re&load from Disk") + dots + "\tCtrl+Shift+R", + append_menu_item(fileMenu, wxID_ANY, _L("Re&load from Disk") + dots + "\t" + ctrl + shift + "R", _L("Reload the plater from disk"), [this](wxCommandEvent&) { m_plater->reload_gcode_from_disk(); }, "", nullptr, [this]() { return !m_plater->get_last_loaded_gcode().empty(); }, this); #else diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index 5fbd79a813..974d749433 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -63,11 +63,13 @@ namespace GUI { m_control_refresh->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCursor(wxCURSOR_ARROW)); }); #ifdef __APPLE__ - m_control_back->SetToolTip(_L("Click to return (Command + Left Arrow)")); - m_control_forward->SetToolTip(_L("Click to continue (Command + Right Arrow)")); + // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? + m_control_back->SetToolTip(_L("Click to return") + "(" + u8"\u2318+" /* u8"⌘+" */ + _L("Left Arrow") + ")"); + m_control_forward->SetToolTip(_L("Click to continue") + "(" + u8"\u2318+" /* u8"⌘+" */ + _L("Right Arrow") + ")"); #else - m_control_back->SetToolTip(_L("Click to return (Alt + Left Arrow)")); - m_control_forward->SetToolTip(_L("Click to continue (Alt + Right Arrow)")); + // FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent? + m_control_back->SetToolTip(_L("Click to return") + "(" + _L("Alt+") + _L("Left Arrow") + ")"); + m_control_forward->SetToolTip(_L("Click to continue") + "(" + _L("Alt+") + _L("Right Arrow") + ")"); #endif m_control_refresh->SetToolTip(_L("Refresh")); diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index c5ac8ca687..92bf17b217 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -228,7 +228,7 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c // BBS: new layout //m_search_btn = new ScalableButton(m_top_panel, wxID_ANY, "search", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); - //m_search_btn->SetToolTip(format_wxstr(_L("Search in settings [%1%]"), "Ctrl+F")); + //m_search_btn->SetToolTip(format_wxstr(_L("Search in settings [%1%]"), _L("Ctrl+") + "F"); //m_search_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { wxGetApp().plater()->search(false); }); m_compare_btn = new ScalableButton(m_top_panel, wxID_ANY, "compare", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5a9a7ecf65..f9d5e350b8 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3482,7 +3482,7 @@ void Plater::priv::collapse_sidebar(bool collapse) std::string new_tooltip = collapse ? _u8L("Expand sidebar") : _u8L("Collapse sidebar"); - new_tooltip += " [Shift+Tab]"; + new_tooltip += " [" + _u8L("Shift+") + _u8L("Tab") + "]"; int id = collapse_toolbar.get_item_id("collapse_sidebar"); collapse_toolbar.set_tooltip(id, new_tooltip); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index d1272d25ef..31994e1f04 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -251,7 +251,7 @@ void Tab::create_preset_tab() "or click this button."))); add_scaled_button(panel, &m_search_btn, "search"); - m_search_btn->SetToolTip(format_wxstr(_L("Search in settings [%1%]"), "Ctrl+F"));*/ + m_search_btn->SetToolTip(format_wxstr(_L("Search in settings [%1%]"), _L("Ctrl+") + "F"));*/ // Bitmaps to be shown on the "Revert to system" aka "Lock to system" button next to each input field. add_scaled_bitmap(this, m_bmp_value_lock , "unlock_normal"); @@ -3445,13 +3445,13 @@ void TabFilament::build() optgroup->append_single_option_line("pellet_flow_coefficient", "pellet-flow-coefficient"); optgroup->append_single_option_line("filament_flow_ratio"); - optgroup->append_single_option_line("enable_pressure_advance"); - optgroup->append_single_option_line("pressure_advance"); + optgroup->append_single_option_line("enable_pressure_advance", "pressure-advance-calib"); + optgroup->append_single_option_line("pressure_advance", "pressure-advance-calib"); // Orca: adaptive pressure advance and calibration model - optgroup->append_single_option_line("adaptive_pressure_advance"); - optgroup->append_single_option_line("adaptive_pressure_advance_overhangs"); - optgroup->append_single_option_line("adaptive_pressure_advance_bridges"); + optgroup->append_single_option_line("adaptive_pressure_advance", "adaptive-pressure-advance-calib"); + optgroup->append_single_option_line("adaptive_pressure_advance_overhangs", "adaptive-pressure-advance-calib"); + optgroup->append_single_option_line("adaptive_pressure_advance_bridges", "adaptive-pressure-advance-calib"); Option option = optgroup->get_option("adaptive_pressure_advance_model"); option.opt.full_width = true;