Merge pull request #15942 from Ultimaker/PP-353_Fix_exclude_materials

PP-353 fix exclude materials
This commit is contained in:
Jaime van Kessel 2023-06-28 14:09:55 +02:00 committed by GitHub
commit d2e0ffc493
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 13 deletions

View file

@ -20,10 +20,14 @@
"ultimaker_tough_pla_green", "ultimaker_tough_pla_green",
"ultimaker_tough_pla_red", "ultimaker_tough_pla_red",
"ultimaker_tough_pla_white", "ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe", "generic_cffcpe",
"generic_cffpa", "generic_cffpa",
"generic_gffcpe", "generic_gffcpe",
"generic_gffpa", "generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone", "structur3d_dap100silicone",
"ultimaker_petg_red", "ultimaker_petg_red",
"ultimaker_petg_blue", "ultimaker_petg_blue",
@ -38,7 +42,10 @@
"ultimaker_petg_red_translucent", "ultimaker_petg_red_translucent",
"ultimaker_petg_blue_translucent", "ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent", "ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent" "ultimaker_petg_yellow_fluorescent",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
], ],
"firmware_file": "MarlinUltimaker2plus.hex", "firmware_file": "MarlinUltimaker2plus.hex",
"first_start_actions": [], "first_start_actions": [],

View file

@ -10,19 +10,14 @@
"platform": "ultimaker2_plus_connect_platform.obj", "platform": "ultimaker2_plus_connect_platform.obj",
"exclude_materials": [ "exclude_materials": [
"generic_hips", "generic_hips",
"generic_petg",
"generic_bam", "generic_bam",
"ultimaker_bam", "ultimaker_bam",
"generic_pva", "generic_pva",
"ultimaker_pva", "ultimaker_pva",
"generic_tough_pla", "ultimaker_petcf_black",
"ultimaker_tough_pla_black", "ultimaker_petcf_blue",
"ultimaker_tough_pla_green", "ultimaker_petcf_gray",
"ultimaker_tough_pla_red", "generic_petcf",
"ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe", "generic_cffcpe",
"generic_cffpa", "generic_cffpa",
"generic_gffcpe", "generic_gffcpe",

View file

@ -18,6 +18,10 @@
"generic_cffpa", "generic_cffpa",
"generic_gffcpe", "generic_gffcpe",
"generic_gffpa", "generic_gffpa",
"generic_petcf",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray",
"structur3d_dap100silicone" "structur3d_dap100silicone"
], ],
"firmware_update_info": "firmware_update_info":

View file

@ -21,10 +21,14 @@
"ultimaker_tough_pla_green", "ultimaker_tough_pla_green",
"ultimaker_tough_pla_red", "ultimaker_tough_pla_red",
"ultimaker_tough_pla_white", "ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe", "generic_cffcpe",
"generic_cffpa", "generic_cffpa",
"generic_gffcpe", "generic_gffcpe",
"generic_gffpa", "generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone", "structur3d_dap100silicone",
"ultimaker_petg_blue", "ultimaker_petg_blue",
"ultimaker_petg_grey", "ultimaker_petg_grey",
@ -39,7 +43,10 @@
"ultimaker_petg_blue_translucent", "ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent", "ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent", "ultimaker_petg_yellow_fluorescent",
"ultimaker_petg_red" "ultimaker_petg_red",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
], ],
"firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_file": "MarlinUltimaker-{baudrate}.hex",
"firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",

View file

@ -21,10 +21,14 @@
"ultimaker_tough_pla_green", "ultimaker_tough_pla_green",
"ultimaker_tough_pla_red", "ultimaker_tough_pla_red",
"ultimaker_tough_pla_white", "ultimaker_tough_pla_white",
"ultimaker_tough_pla_blue",
"ultimaker_tough_pla_gray",
"ultimaker_tough_pla_yellow",
"generic_cffcpe", "generic_cffcpe",
"generic_cffpa", "generic_cffpa",
"generic_gffcpe", "generic_gffcpe",
"generic_gffpa", "generic_gffpa",
"generic_petcf",
"structur3d_dap100silicone", "structur3d_dap100silicone",
"ultimaker_petg_blue", "ultimaker_petg_blue",
"ultimaker_petg_grey", "ultimaker_petg_grey",
@ -39,7 +43,10 @@
"ultimaker_petg_blue_translucent", "ultimaker_petg_blue_translucent",
"ultimaker_petg_green_translucent", "ultimaker_petg_green_translucent",
"ultimaker_petg_yellow_fluorescent", "ultimaker_petg_yellow_fluorescent",
"ultimaker_petg_red" "ultimaker_petg_red",
"ultimaker_petcf_black",
"ultimaker_petcf_blue",
"ultimaker_petcf_gray"
], ],
"firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex",
"firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex",

View file

@ -16,7 +16,6 @@
], ],
"exclude_materials": [ "exclude_materials": [
"generic_hips", "generic_hips",
"generic_petg",
"structur3d_dap100silicone" "structur3d_dap100silicone"
], ],
"firmware_update_info": "firmware_update_info":