Merge branch 'release'

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.12.6-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.13.0-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

addons/hellfire/CfgAmmo.hpp

@@ -78,22 +78,22 @@ class CfgAmmo {
             seekerTypes[] = { "ARH" };
             defaultSeekerLockMode = "LOBL";
             seekerLockModes[] = { "LOBL" };
-            
+
             activeRadarEngageDistance = 1000;
             seekerMaxRange = 2000; // distance that the hellfire internal radar can scan
         };
-        
+
         // Vanilla lock system vars
         weaponLockSystem = "8";
         airLock = 1;
         lockType = 0;
         maneuvrability = 0; // no maneuvrability so that default guidance doesnt work
-        
+
         missileLockMaxDistance      = 8000;
         missileLockMinDistance      = 250;
         missileLockMaxSpeed         = 600;
         missileKeepLockedCone       = 70;
-        
+
         flightProfiles[] = {};
         class Components {
             class SensorsManagerComponent {
@@ -101,18 +101,18 @@ class CfgAmmo {
                     class MillimeterWaveRadar {
                         componentType = "ActiveRadarSensorComponent";
                         class AirTarget {
-                            minRange = 0;  
-                            maxRange = 8000;             
-                            objectDistanceLimitCoef = -1
-                            viewDistanceLimitCoef = -1;       
-                        };                                                                                    
+                            minRange = 0;
+                            maxRange = 8000;
+                            objectDistanceLimitCoef = -1;
+                            viewDistanceLimitCoef = -1;
+                        };
                         class GroundTarget {
-                            minRange = 0;                
-                            maxRange = 8000;                 
-                            objectDistanceLimitCoef = -1;               
-                            viewDistanceLimitCoef = -1;                 
-                        }; 
-                        typeRecognitionDistance     = 4000;                                         
+                            minRange = 0;
+                            maxRange = 8000;
+                            objectDistanceLimitCoef = -1;
+                            viewDistanceLimitCoef = -1;
+                        };
+                        typeRecognitionDistance     = 4000;
                         angleRangeHorizontal        = 70;
                         angleRangeVertical          = 70;
                         groundNoiseDistanceCoef     = 0; // relevant to AA missiles - not really for this

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 3
-#define MINOR 12
-#define PATCHLVL 6
-#define BUILD 43
+#define MINOR 13
+#define PATCHLVL 0
+#define BUILD 45

docs/_config.yml

@@ -8,17 +8,17 @@ ace:
   githubUrl: https://github.com/acemod/ACE3
   version:
     major: 3
-    minor: 12
-    patch: 6
-    build: 43
+    minor: 13
+    patch: 0
+    build: 45
 
 acex:
   githubUrl: https://github.com/acemod/ACEX
   version:
     major: 3
-    minor: 4
-    patch: 2
-    build: 13
+    minor: 5
+    patch: 0
+    build: 15
 
 
 markdown: kramdown

docs/_config_dev.yml

@@ -8,17 +8,17 @@ ace:
   githubUrl: https://github.com/acemod/ACE3
   version:
     major: 3
-    minor: 12
-    patch: 6
-    build: 43
+    minor: 13
+    patch: 0
+    build: 45
 
 acex:
   githubUrl: https://github.com/acemod/ACEX
   version:
     major: 3
-    minor: 4
-    patch: 2
-    build: 13
+    minor: 5
+    patch: 0
+    build: 15
 
 
 markdown: kramdown

tools/make.py

@@ -51,7 +51,7 @@ import traceback
 import time
 import timeit
 import re
-import fileinput
+from tempfile import mkstemp
 
 if sys.platform == "win32":
     import winreg
@@ -73,7 +73,7 @@ prefix = "ace"
 pbo_name_prefix = "ace_"
 signature_blacklist = []
 importantFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "docs\\README.zh-TW.md", "AUTHORS.txt", "LICENSE", "logo_ace3_ca.paa", "meta.cpp"]
-versionFiles = ["README.md", "docs\\README_DE.md", "docs\\README_PL.md", "mod.cpp"]
+versionFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "docs\\README.zh-TW.md"]
 
 ciBuild = False # Used for CI builds
 
@@ -582,9 +582,15 @@ def get_project_version(version_increments=[]):
 
 
 def replace_file(filePath, oldSubstring, newSubstring):
-    for line in fileinput.input(filePath, inplace=True):
-        # Use stdout directly, print() adds newlines automatically
-        sys.stdout.write(line.replace(oldSubstring,newSubstring))
+    fh, absPath = mkstemp()
+    with open(absPath, "w", encoding="utf-8") as newFile:
+        with open(filePath, encoding="utf-8") as oldFile:
+            for line in oldFile:
+                newFile.write(line.replace(oldSubstring, newSubstring))
+
+    newFile.close()
+    os.remove(filePath)
+    shutil.move(absPath, filePath)
 
 
 def set_version_in_files():
@@ -603,7 +609,7 @@ def set_version_in_files():
         try:
             # Save the file contents to a variable if the file exists
             if os.path.isfile(filePath):
-                f = open(filePath, "r+")
+                f = open(filePath, "r+", encoding="utf-8")
                 fileText = f.read()
                 f.close()