3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 23:01:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'remote/master' into feature/merge_upstream

Browse source 
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
This commit is contained in:
SoftFever 2023-04-19 08:48:07 +08:00
commit 9f598046d1
658 changed files with 70312 additions and 4877 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/profiles/BBL/filament/Bambu PETG Basic @BBL X1C 0.2 nozzle.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSG00_00",
"name": "Bambu PETG Basic @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG Basic @base",
"filament_max_volumetric_speed": [
"1"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle",
"Bambu Lab P1P 0.2 nozzle"
]
}

25
resources/profiles/BBL/filament/Bambu PETG Basic @BBL X1C 0.8 nozzle.json Normal file
View file

@ -0,0 +1,25 @@
{
"type": "filament",
"setting_id": "GFSG00_02",
"name": "Bambu PETG Basic @BBL X1C 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG Basic @base",
"filament_max_volumetric_speed": [
"16"
],
"fan_max_speed": [
"60"
],
"fan_min_speed": [
"20"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

16
resources/profiles/BBL/filament/Bambu PETG Basic @BBL X1C.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSG00_01",
"name": "Bambu PETG Basic @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG Basic @base",
"filament_max_volumetric_speed": [
"14"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab P1P 0.4 nozzle"
]
}

86
resources/profiles/BBL/filament/Bambu PETG Basic @base.json Normal file
View file

@ -0,0 +1,86 @@
{
"type": "filament",
"filament_id": "GFG00",
"name": "Bambu PETG Basic @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"filament_flow_ratio": [
"0.95"
],
"temperature_vitrification": [
"70"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"25%"
],
"fan_max_speed": [
"40"
],
"fan_min_speed": [
"10"
],
"filament_max_volumetric_speed": [
"8"
],
"slow_down_layer_time": [
"8"
],
"fan_cooling_layer_time": [
"30"
],
"cool_plate_temp" : [
"0"
],
"eng_plate_temp" : [
"70"
],
"hot_plate_temp" : [
"70"
],
"textured_plate_temp" : [
"70"
],
"cool_plate_temp_initial_layer" : [
"0"
],
"eng_plate_temp_initial_layer" : [
"70"
],
"hot_plate_temp_initial_layer" : [
"70"
],
"textured_plate_temp_initial_layer" : [
"70"
],
"filament_vendor": [
"Bambu Lab"
],
"filament_type": [
"PETG"
],
"filament_cost": [
"24.99"
],
"filament_density": [
"1.25"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_initial_layer": [
"255"
],
"nozzle_temperature": [
"255"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{endif}"
]
}

3
resources/profiles/BBL/filament/Bambu PETG-CF @base.json
View file

@ -5,6 +5,9 @@
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"filament_flow_ratio": [
"0.95"
],
"temperature_vitrification": [
"75"
],

19
resources/profiles/BBL/filament/Bambu PLA Silk @BBL X1.json Normal file
View file

@ -0,0 +1,19 @@
{
"type": "filament",
"setting_id": "GFSA05_02",
"name": "Bambu PLA Silk @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Silk @base",
"filament_max_volumetric_speed": [
"12"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

15
resources/profiles/BBL/filament/Bambu PLA Silk @BBL X1C 0.2 nozzle.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSA05_00",
"name": "Bambu PLA Silk @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Silk @base",
"filament_max_volumetric_speed": [
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

16
resources/profiles/BBL/filament/Bambu PLA Silk @BBL X1C.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA05_01",
"name": "Bambu PLA Silk @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Silk @base",
"filament_max_volumetric_speed": [
"12"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

29
resources/profiles/BBL/filament/Bambu PLA Silk @base.json Normal file
View file

@ -0,0 +1,29 @@
{
"type": "filament",
"filament_id": "GFA05",
"name": "Bambu PLA Silk @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"required_nozzle_HRC": [
"3"
],
"filament_flow_ratio": [
"0.98"
],
"filament_density": [
"1.32"
],
"filament_cost": [
"29.99"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"230"
]
}

6
resources/profiles/BBL/filament/Bambu PLA-CF @base.json
View file

@ -8,6 +8,12 @@
"filament_vendor": [
"Bambu Lab"
],
"cool_plate_temp" : [
"45"
],
"cool_plate_temp_initial_layer" : [
"45"
],
"filament_cost": [
"34.99"
],

3
resources/profiles/BBL/filament/Generic PETG-CF @base.json
View file

@ -5,6 +5,9 @@
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"filament_flow_ratio": [
"0.95"
],
"temperature_vitrification": [
"75"
],

6
resources/profiles/BBL/filament/Generic PLA-CF @base.json
View file

@ -8,6 +8,12 @@
"required_nozzle_HRC": [
"40"
],
"cool_plate_temp" : [
"45"
],
"cool_plate_temp_initial_layer" : [
"45"
],
"filament_flow_ratio": [
"0.95"
],

26
resources/profiles/BBL/filament/P1P/Bambu PLA Silk @BBL P1P 0.2 nozzle.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "filament",
"setting_id": "GFSA05_11",
"name": "Bambu PLA Silk @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Silk @base",
"filament_max_volumetric_speed": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
}

31
resources/profiles/BBL/filament/P1P/Bambu PLA Silk @BBL P1P.json Normal file
View file

@ -0,0 +1,31 @@
{
"type": "filament",
"setting_id": "GFSA05_12",
"name": "Bambu PLA Silk @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Silk @base",
"filament_max_volumetric_speed": [
"12"
],
"slow_down_layer_time": [
"8"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

6
resources/profiles/BBL/filament/fdm_filament_common.json
View file

@ -3,6 +3,9 @@
"name": "fdm_filament_common",
"from": "system",
"instantiation": "false",
"filament_is_support": [
"0"
],
"required_nozzle_HRC": [
"3"
],
@ -114,9 +117,6 @@
"filament_wipe_distance": [
"nil"
],
"bed_type": [
"Cool Plate"
],
"nozzle_temperature_initial_layer": [
"200"
],

4
resources/profiles/BBL/filament/fdm_filament_pva.json
View file

@ -5,7 +5,7 @@
"instantiation": "false",
"inherits": "fdm_filament_common",
"cool_plate_temp" : [
"35"
"45"
],
"eng_plate_temp" : [
"0"
@ -17,7 +17,7 @@
"55"
],
"cool_plate_temp_initial_layer" : [
"35"
"45"
],
"eng_plate_temp_initial_layer" : [
"0"