juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: solve the conflict

Browse Source 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If3862fbf7a543283ff77d4511d7c321a6e24d38b
(cherry picked from commit 162b5ac65f74cc8ec8c5bfa285d630d165aee437)
This commit is contained in:
xun.zhang
2025-06-12 15:44:54 +08:00
committed by Noisyfox
parent c30459f1c6
commit 5499007bc3
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/profiles/BBL/machine/Bambu Lab H2 0.4 nozzle.json
View File

@@ -158,12 +158,6 @@
"Direct Drive Standard", "Direct Drive Standard",
"Direct Drive High Flow" "Direct Drive High Flow"
], ],
<<<<<<< HEAD (c3dafa ENH:[filament/process] batch modify h2 process params)
=======
"extruder_variant_list": [
"Direct Drive Standard,Direct Drive High Flow"
],
>>>>>>> CHANGE (821d61 ENH:[Process/Filament] update timelapse and layer change gc)
"retract_before_wipe": [ "retract_before_wipe": [
"0%", "0%",
"0%" "0%"