mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 09:02:06 +00:00
Merge branch 'main' into feature/orca_network_refactor
This commit is contained in:
@@ -72,6 +72,6 @@
|
||||
"wipe_tower_extra_rib_length": "0",
|
||||
"prime_tower_width": "35",
|
||||
"prime_volume": "30",
|
||||
"wall_generator": "classic",
|
||||
"wall_generator": "arachne",
|
||||
"compatible_printers": []
|
||||
}
|
||||
@@ -514,14 +514,14 @@ function ResponseFilamentResult()
|
||||
let FilaArray=new Array();
|
||||
for(let n=0;n<nAll;n++)
|
||||
{
|
||||
let sName=FilaSelectedList[n].getAttribute("name");
|
||||
|
||||
for( let key in m_ProfileItem['filament'] )
|
||||
{
|
||||
let FName=GetFilamentShortname(key);
|
||||
|
||||
if(FName==sName)
|
||||
FilaArray.push(key);
|
||||
let strFilalist=FilaSelectedList[n].getAttribute("filalist");
|
||||
if(strFilalist) {
|
||||
let filaNames = strFilalist.split(';');
|
||||
for(let i=0; i<filaNames.length; i++) {
|
||||
let fname = filaNames[i].trim();
|
||||
if(fname !== '')
|
||||
FilaArray.push(fname);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -491,14 +491,14 @@ function ResponseFilamentResult()
|
||||
let FilaArray=new Array();
|
||||
for(let n=0;n<nAll;n++)
|
||||
{
|
||||
let sName=FilaSelectedList[n].getAttribute("name");
|
||||
|
||||
for( let key in m_ProfileItem['filament'] )
|
||||
{
|
||||
let FName=GetFilamentShortname(key);
|
||||
|
||||
if(FName==sName)
|
||||
FilaArray.push(key);
|
||||
let strFilalist=FilaSelectedList[n].getAttribute("filalist");
|
||||
if(strFilalist) {
|
||||
let filaNames = strFilalist.split(';');
|
||||
for(let i=0; i<filaNames.length; i++) {
|
||||
let fname = filaNames[i].trim();
|
||||
if(fname !== '')
|
||||
FilaArray.push(fname);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user