Joey de l'Arago a70e212124 Merge branch 'main' into updated_elegoo_definitions ... # Conflicts: # resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg # resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg # resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg # resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg # resources/quality/elegoo/base/abs040/abs_040024.inst.cfg # resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg # resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg # resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg # resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg # resources/quality/elegoo/base/asa040/asa_040024.inst.cfg # resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg # resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg # resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg # resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg # resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg # resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg # resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg # resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg # resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg # resources/quality/elegoo/base/petg040/petg_040028.inst.cfg # resources/quality/elegoo/base/pla040/pla_040012.inst.cfg # resources/quality/elegoo/base/pla040/pla_040016.inst.cfg # resources/quality/elegoo/base/pla040/pla_040020.inst.cfg # resources/quality/elegoo/base/pla040/pla_040024.inst.cfg # resources/quality/elegoo/base/pla040/pla_040028.inst.cfg # resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg # resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg # resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg # resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg		2023-04-11 19:07:27 +02:00
..
deltacomb	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
elegoo_base/PLA	Update elegoo pla definitions and add intents	2023-03-18 16:51:41 +01:00
liquid	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
ultimaker_s3	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
ultimaker_s5	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
uni_base	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
zav_base	Bump up setting version to 22	2023-03-31 07:24:43 +02:00