mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 04:31:15 -06:00 
			
		
		
		
	post changes after merging BS1.7.4
Remove tracking etc..
This commit is contained in:
		
							parent
							
								
									e65b11a831
								
							
						
					
					
						commit
						2a478ab4f9
					
				
					 615 changed files with 46215 additions and 54844 deletions
				
			
		|  | @ -59,7 +59,7 @@ | |||
| 
 | ||||
| .PrinterArea | ||||
| { | ||||
| 	padding: 0px; | ||||
| 	padding: 10px; | ||||
| 	display: flex; | ||||
| 	flex-wrap: wrap; | ||||
| } | ||||
|  | @ -68,7 +68,7 @@ | |||
| { | ||||
| 	width: 160px; | ||||
| 	text-align: center; | ||||
| 	padding: 8px; | ||||
| 	padding: 10px; | ||||
| } | ||||
| 
 | ||||
| .PrinterBlock img | ||||
|  |  | |||
|  | @ -67,7 +67,11 @@ function HandleModelList( pVal ) | |||
| 			let sVV=strVendor; | ||||
| 			if( sVV=="BBL" ) | ||||
| 				sVV="Bambu Lab";			 | ||||
| 			 | ||||
| 			if( sVV=="Custom") | ||||
| 				sVV="Custom Printer"; | ||||
| 			if( sVV=="Other") | ||||
| 				sVV="Orca colosseum"; | ||||
| 
 | ||||
| 			let HtmlNewVendor='<div class="OneVendorBlock" Vendor="'+strVendor+'">'+ | ||||
| '<div class="BlockBanner">'+ | ||||
| '	<div class="BannerBtns">'+ | ||||
|  | @ -80,10 +84,7 @@ function HandleModelList( pVal ) | |||
| '</div>'+ | ||||
| '</div>'; | ||||
| 			 | ||||
| 			if(sVV=='Bambu Lab') | ||||
| 				$('#Content').html( HtmlNewVendor + $('#Content').html() ); | ||||
| 			else | ||||
| 				$('#Content').append( HtmlNewVendor ); | ||||
| 			$('#Content').append(HtmlNewVendor); | ||||
| 		} | ||||
| 		 | ||||
| 		let ModelName=OneModel['model']; | ||||
|  | @ -100,10 +101,9 @@ function HandleModelList( pVal ) | |||
| 			HtmlNozzel+='<div class="pNozzel TextS2"><input type="checkbox" model="'+OneModel['model']+'" nozzel="'+nNozzel+'" vendor="'+strVendor+'" /><span>'+nNozzel+'</span><span class="trans" tid="t13">mm nozzle</span></div>'; | ||||
| 		} | ||||
| 		 | ||||
| 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; | ||||
| 		let	CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png"; | ||||
| 		let CoverImage=OneModel['cover']; | ||||
| 		ModelHtml[strVendor]+='<div class="PrinterBlock">'+ | ||||
| '	<div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+ | ||||
| '	<div class="PImg"><img src="'+CoverImage+'"  /></div>'+ | ||||
| '    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>'; | ||||
| 	} | ||||
| 	 | ||||
|  | @ -138,12 +138,12 @@ function HandleModelList( pVal ) | |||
| 		} | ||||
| 	}	 | ||||
| 
 | ||||
| 	let AlreadySelect=$("input:checked"); | ||||
| 	let nSelect=AlreadySelect.length; | ||||
| 	if(nSelect==0) | ||||
| 	{ | ||||
| 		$("input[nozzel='0.4'][vendor='BBL']").prop("checked", true); | ||||
| 	} | ||||
| 	// let AlreadySelect=$("input:checked");
 | ||||
| 	// let nSelect=AlreadySelect.length;
 | ||||
| 	// if(nSelect==0)
 | ||||
| 	// {
 | ||||
| 	// 	$("input[nozzel='0.4'][vendor='Custom']").prop("checked", true);
 | ||||
| 	// }
 | ||||
| 	 | ||||
| 	TranslatePage(); | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever