Merge branch 'master' into libArachne_rebased

.github/ISSUE_TEMPLATE/bugreport.yaml

@@ -14,7 +14,7 @@ body:
   attributes:
     label: Application Version
     description: The version of Cura this issue occurs with.
-    placeholder: 4.8.0
+    placeholder: 4.9.0
   validations:
     required: true
 - type: input
@@ -55,16 +55,28 @@ body:
 - type: markdown
   attributes:
     value: |
-      ## Additional information & file uploads
-      
       Please be sure to add the following files:
         * For slicing issues, upload a **project file** that clearly shows the bug. 
           To save a project file go to `File -> Save project`. Please make sure to .zip your project file. For big files you may need to use WeTransfer or similar file sharing sites. 
           G-code files are not project files!
         * **Screenshots** of showing the problem, perhaps before/after images.
-        * A **log file**, see [here](https://github.com/Ultimaker/Cura#logging-issues) how to find the log file. 
+        * A **log file** for crashes and similar issues.
+          You can find your log file here:
+          Windows: `%APPDATA%\cura\<Cura version>\cura.log` or usually `C:\Users\\<your username>\AppData\Roaming\cura\<Cura version>\cura.log`
+          MacOS: `$USER/Library/Application Support/cura/<Cura version>/cura.log`
+          Ubuntu/Linus: `$USER/.local/share/cura/<Cura version>/cura.log` 
           
-      You can add these files and additional information that is relevant to the issue in the comments below. 
+          If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder 
+- type: checkboxes
+  attributes:
+    label: Checklist of files to include
+    options:
+      - label: Log file
+      - label: Project file
 - type: textarea
   attributes:
-    label: Additional information
+    label: Additional information & file uploads  
+    description: You can add these files and additional information that is relevant to the issue in the comments below.
+  validations:
+    required: true
+

.github/ISSUE_TEMPLATE/featurerequest.yaml

@@ -38,8 +38,7 @@ body:
     placeholder: It will affect...
   validations:
     required: true
-- type: markdown
+- type: textarea
   attributes:
-    value: |
+    label: Additional information & file uploads
-      ## Additional information & file uploads
+    description: You can add pictures or files to visualize your feature request in the comments below.
-      You can add pictures or files to visualize your feature request in the comments below.

plugins/SimulationView/layers3d.shader

@@ -143,7 +143,7 @@ geometry41core =
     in vec4 v_color[];
     in vec3 v_vertex[];
     in vec3 v_normal[];
-    in vec2 v_line_dim[];
+    in lowp vec2 v_line_dim[];
     in int v_extruder[];
     in mat4 v_extruder_opacity[];
     in float v_prev_line_type[];
@@ -296,8 +296,8 @@ geometry41core =
 
 
         if ((u_show_starts == 1) && (v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) {
-            float w = v_line_dim[0].x / 2;
+            float w = size_x;
-            float h = v_line_dim[0].y / 2;
+            float h = size_y;
 
             myEmitVertex(v_vertex[0] + vec3( w,  h,  w), u_starts_color, normalize(vec3( 1.0,  1.0,  1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w,  h,  w, 0.0))); // Front-top-left
             myEmitVertex(v_vertex[0] + vec3(-w,  h,  w), u_starts_color, normalize(vec3(-1.0,  1.0,  1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w,  h,  w, 0.0))); // Front-top-right

resources/definitions/mingda_d3pro.def.json

@@ -0,0 +1,21 @@
+{
+    "name": "MINGDA D3/Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "MINGDA D3/Pro" },
+        "machine_width": { "default_value": 320 },
+        "machine_depth": { "default_value": 320 },
+        "machine_height": { "default_value": 400 },
+        "gantry_height": { "value": 25 }
+		
+        
+
+    },
+    "metadata": {
+        "quality_definition": "mingda_base",
+        "visible": true,
+       "platform": "mingda_rock3_base.stl",
+        "platform_offset": [ -179, -108, 150]
+    }
+}

resources/definitions/mingda_d4pro.def.json

@@ -0,0 +1,20 @@
+{
+    "name": "MINGDA D4 Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "MINGDA D4 Pro" },
+		"machine_start_gcode": { "default_value": "G28 ; home all axes\n G29; ABL\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"},
+        "machine_width": { "default_value": 420 },
+        "machine_depth": { "default_value": 420 },
+        "machine_height": { "default_value": 400 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "mingda_base",
+        "visible": true,
+        "platform": "mingda_d4pro_base.stl",
+        "platform_offset": [ -177, -140, 170]
+    }
+}

resources/definitions/mingda_rock3.def.json

@@ -0,0 +1,19 @@
+{
+    "name": "MINGDA Rock3/Pro",
+    "version": 2,
+    "inherits": "mingda_base",
+    "overrides": {
+        "machine_name": { "default_value": "MINGDA Rock3/Pro" },
+        "machine_width": { "default_value": 320 },
+        "machine_depth": { "default_value": 320 },
+        "machine_height": { "default_value": 400 },
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "mingda_base",
+        "visible": true,
+        "platform": "mingda_rock3_base.stl",
+        "platform_offset": [ -179, -108, 150]
+    }
+}

resources/variants/mingda_d3pro_0.2.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2

resources/variants/mingda_d3pro_0.3.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3

resources/variants/mingda_d3pro_0.4.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4

resources/variants/mingda_d3pro_0.5.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5

resources/variants/mingda_d3pro_0.6.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6

resources/variants/mingda_d3pro_0.8.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8

resources/variants/mingda_d3pro_1.0.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_d3pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0

resources/variants/mingda_d4pro_0.2.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2

resources/variants/mingda_d4pro_0.3.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3

resources/variants/mingda_d4pro_0.4.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4

resources/variants/mingda_d4pro_0.5.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5

resources/variants/mingda_d4pro_0.6.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6

resources/variants/mingda_d4pro_0.8.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8

resources/variants/mingda_d4pro_1.0.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_d4pro
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0

resources/variants/mingda_rock3_0.2.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2

resources/variants/mingda_rock3_0.3.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3

resources/variants/mingda_rock3_0.4.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4

resources/variants/mingda_rock3_0.5.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5

resources/variants/mingda_rock3_0.6.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6

resources/variants/mingda_rock3_0.8.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8

resources/variants/mingda_rock3_1.0.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = mingda_rock3
+
+[metadata]
+setting_version = 16
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0

tests/TestOAuth2.py

@@ -46,7 +46,7 @@ NO_REFRESH_AUTH_RESPONSE = AuthenticationResponse(
     success = True
 )
 
-MALFORMED_AUTH_RESPONSE = AuthenticationResponse()
+MALFORMED_AUTH_RESPONSE = AuthenticationResponse(success=False)
 
 
 def test_cleanAuthService() -> None: