Merge remote-tracking branch 'upstream/dev-Tomcat' into dev-Tomcat

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,14 @@
+* text=auto
+*.png binary
+*.jpg binary
+*.paa binary
+
+# Change GitHub language categorization
+addons/**/*.cpp linguist-language=SQF
+addons/**/*.hpp linguist-language=SQF
+
+optionals/**/*.cpp linguist-language=SQF
+optionals/**/*.hpp linguist-language=SQF
+
+# Do not count hemtt includes in language usage stats
+include/* linguist-vendored

.github/workflows/arma.yml

@@ -0,0 +1,31 @@
+name: Arma
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Validate SQF
+      run: python3 tools/sqf_validator.py
+    - name: Validate Config
+      run: python3 tools/config_style_checker.py
+    - name: Validate Stringtables
+      run: python3 tools/stringtable_validator.py
+    - name: Check Strings
+      run: python3 tools/check_strings.py
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@master
+    - name: Lint (sqflint)
+      uses: arma-actions/sqflint@master
+      continue-on-error: true # No failure due to many false-positives

addons/airway/ACE_Medical_Treatment_Actions.hpp

@@ -86,7 +86,7 @@ class ACE_Medical_Treatment_Actions {
         callbackSuccess = QFUNC(treatmentAdvanced_CancelRecoveryPosition);
     };
     class CheckPulse;
-    class CheckAirway: checkPulse {
+    class CheckAirway: CheckPulse {
         displayName = CSTRING(checkAirway);
         displayNameProgress = CSTRING(action_checking);
         category = "airway";

addons/airway/functions/fnc_updateInjuryList.sqf

@@ -164,12 +164,12 @@ if (_target getVariable [QGVAR(recovery), false]) then {
 
 // Display cyanosis in overview tab, only when head/arms are selected
 if (EGVAR(breathing,cyanosisShowInMenu) && (_selectionN in [0,2,3])) then {
-	private _spO2 = 0;
-	
-	if (alive _target) then {
+    private _spO2 = 0;
+    
+    if (alive _target) then {
         _spO2 = GET_SPO2(_target);
-	};
-	
+    };
+    
     if (_spO2 <= EGVAR(breathing,slightValue) || HAS_TOURNIQUET_APPLIED_ON(_target,_selectionN)) then {
         private _cyanosisArr = switch (true) do {
             case (HAS_TOURNIQUET_APPLIED_ON(_target,_selectionN));