Merge branch 'master' into CWR3-Weapons-Compat

Author: Drofseh

Cargo.lock

@@ -26,11 +26,16 @@ Some folders of this project may contain a separate LICENSE file. Should
 that be the case, everything in that folder and all subfolders is subject
 to that license instead.
 
- - ARMA PUBLIC LICENSE (\addons\apl)
- - CreativeCommons Attributions 3.0 (\addons\fastroping\data\sounds)
- - CreativeCommons Attributions 4.0 (\addons\refuel\sounds)
-
- - CreativeCommons Zero 1.0 Universal (\addons\wardrobe\data\sounds)
+ - ARMA PUBLIC LICENSE
+   - \addons\apl
+ - CreativeCommons Attributions 3.0
+   - \addons\fastroping\data\sounds
+   - \addons\tagging\sounds
+ - CreativeCommons Attributions 4.0
+   - \addons\refuel\sounds
+
+ - CreativeCommons Zero 1.0 Universal
+   - \addons\wardrobe\data\sounds
 
 ============================================================================
                    Full GNU General Public License Text

LICENSE

@@ -110,6 +110,19 @@ class CfgAmmo {
     };
 
     class B_12Gauge_Slug: BulletBase {
+        // Based roughly off of a generalization of a 12/70 foster slug
+        ACE_caliber = 17.5;
+        ACE_bulletLength = 38;
+        ACE_bulletMass = 28.35; // 1 oz
+        ACE_ballisticCoefficients[] = {0.11};
+        ACE_dragModel = 1;
+        ACE_muzzleVelocityVariationSD = 2;
+        ACE_velocityBoundaries[] = {};
+        ACE_standardAtmosphere = "ASM";
+
+        ACE_muzzleVelocities[]={365.76, 381, 414.53, 426.72, 434.34, 441.96, 454.15, 455.68, 460.25};
+        ACE_barrelLengths[] = {215.9, 254, 317.5, 355.6, 457.2, 533.4, 609.6, 660.4, 711.2};
+
         //caliber = 3; //too high, ~20mm of RHA (450*3*15/1000=20), ~64mm metal
         caliber = 1.037; //~7mm RHA, ~22.4mm metal, probably still too high though as RHA is hardened.
     };

addons/ballistics/CfgAmmo.hpp

@@ -1478,7 +1478,7 @@
             <Russian>Автоматический ЛЦУ/тактический фонарь</Russian>
             <German>Kontinuität des Laserpointers/Taktischen Lichts</German>
             <Korean>무기 레이저 지시기/손전등 지속</Korean>
-            <Japanese>武器のレーザー ポインター/フラッシュライトの永続性</Japanese>
+            <Japanese>武器のレーザー/ライトの永続性</Japanese>
             <Chinese>保持武器雷射/手電筒的狀態</Chinese>
             <Chinesesimp>保持武器激光/手电筒的状态</Chinesesimp>
             <Ukrainian>Автоматичний ЛЦВ/тактичний ліхтар</Ukrainian>