diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json
new file mode 100644
index 0000000000..8ef46fb98c
--- /dev/null
+++ b/resources/definitions/nwa3d_a31.def.json
@@ -0,0 +1,66 @@
+{
+    "name": "NWA3D A31",
+    "version": 2,
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "DragonJe",
+        "manufacturer": "NWA 3D LLC",
+        "file_formats": "text/x-gcode",
+        "platform_offset": [0, 0, 0],
+        "has_materials": true,
+        "has_variants": true,
+        "variants_name": "Nozzle Size",
+        "preferred_variant_name": "Standard 0.4mm",
+        "has_machine_materials": true,
+        "has_variant_materials": false,
+        "preferred_quality_type": "normal",
+        "has_machine_quality": true,
+        "preferred_material": "generic_pla",
+        "machine_extruder_trains":
+        {
+            "0": "nwa3d_a31_extruder_0"
+        }
+    },
+
+    "overrides": {
+        "machine_name": {
+            "default_value": "NWA3D A31"
+        },
+        "machine_width": {
+            "default_value": 300
+        },
+        "machine_height": {
+            "default_value": 400
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_head_polygon": {
+            "default_value": [
+                [-30, 34],
+                [-30, -32],
+                [30, -32],
+                [30, 34]
+            ]
+        },
+        "gantry_height": {
+            "value": "30"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0"
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
+        }
+    }
+}
diff --git a/resources/extruders/nwa3d_a31_extruder_0.def.json b/resources/extruders/nwa3d_a31_extruder_0.def.json
new file mode 100644
index 0000000000..999fe37d28
--- /dev/null
+++ b/resources/extruders/nwa3d_a31_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "id": "nwa3d_a31_extruder_0",
+    "version": 2,
+    "name": "Standard 0.4mm",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "nwa3d_a31",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
new file mode 100644
index 0000000000..a81635be05
--- /dev/null
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
@@ -0,0 +1,129 @@
+
+[general]
+version = 4
+name = Best Quality
+definition = nwa3d_a31
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = best
+weight = 1
+global_quality = True
+
+[values]
+layer_height = 0.08
+layer_height_0 = 0.24
+line_width = 0.4
+wall_line_width_0 = 0.4
+initial_layer_line_width_factor = 100
+wall_thickness = 0.8
+wall_0_wipe_dist = 0.2
+roofing_layer_count = 1
+top_bottom_thickness = 0.6
+top_thickness = 0.8
+top_layers = 5
+bottom_thickness = 0.6
+bottom_layers = 3
+top_bottom_pattern = lines
+top_bottom_pattern_0 = lines
+wall_0_inset = 0
+optimize_wall_printing_order = False
+outer_inset_first = False
+alternate_extra_perimeter = False
+travel_compensate_overlapping_walls_enabled = True
+travel_compensate_overlapping_walls_0_enabled = True
+travel_compensate_overlapping_walls_x_enabled = True
+wall_min_flow = 0
+fill_perimeter_gaps = everywhere
+filter_out_tiny_gaps = True
+fill_outline_gaps = True
+xy_offset = 0
+skin_no_small_gaps_heuristic = True
+skin_outline_count = 1
+ironing_enabled = False
+infill_sparse_density = 20
+zig_zaggify_infill = False
+infill_multiplier = 1
+infill_wall_line_count = 0
+infill_overlap = 10
+skin_overlap = 5
+infill_wipe_dist = 0.1
+gradual_infill_steps = 0
+infill_before_walls = False
+infill_support_enabled = False
+max_skin_angle_for_expansion = 90
+material_diameter = 1.75
+default_material_print_temperature = 220
+material_print_temperature = 220
+material_print_temperature_layer_0 = 220
+material_initial_print_temperature = 220
+material_final_print_temperature = 220
+default_material_bed_temperature = 50
+material_bed_temperature = 50
+material_flow = 100
+retraction_enable = True
+retract_at_layer_change = False
+retraction_amount = 5
+retraction_speed = 45
+retraction_extra_prime_amount = 0
+retraction_min_travel = 0.8
+retraction_count_max = 90
+retraction_extrusion_window = 5
+limit_support_retractions = True
+switch_extruder_retraction_amount = 16
+switch_extruder_retraction_speeds = 20
+speed_print = 30
+speed_travel = 150
+speed_layer_0 = 10
+speed_travel_layer_0 = 50
+max_feedrate_z_override = 0
+speed_slowdown_layers = 2
+speed_equalize_flow_enabled = False
+acceleration_enabled = False
+acceleration_roofing = 3000
+jerk_enabled = False
+retraction_combing = off
+travel_retract_before_outer_wall = False
+retraction_hop_enabled = False
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_0 = 0
+cool_fan_full_at_height = 0.24
+cool_lift_head = False
+support_enable = True
+support_type = everywhere
+support_angle = 50
+support_pattern = grid
+support_wall_count = 0
+zig_zaggify_support = False
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_angle = 0
+support_brim_enable = True
+support_brim_line_count = 5
+support_z_distance = 0.2
+support_xy_distance = 0.7
+support_xy_distance_overhang = 0.2
+support_bottom_stair_step_height = 0.3
+support_bottom_stair_step_width = 5.0
+support_join_distance = 2.0
+support_offset = 0.2
+gradual_support_infill_steps = 0
+support_roof_enable = True
+support_bottom_enable = False
+support_roof_height = 0.45
+support_roof_density = 45
+support_roof_pattern = lines
+support_fan_enable = False
+support_use_towers = True
+support_tower_diameter = 3
+support_tower_roof_angle = 65
+adhesion_type = skirt
+skirt_line_count = 2
+skirt_gap = 3
+meshfix_union_all = True
+meshfix_union_all_remove_holes = False
+meshfix_extensive_stitching = False
+meshfix_keep_open_polygons = False
+multiple_mesh_overlap = 0.16
+carve_multiple_volumes = False
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
new file mode 100644
index 0000000000..ed8d06d53c
--- /dev/null
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
@@ -0,0 +1,125 @@
+[general]
+version = 4
+name = 0.6 Engineering Quality
+definition = nwa3d_a31
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = Engineering
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.28
+layer_height_0 = 0.4
+line_width = 0.6
+wall_line_width_0 = 0.6
+initial_layer_line_width_factor = 100
+wall_thickness = 1.2
+wall_0_wipe_dist = 0.2
+roofing_layer_count = 1
+top_bottom_thickness = 1.2
+top_layers = 5
+bottom_layers = 3
+top_bottom_pattern = lines
+top_bottom_pattern_0 = lines
+wall_0_inset = 0
+optimize_wall_printing_order = False
+outer_inset_first = False
+alternate_extra_perimeter = False
+travel_compensate_overlapping_walls_enabled = True
+travel_compensate_overlapping_walls_0_enabled = True
+travel_compensate_overlapping_walls_x_enabled = True
+wall_min_flow = 0
+fill_perimeter_gaps = everywhere
+filter_out_tiny_gaps = True
+fill_outline_gaps = True
+xy_offset = 0
+skin_no_small_gaps_heuristic = True
+skin_outline_count = 1
+ironing_enabled = False
+infill_sparse_density = 15
+zig_zaggify_infill = False
+infill_multiplier = 1
+infill_wall_line_count = 0
+infill_overlap = 10
+skin_overlap = 5
+infill_wipe_dist = 0.15
+gradual_infill_steps = 0
+infill_before_walls = False
+infill_support_enabled = False
+max_skin_angle_for_expansion = 90
+material_diameter = 1.75
+default_material_print_temperature = 220
+material_print_temperature = 220
+material_print_temperature_layer_0 = 220
+material_initial_print_temperature = 220
+material_final_print_temperature = 220
+default_material_bed_temperature = 50
+material_bed_temperature = 50
+material_flow = 100
+retraction_enable = True
+retract_at_layer_change = False
+retraction_amount = 5
+retraction_speed = 45
+retraction_extra_prime_amount = 0
+retraction_min_travel = 1.2
+retraction_count_max = 90
+retraction_extrusion_window = 5
+limit_support_retractions = True
+switch_extruder_retraction_amount = 16
+switch_extruder_retraction_speeds = 20
+speed_print = 40
+speed_travel = 150
+speed_layer_0 = 10
+speed_travel_layer_0 = 40
+max_feedrate_z_override = 0
+speed_slowdown_layers = 2
+speed_equalize_flow_enabled = False
+acceleration_enabled = False
+jerk_enabled = False
+retraction_combing = off
+travel_retract_before_outer_wall = False
+retraction_hop_enabled = False
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_0 = 0
+cool_fan_full_layer = 3
+cool_lift_head = False
+support_enable = True
+support_type = everywhere
+support_angle = 50
+support_pattern = grid
+support_wall_count = 0
+zig_zaggify_support = False
+support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_angle = 0
+support_brim_enable = True
+support_brim_line_count = 5
+support_z_distance = 0.34
+support_xy_distance = 0.7
+support_xy_distance_overhang = 0.2
+support_bottom_stair_step_height = 0.3
+support_bottom_stair_step_width = 5.0
+support_join_distance = 2.0
+support_offset = 0.2
+gradual_support_infill_steps = 0
+support_roof_enable = True
+support_bottom_enable = False
+support_roof_height = .45
+support_roof_density = 45
+support_roof_pattern = grid
+support_fan_enable = False
+support_use_towers = True
+support_tower_diameter = 3
+support_tower_roof_angle = 65
+adhesion_type = skirt
+skirt_line_count = 2
+skirt_gap = 3
+meshfix_union_all = True
+meshfix_union_all_remove_holes = False
+meshfix_extensive_stitching = False
+meshfix_keep_open_polygons = False
+multiple_mesh_overlap = 0.16
+carve_multiple_volumes = False
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
new file mode 100644
index 0000000000..e781feb23e
--- /dev/null
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
@@ -0,0 +1,129 @@
+
+[general]
+version = 4
+name = Fast Quality
+definition = nwa3d_a31
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = fast
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.24
+layer_height_0 = 0.24
+line_width = 0.4
+wall_line_width_0 = 0.4
+initial_layer_line_width_factor = 100
+wall_thickness = 0.8
+wall_0_wipe_dist = 0.2
+roofing_layer_count = 1
+top_bottom_thickness = 0.6
+top_thickness = 0.8
+top_layers = 5
+bottom_thickness = 0.6
+bottom_layers = 3
+top_bottom_pattern = lines
+top_bottom_pattern_0 = lines
+wall_0_inset = 0
+optimize_wall_printing_order = False
+outer_inset_first = False
+alternate_extra_perimeter = False
+travel_compensate_overlapping_walls_enabled = True
+travel_compensate_overlapping_walls_0_enabled = True
+travel_compensate_overlapping_walls_x_enabled = True
+wall_min_flow = 0
+fill_perimeter_gaps = everywhere
+filter_out_tiny_gaps = True
+fill_outline_gaps = True
+xy_offset = 0
+skin_no_small_gaps_heuristic = True
+skin_outline_count = 1
+ironing_enabled = False
+infill_sparse_density = 15
+zig_zaggify_infill = False
+infill_multiplier = 1
+infill_wall_line_count = 0
+infill_overlap = 10
+skin_overlap = 5
+infill_wipe_dist = 0.1
+gradual_infill_steps = 0
+infill_before_walls = False
+infill_support_enabled = False
+max_skin_angle_for_expansion = 90
+material_diameter = 1.75
+default_material_print_temperature = 220
+material_print_temperature = 220
+material_print_temperature_layer_0 = 220
+material_initial_print_temperature = 220
+material_final_print_temperature = 220
+default_material_bed_temperature = 50
+material_bed_temperature = 50
+material_flow = 100
+retraction_enable = True
+retract_at_layer_change = False
+retraction_amount = 5
+retraction_speed = 45
+retraction_extra_prime_amount = 0
+retraction_min_travel = 0.8
+retraction_count_max = 90
+retraction_extrusion_window = 5
+limit_support_retractions = True
+switch_extruder_retraction_amount = 16
+switch_extruder_retraction_speeds = 20
+speed_print = 60
+speed_travel = 150
+speed_layer_0 = 10
+speed_travel_layer_0 = 50
+max_feedrate_z_override = 0
+speed_slowdown_layers = 2
+speed_equalize_flow_enabled = False
+acceleration_enabled = False
+acceleration_roofing = 3000
+jerk_enabled = False
+retraction_combing = off
+travel_retract_before_outer_wall = False
+retraction_hop_enabled = False
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_0 = 0
+cool_fan_full_at_height = 0.48
+cool_lift_head = False
+support_enable = True
+support_type = everywhere
+support_angle = 50
+support_pattern = grid
+support_wall_count = 0
+zig_zaggify_support = False
+support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_angle = 0
+support_brim_enable = True
+support_brim_line_count = 5
+support_z_distance = 0.3
+support_xy_distance = 0.7
+support_xy_distance_overhang = 0.2
+support_bottom_stair_step_height = 0.3
+support_bottom_stair_step_width = 5.0
+support_join_distance = 2.0
+support_offset = 0.2
+gradual_support_infill_steps = 0
+support_roof_enable = True
+support_bottom_enable = False
+support_roof_height = 0.45
+support_roof_density = 45
+support_roof_pattern = lines
+support_fan_enable = False
+support_use_towers = True
+support_tower_diameter = 3
+support_tower_roof_angle = 65
+adhesion_type = skirt
+skirt_line_count = 2
+skirt_gap = 3
+meshfix_union_all = True
+meshfix_union_all_remove_holes = False
+meshfix_extensive_stitching = False
+meshfix_keep_open_polygons = False
+multiple_mesh_overlap = 0.16
+carve_multiple_volumes = False
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
new file mode 100644
index 0000000000..c4436fe7d0
--- /dev/null
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
@@ -0,0 +1,128 @@
+[general]
+version = 4
+name = Normal Quality
+definition = nwa3d_a31
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.16
+layer_height_0 = 0.24
+line_width = 0.4
+wall_line_width_0 = 0.4
+initial_layer_line_width_factor = 100
+wall_thickness = 0.8
+wall_0_wipe_dist = 0.2
+roofing_layer_count = 1
+top_bottom_thickness = 0.6
+top_thickness = 0.8
+top_layers = 5
+bottom_thickness = 0.6
+bottom_layers = 3
+top_bottom_pattern = lines
+top_bottom_pattern_0 = lines
+wall_0_inset = 0
+optimize_wall_printing_order = False
+outer_inset_first = False
+alternate_extra_perimeter = False
+travel_compensate_overlapping_walls_enabled = True
+travel_compensate_overlapping_walls_0_enabled = True
+travel_compensate_overlapping_walls_x_enabled = True
+wall_min_flow = 0
+fill_perimeter_gaps = everywhere
+filter_out_tiny_gaps = True
+fill_outline_gaps = True
+xy_offset = 0
+skin_no_small_gaps_heuristic = True
+skin_outline_count = 1
+ironing_enabled = False
+infill_sparse_density = 20
+zig_zaggify_infill = False
+infill_multiplier = 1
+infill_wall_line_count = 0
+infill_overlap = 10
+skin_overlap = 5
+infill_wipe_dist = 0.1
+gradual_infill_steps = 0
+infill_before_walls = False
+infill_support_enabled = False
+max_skin_angle_for_expansion = 90
+material_diameter = 1.75
+default_material_print_temperature = 220
+material_print_temperature = 220
+material_print_temperature_layer_0 = 220
+material_initial_print_temperature = 220
+material_final_print_temperature = 220
+default_material_bed_temperature = 50
+material_bed_temperature = 50
+material_flow = 100
+retraction_enable = True
+retract_at_layer_change = False
+retraction_amount = 5
+retraction_speed = 45
+retraction_extra_prime_amount = 0
+retraction_min_travel = 0.8
+retraction_count_max = 90
+retraction_extrusion_window = 5
+limit_support_retractions = True
+switch_extruder_retraction_amount = 16
+switch_extruder_retraction_speeds = 20
+speed_print = 50
+speed_travel = 150
+speed_layer_0 = 10
+speed_travel_layer_0 = 50
+max_feedrate_z_override = 0
+speed_slowdown_layers = 2
+speed_equalize_flow_enabled = False
+acceleration_enabled = False
+acceleration_roofing = 3000
+jerk_enabled = False
+retraction_combing = off
+travel_retract_before_outer_wall = False
+retraction_hop_enabled = False
+cool_fan_enabled = True
+cool_fan_speed = 100
+cool_fan_speed_0 = 0
+cool_fan_full_at_height = 0.32
+cool_lift_head = False
+support_enable = True
+support_type = everywhere
+support_angle = 50
+support_pattern = grid
+support_wall_count = 0
+zig_zaggify_support = False
+support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_angle = 0
+support_brim_enable = True
+support_brim_line_count = 5
+support_z_distance = 0.21
+support_xy_distance = 0.7
+support_xy_distance_overhang = 0.2
+support_bottom_stair_step_height = 0.3
+support_bottom_stair_step_width = 5.0
+support_join_distance = 2.0
+support_offset = 0.2
+gradual_support_infill_steps = 0
+support_roof_enable = True
+support_bottom_enable = False
+support_roof_height = 0.45
+support_roof_density = 45
+support_roof_pattern = lines
+support_fan_enable = False
+support_use_towers = True
+support_tower_diameter = 3
+support_tower_roof_angle = 65
+adhesion_type = skirt
+skirt_line_count = 2
+skirt_gap = 3
+meshfix_union_all = True
+meshfix_union_all_remove_holes = False
+meshfix_extensive_stitching = False
+meshfix_keep_open_polygons = False
+multiple_mesh_overlap = 0.16
+carve_multiple_volumes = False
diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d_a31_04.inst.cfg
new file mode 100644
index 0000000000..02cebaec84
--- /dev/null
+++ b/resources/variants/nwa3d_a31_04.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Standard 0.4mm
+version = 4
+definition = nwa3d_a31
+
+[metadata]
+author = DragonJe
+setting_version = 8
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d_a31_06.inst.cfg
new file mode 100644
index 0000000000..c9c542bc10
--- /dev/null
+++ b/resources/variants/nwa3d_a31_06.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = Engineering 0.6mm
+version = 4
+definition = nwa3d_a31
+
+[metadata]
+author = DragonJe
+setting_version = 8
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6