Skip to content

Commit

Permalink
Merge pull request #3 from SoftFever/main
Browse files Browse the repository at this point in the history
From Upstream
  • Loading branch information
henrivdr authored Aug 11, 2024
2 parents 546445a + 7082e94 commit 4632e55
Show file tree
Hide file tree
Showing 250 changed files with 5,103 additions and 2,618 deletions.
157 changes: 129 additions & 28 deletions localization/i18n/de/OrcaSlicer_de.po

Large diffs are not rendered by default.

1,079 changes: 555 additions & 524 deletions localization/i18n/fr/OrcaSlicer_fr.po

Large diffs are not rendered by default.

1,896 changes: 960 additions & 936 deletions localization/i18n/tr/OrcaSlicer_tr.po

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion resources/info/filament_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"PLA-CF",
"PLA-AERO",
"PVA",
"BVOH"
"BVOH",
"SBS"
],
"high_low_compatible_filament":[
"HIPS",
Expand Down
12 changes: 12 additions & 0 deletions resources/profiles/BBL.json
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,10 @@
"name": "fdm_filament_bvoh",
"sub_path": "filament/fdm_filament_bvoh.json"
},
{
"name": "fdm_filament_sbs",
"sub_path": "filament/fdm_filament_sbs.json"
},
{
"name": "Bambu PLA Matte @base",
"sub_path": "filament/Bambu PLA Matte @base.json"
Expand Down Expand Up @@ -733,6 +737,10 @@
"name": "Generic PLA-CF @base",
"sub_path": "filament/Generic PLA-CF @base.json"
},
{
"name": "Generic SBS @base",
"sub_path": "filament/Generic SBS @base.json"
},
{
"name": "Bambu PLA-CF @base",
"sub_path": "filament/Bambu PLA-CF @base.json"
Expand Down Expand Up @@ -1389,6 +1397,10 @@
"name": "Generic PLA-CF @BBL A1",
"sub_path": "filament/Generic PLA-CF @BBL A1.json"
},
{
"name": "Generic SBS",
"sub_path": "filament/Generic SBS.json"
},
{
"name": "Bambu PLA-CF @BBL X1C 0.8 nozzle",
"sub_path": "filament/Bambu PLA-CF @BBL X1C 0.8 nozzle.json"
Expand Down
17 changes: 17 additions & 0 deletions resources/profiles/BBL/filament/Generic SBS @base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "filament",
"name": "Generic SBS @base",
"inherits": "fdm_filament_sbs",
"from": "system",
"filament_id": "GFL99",
"instantiation": "false",
"filament_flow_ratio": [
"0.98"
],
"slow_down_layer_time": [
"4"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
]
}
25 changes: 25 additions & 0 deletions resources/profiles/BBL/filament/Generic SBS.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"type": "filament",
"name": "Generic SBS",
"inherits": "Generic SBS @base",
"from": "system",
"setting_id": "GFSL99",
"instantiation": "true",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 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"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\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}"
]
}
85 changes: 85 additions & 0 deletions resources/profiles/BBL/filament/fdm_filament_sbs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"type": "filament",
"name": "fdm_filament_sbs",
"inherits": "fdm_filament_common",
"from": "system",
"instantiation": "false",
"fan_cooling_layer_time": [
"100"
],
"filament_max_volumetric_speed": [
"23"
],
"filament_type": [
"SBS"
],
"filament_density": [
"1.02"
],
"filament_cost": [
"15"
],
"cool_plate_temp": [
"70"
],
"eng_plate_temp": [
"70"
],
"hot_plate_temp": [
"70"
],
"textured_plate_temp": [
"70"
],
"cool_plate_temp_initial_layer": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"hot_plate_temp_initial_layer": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"nozzle_temperature_initial_layer": [
"235"
],
"reduce_fan_stop_start_freq": [
"0"
],
"fan_min_speed": [
"0"
],
"overhang_fan_threshold": [
"50%"
],
"close_fan_the_first_x_layers": [
"3"
],
"nozzle_temperature": [
"235"
],
"temperature_vitrification": [
"70"
],
"nozzle_temperature_range_low": [
"215"
],
"nozzle_temperature_range_high": [
"250"
],
"slow_down_min_speed": [
"20"
],
"slow_down_layer_time": [
"4"
],
"additional_cooling_fan_speed": [
"40"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}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}"
]
}
Loading

0 comments on commit 4632e55

Please sign in to comment.