Merge branch 'master' into release

Metis-Team · Jan 29, 2025 · b4ad1fc · b4ad1fc
2 parents 556f114 + a8a40d9
commit b4ad1fc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,7 @@
 {
     "recommendations": [
-        "blackfisch.sqf-language",
         "editorconfig.editorconfig",
-        "bux578.vscode-openlastrpt"
+        "bux578.vscode-openlastrpt",
+        "brettmayson.hemtt"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,9 +12,6 @@
         "**/release": true,
     },
     "files.associations": {
-        "**/*.hpp": "ext",
-        // "**/*.hpp": "cpp",
-        "**/*.cpp": "ext",
         "**/XEH_PREP.hpp": "sqf",
         "*.rpt": "log",
         "init*.hpp": "sqf",
@@ -29,6 +26,4 @@
         ".hemttout/build": true,
         ".hemttout/release": true,
     },
-    "sqf.enableACE3": false,
-    "sqf.enableCBA": false,
 }
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
 
 <p align="center">
     <a href="https://github.com/Metis-Team/mts_nature/releases/latest">
-        <img src="https://img.shields.io/badge/Version-1.0.1-blue.svg?style=flat-square" alt="Metis Nature Version">
+        <img src="https://img.shields.io/github/v/release/Metis-Team/mts_nature?label=Version&style=flat-square" alt="Metis Nature Version">
     </a>
     <a href="https://github.com/Metis-Team/mts_nature/releases/latest">
-        <img src="https://img.shields.io/github/downloads/Metis-Team/mts_nature/total.svg?style=flat-square&label=Downloads" alt="Metis Nature Downloads">
+        <img src="https://img.shields.io/github/downloads/Metis-Team/mts_nature/total.svg?label=Downloads&logo=Github&style=flat-square" alt="Metis Nature Downloads">
     </a>
     <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=1951690856">
-        <img src="https://img.shields.io/badge/Steam-Workshop-green.svg?style=flat-square" alt="Steam Workshop">
+        <img src="https://img.shields.io/badge/Steam-Workshop-green.svg?logo=Steam&style=flat-square" alt="Steam Workshop">
     </a>
     <a href="https://github.com/Metis-Team/mts_nature/blob/master/LICENSE">
         <img src="https://img.shields.io/badge/License-APL--ND-red.svg?style=flat-square" alt="APL-ND License">

diff --git a/addons/nature/config.cpp b/addons/nature/config.cpp
@@ -13,5 +13,16 @@ class CfgPatches {
     };
 };
 
+// Add version checks if CBA is loaded
+class CfgSettings {
+    class CBA {
+        class Versioning {
+            class ADDON {
+                main_addon = QUOTE(ADDON);
+            };
+        };
+    };
+};
+
 #include "CfgEditorCategories.hpp"
 #include "CfgVehicles.hpp"
diff --git a/addons/nature/script_version.hpp b/addons/nature/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 0
-#define PATCHLVL 2
-#define BUILD 240916
+#define PATCHLVL 3
+#define BUILD 250130
diff --git a/addons/nature/stringtable.xml b/addons/nature/stringtable.xml
@@ -896,7 +896,7 @@
             <Original>Stub Picea</Original>
         </Key>
     </Container>
-    <Container>
+    <Container name="Grass">
         <Key ID="str_mts_nature_Grass_High_Dry">
             <Original>Grass High Dry</Original>
         </Key>