Skip to content

Commit

Permalink
Merge branch '5.4'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	conanfile.py
  • Loading branch information
@jellespijker
jellespijker committed Jul 4, 2023
2 parents f0186ff + 0089b5e commit f2ac1eb
Show file tree
Hide file tree
Showing 72 changed files with 1,036 additions and 2,472 deletions.
47 changes: 4 additions & 43 deletions resources/definitions/alya3dp.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,18 @@
"file_formats": "text/x-gcode",
"platform": "alya_platform.3mf",
"exclude_materials": [
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"dsm_arnitel2045",
"dsm_novamid1070",
"generic_abs",
"generic_abs_175",
"generic_bam",
"generic_cpe",
"generic_cpe_175",
"generic_cpe_plus",
"generic_hips",
"generic_hips_175",
"generic_nylon",
"generic_nylon_175",
"generic_pc",
"generic_pc_175",
"generic_petg",
"generic_petg_175",
"generic_pp",
"generic_pva",
"generic_pva_175",
"generic_tough_pla",
"generic_tpu",
"generic_tpu_175",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"zyyx_pro_flex",
"zyyx_pro_pla",
"tizyx_pla",
"tizyx_abs",
"tizyx_pla_bois"
"innofill_innoflex60",
"verbatim_bvoh"
],
"has_machine_quality": true,
"has_materials": true,
Expand Down
41 changes: 1 addition & 40 deletions resources/definitions/alyanx3dp.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,18 @@
"file_formats": "text/x-gcode",
"platform": "alya_nx_platform.3mf",
"exclude_materials": [
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"generic_abs",
"generic_abs_175",
"generic_bam",
"generic_cpe",
"generic_cpe_175",
"generic_cpe_plus",
"generic_hips",
"generic_hips_175",
"generic_nylon",
"generic_nylon_175",
"generic_pc",
"generic_pc_175",
"generic_petg",
"generic_petg_175",
"generic_pp",
"generic_pva",
"generic_pva_175",
"generic_tough_pla",
"generic_tpu",
"generic_tpu_175",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"zyyx_pro_flex",
"zyyx_pro_pla",
"tizyx_pla",
"tizyx_abs",
"tizyx_pla_bois"
"verbatim_bvoh_175"
],
"has_machine_quality": true,
"has_materials": true,
Expand Down
43 changes: 1 addition & 42 deletions resources/definitions/artillery_base.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,10 @@
"manufacturer": "Artillery",
"file_formats": "text/x-gcode",
"exclude_materials": [
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"generic_bam",
"generic_cffcpe",
"generic_cffpa",
"generic_cpe",
"generic_cpe_plus",
"generic_gffcpe",
"generic_gffpa",
"generic_hips",
"generic_nylon",
"generic_pc",
"generic_pp",
"generic_pva",
"generic_tough_pla",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"structur3d_dap100silicone",
"tizyx_abs",
"tizyx_pla",
"tizyx_pla_bois",
"verbatim_bvoh_175",
"zyyx_pro_flex",
"zyyx_pro_pla"
"verbatim_bvoh_175"
],
"first_start_actions": [ "MachineSettingsAction" ],
"has_machine_quality": true,
Expand Down
72 changes: 6 additions & 66 deletions resources/definitions/atmat_signal_pro_base.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,73 +9,13 @@
"manufacturer": "ATMAT sp. z o.o.",
"file_formats": "text/x-gcode",
"exclude_materials": [
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"emotiontech_abs",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pva-m",
"emotiontech_pva-oks",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"emotiontech_asax",
"emotiontech_hips",
"fiberlogy_hd_pla",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"generic_abs",
"generic_bam",
"generic_cffcpe",
"generic_cffpa",
"dsm_arnitel2045",
"dsm_novamid1070",
"generic_cpe",
"generic_cpe_plus",
"generic_gffcpe",
"generic_gffpa",
"generic_hips",
"generic_nylon",
"generic_pc",
"generic_petg",
"generic_pla",
"generic_pp",
"generic_pva",
"generic_tough_pla",
"generic_tpu",
"generic_cpe_175",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"structur3d_dap100silicone",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla",
"tizyx_pla_bois",
"tizyx_pva",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_TPU",
"zyyx_pro_flex",
"zyyx_pro_pla"
"imade3d_petg",
"imade3d_pla",
"innofill_innoflex60",
"verbatim_bvoh"
],
"has_machine_quality": true,
"has_materials": true,
Expand Down
53 changes: 4 additions & 49 deletions resources/definitions/creality_base.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,10 @@
"manufacturer": "Creality3D",
"file_formats": "text/x-gcode",
"exclude_materials": [
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"generic_abs",
"generic_bam",
"generic_cffcpe",
"generic_cffpa",
"generic_cpe",
"generic_cpe_plus",
"generic_gffcpe",
"generic_gffpa",
"generic_hips",
"generic_nylon",
"generic_pc",
"generic_petg",
"generic_pla",
"generic_pp",
"generic_pva",
"generic_tough_pla",
"generic_tpu",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"structur3d_dap100silicone",
"tizyx_abs",
"tizyx_pla",
"tizyx_pla_bois",
"verbatim_bvoh_175",
"zyyx_pro_flex",
"zyyx_pro_pla"
"dsm_arnitel2045",
"dsm_novamid1070",
"innofill_innoflex60",
"verbatim_bvoh"
],
"first_start_actions": [ "MachineSettingsAction" ],
"has_machine_quality": true,
Expand Down
17 changes: 2 additions & 15 deletions resources/definitions/elegoo_base.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,13 @@
"file_formats": "text/x-gcode",
"platform": "elegoo_platform.3mf",
"exclude_materials": [
"generic_nylon_175",
"generic_nylon",
"generic_hips_175",
"generic_hips",
"generic_gffcpe",
"generic_bvoh_175",
"generic_ccfpe",
"generic_cffcpe",
"generic_cpe_plus",
"generic_cpe_175",
"generic_bvoh",
"generic_cpe",
"generic_tpu",
"generic_pp",
"generic_pc",
"generic_pc_175",
"generic_pvc",
"generic_pva",
"generic_pva_175",
"generic_pvc_175",
"generic_pp"
"generic_pvc"
],
"has_machine_quality": true,
"has_materials": true,
Expand Down
Loading

0 comments on commit f2ac1eb

Please sign in to comment.