Merge branch 'master' into pr/8215

.github/workflows/pboproject.yml

@@ -15,7 +15,7 @@ jobs:
       with:
         toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Install Mikero Tools
-      uses: arma-actions/mikero-tools@2021-04-10
+      uses: arma-actions/mikero-tools@2021-11-06
     - name: Download game data
       run: |
         Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip

AUTHORS.txt

@@ -151,7 +151,9 @@ Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
 ruPaladin <happyworm24@rambler.ru>
 Rutger "RedBery" Meijering <c.redbery@gmail.com>
+sancron
 Schwaggot <tom.ryan@posteo.de>
+Seb <sebsmith90@gmail.com>
 shukari
 simon84 <badguy360th@gmail.com>
 Skengman2

addons/advanced_ballistics/ACE_Settings.hpp

@@ -4,7 +4,7 @@ class ACE_Settings {
     };
     class GVAR(muzzleVelocityVariationEnabled) {
         movedToSQF = 1;
-    }; 
+    };
     class GVAR(ammoTemperatureEnabled) {
         movedToSQF = 1;
     };

addons/advanced_ballistics/RscTitles.hpp

@@ -52,4 +52,4 @@ class RscTitles {
             };
         };
     };
-};
+};

addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf

@@ -68,7 +68,7 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
                 private _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _vanillaInitialSpeed] call FUNC(calculateBarrelLengthVelocityShift);
                 private _abInitialSpeed = _vanillaInitialSpeed + _barrelVelocityShift;
                 // --------------------------------------------------
-                
+
                 if (_weapon find "_base" == -1 && _weapon find "_Base" == -1) then {
 #ifdef DEBUG_INIT_SPEEDS
                     _data pushBack [-_forEachIndex, _abInitialSpeed, _magazine, _weapon];

addons/advanced_ballistics/functions/fnc_handleFired.sqf

@@ -31,12 +31,14 @@ if (_abort) then {
     private _maxRange = uiNamespace getVariable format[QGVAR(maxRange_%1), _ammo];
     if (isNil "_maxRange") then {
         private _airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction");
-        private _maxRange = if (_airFriction < 0) then {
+        private _vanillaInitialSpeed = getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
+        _maxRange = if (_airFriction < 0) then {
             private _maxTime = ((_vanillaInitialSpeed - BULLET_TRACE_MIN_VELOCITY) / (BULLET_TRACE_MIN_VELOCITY * -_airFriction * _vanillaInitialSpeed)) max getNumber(configFile >> "CfgAmmo" >> _ammo >> "tracerEndTime");
             -ln(1 - _airFriction * _vanillaInitialSpeed * _maxTime) / _airFriction
         } else {
             _vanillaInitialSpeed * getNumber(configFile >> "CfgAmmo" >> _ammo >> "tracerEndTime")
         };
+        _maxRange = _maxRange * 1.3; // Adding 30% more to range just to be safe
         uiNamespace setVariable [format[QGVAR(maxRange_%1), _ammo], _maxRange];
     };
     if (ACE_player distance _unit > _maxRange && {ACE_player distance ((getPosASL _unit) vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply _maxRange)) > _maxRange}) exitWith {};

addons/advanced_ballistics/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\advanced_ballistics\script_component.hpp"
+#include "\z\ace\addons\advanced_ballistics\script_component.hpp"

addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf

@@ -25,7 +25,7 @@ _posAndSize set [2, _stamina * GVAR(staminaBarWidth)];
 _staminaBarContainer ctrlSetPosition _posAndSize;
 
 // - Opacity ------------------------------------------------------------------
-if (GVAR(fadeStaminaBar)) then { 
+if (GVAR(fadeStaminaBar)) then {
     if (_stamina >= 0.8) then {
         _staminaBarContainer ctrlSetFade (0.9 + 0.1 * (_stamina - 0.8) / 0.2);
     } else {

addons/ai/functions/fnc_garrisonMove.sqf

@@ -33,7 +33,7 @@ private _unitMoveListUnits = (_unitMoveList apply {_x select 0});
     _x setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
 } foreach _unitMoveListUnits;
 
-// Avoid duplicate PFHs 
+// Avoid duplicate PFHs
 if (isNil QGVAR(garrison_moveUnitPFH)) then {
     missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), true, true];
 
@@ -114,7 +114,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then {
                         (_unit getVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, [0,0,0]]]) params ["_unitPosTimer", "_unitOldPos"];
 
                         // AI may sometimes not be able to report unitReady, this is to avoid the PFH running forever
-                        switch true do { 
+                        switch true do {
                             case ((_unitPos distance _pos) < 1.5) : {
                                 call _fnc_attemptSuccessful;
                             };
@@ -127,7 +127,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then {
 
                             default {
                                 _unit setVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, _unitPos]];
-                            }; 
+                            };
                         };
                     };
                 };

addons/aircraft/CfgMagazines.hpp

@@ -19,13 +19,13 @@ class CfgMagazines {
         displayName = CSTRING(GatlingDescriptionAP);
         displayNameShort = CSTRING(GatlingDescriptionShortAP);
     };
-    
+
     class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F {
         ammo = "ACE_Gatling_30mm_Sub_CM41";
         displayName = CSTRING(GatlingDescriptionCM41);
         displayNameShort = CSTRING(GatlingDescriptionShortCM41);
     };
-   
+
     class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F {
         ammo = "ACE_Gatling_30mm_Sub_CM51";
         displayName = CSTRING(GatlingDescriptionCM51);

addons/arsenal/functions/fnc_addRightPanelButton.sqf

@@ -42,12 +42,12 @@ if (_position >= 0 && _position <= 9) then {
     private _cfgWeapons = configFile >> "CfgWeapons";
     _items = _items select {
         private _configItemInfo = _cfgWeapons >> _x >> "ItemInfo";
-           
+
         _x isKindOf ["CBA_MiscItem", _cfgWeapons] && {getNumber (_configItemInfo >> "type") in [TYPE_MUZZLE, TYPE_OPTICS, TYPE_FLASHLIGHT, TYPE_BIPOD]} ||
         {getNumber (_configItemInfo >> "type") in [TYPE_FIRST_AID_KIT, TYPE_MEDIKIT, TYPE_TOOLKIT]} ||
         {getText (_cfgWeapons >> _x >> "simulation") == "ItemMineDetector"}
     };
-    
+
     _return = _position;
     GVAR(customRightPanelButtons) set [_position, [_items apply {toLower _x}, _picture, _tooltip]];
 };

addons/arsenal/functions/fnc_buttonImport.sqf

@@ -25,10 +25,10 @@ if (GVAR(shiftState) && {is3DEN}) then {
 
     {
         if (
-                count _x == 2 && 
-                {_x select 0 isEqualType ""} && 
+                count _x == 2 &&
+                {_x select 0 isEqualType ""} &&
                 {_x select 0 != ""} &&
-                {_x select 1 isEqualType []} && 
+                {_x select 1 isEqualType []} &&
                 {count (_x select 1) == 10}
         ) then {
             _x call FUNC(addDefaultLoadout);

addons/arsenal/functions/fnc_fillLoadoutsList.sqf

@@ -38,7 +38,7 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
     {
         _x params ["_loadoutName", "_loadoutData"];
 
-        private _loadoutCachedInfo = _contentPanelCtrl getVariable (_loadoutName + str GVAR(currentLoadoutsTab)); 
+        private _loadoutCachedInfo = _contentPanelCtrl getVariable (_loadoutName + str GVAR(currentLoadoutsTab));
 
         if (isNil "_loadoutCachedInfo") then {
             [_loadoutData] call FUNC(verifyLoadout)

addons/arsenal/functions/fnc_handleStats.sqf

@@ -191,7 +191,6 @@ if (!isNil "_itemCfg") then {
             ] find GVAR(currentLeftPanel), true] call _handleStatsFnc;
         };
     } else {
-
         switch (GVAR(currentRightPanel)) do {
             case IDC_buttonOptic: {
                 [0, false] call _handleStatsFnc;
@@ -220,6 +219,11 @@ if (!isNil "_itemCfg") then {
             case IDC_buttonMisc: {
                 [7, false] call _handleStatsFnc;
             };
+            default {
+                if (GVAR(currentRightPanel) in [RIGHT_PANEL_CUSTOM_BUTTONS]) then {
+                    [7, false] call _handleStatsFnc;
+                };
+            };
         };
     };
 } else {

addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf

@@ -45,7 +45,7 @@ private _fnc_selectRight = {
 if (GVAR(currentLeftPanel) in [IDC_buttonUniform, IDC_buttonVest, IDC_buttonBackpack]) then {
 
     [
-        _item, 
+        _item,
         ["CfgWeapons", "CfgMagazines"] select (GVAR(currentRightPanel) in [IDC_buttonMag, IDC_buttonMagALL, IDC_buttonThrow, IDC_buttonPut])
     ] call _fnc_selectRight;
 };

addons/arsenal/functions/fnc_statTextStatement_mass.sqf

@@ -8,7 +8,7 @@
  * 1: item config path (CONFIG)
  *
  * Return Value:
- * String to display 
+ * String to display
  *
  * Public: No
 */

addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf

@@ -20,7 +20,7 @@ private _opticsModes = ("true" configClasses (_config >> "ItemInfo" >> "OpticsMo
     private _visionMode = getArray (_x >> "visionMode");
     [
         getNumber (_x >> "useModelOptics") == 1, //is in optics
-        _visionMode isEqualTo [], //optional NVG 
+        _visionMode isEqualTo [], //optional NVG
         "NVG" in _visionMode, //Integrated NVG
         "Ti" in _visionMode //Integrated Thermal
     ]

addons/arsenal/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\arsenal\script_component.hpp"
+#include "\z\ace\addons\arsenal\script_component.hpp"

addons/arsenal/stringtable.xml

@@ -422,6 +422,7 @@
             <Spanish>Ordenar por protección balística</Spanish>
             <Russian>Сортировка по баллистической защите</Russian>
             <Polish>Sortuj po ochronie balistycznej</Polish>
+            <German>Nach ballistischem Schutz sortieren</German>
         </Key>
         <Key ID="STR_ACE_Arsenal_sortByProtectionExplosive">
             <English>Sort by explosive protection</English>
@@ -430,6 +431,7 @@
             <Spanish>Ordenar por protección de explosivos</Spanish>
             <Russian>Сортировка по защите от взрывов</Russian>
             <Polish>Sortuj po ochronie przeciw wybuchom</Polish>
+            <German>Nach Explosionsschutz sortieren</German>
         </Key>
         <Key ID="STR_ACE_Arsenal_buttonShareTooltip">
             <English>Share or stop sharing the selected loadout</English>
@@ -1386,6 +1388,7 @@
             <Polish>Opoźnienie zapalnika</Polish>
             <Japanese>信管設定時間</Japanese>
             <Spanish>Tiempo de espoleta</Spanish>
+            <German>Detonationsverzögerung</German>
         </Key>
         <Key ID="STR_ACE_Arsenal_DetonatesOnImpact">
             <English>Detonates on impact</English>

addons/arsenal/ui/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\arsenal\script_component.hpp"
+#include "\z\ace\addons\arsenal\script_component.hpp"

addons/artillerytables/initSettings.sqf

@@ -1,5 +1,3 @@
-// CBA Settings [ADDON: ace_artillerytables]:
-
 private _categoryName = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"], LLSTRING(rangetable_displayName)];
 
 [

addons/atragmx/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\atragmx\script_component.hpp"
+#include "\z\ace\addons\atragmx\script_component.hpp"

addons/attach/functions/fnc_handleKilled.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 /*
  * Author: PabstMirror
- * Handles when vehicle or man is killed. 
+ * Handles when vehicle or man is killed.
  * Note: Runs where unit is local.
  *
  * Arguments:

addons/attach/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\attach\script_component.hpp"
+#include "\z\ace\addons\attach\script_component.hpp"

addons/backpacks/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\backpacks\script_component.hpp"
+#include "\z\ace\addons\backpacks\script_component.hpp"

addons/ballistics/CfgAmmo.hpp

@@ -280,7 +280,7 @@ class CfgAmmo {
     class B_762x51_Ball: BulletBase {
         airFriction=-0.00103711;
         tracerScale = 1.2; //0.6;
-        tracerStartTime=0.073;  // Based on the British L5A1 which burns out to 1000m 
+        tracerStartTime=0.073;  // Based on the British L5A1 which burns out to 1000m
         tracerEndTime=2.15957;  // Time in seconds calculated with ballistics calculator
         ACE_caliber=7.823;
         ACE_bulletLength=28.956;
@@ -365,20 +365,30 @@ class CfgAmmo {
         ACE_barrelLengths[]={330.2, 406.4, 508.0};
     };
     class ACE_762x51_Ball_Subsonic: B_762x51_Ball {
-        airFriction=-0.00060194;
-        caliber=1;
-        hit=6;
-        typicalSpeed=320;
-        ACE_caliber=7.823;
-        ACE_bulletLength=34.036;
-        ACE_bulletMass=12.96;
-        ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
-        ACE_ballisticCoefficients[]={0.235};
-        ACE_velocityBoundaries[]={};
-        ACE_standardAtmosphere="ICAO";
-        ACE_dragModel=7;
-        ACE_muzzleVelocities[]={305, 325, 335, 340};
-        ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
+        airFriction = -0.00060194;
+        caliber = 1;
+        hit = 6;
+        typicalSpeed = 320;
+        visibleFire = 1; // B_762x51_Ball: 3
+        audibleFire = 5; // B_762x51_Ball: 45
+        dangerRadiusBulletClose = 4; // B_762x51_Ball: 8
+        suppressionRadiusBulletClose = 2; // B_762x51_Ball: 6
+        ACE_caliber = 7.823;
+        ACE_bulletLength = 34.036;
+        ACE_bulletMass = 12.96;
+        ACE_ammoTempMuzzleVelocityShifts[] = {-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
+        ACE_ballisticCoefficients[] = {0.235};
+        ACE_velocityBoundaries[] = {};
+        ACE_standardAtmosphere = "ICAO";
+        ACE_dragModel = 7;
+        ACE_muzzleVelocities[] = {305, 325, 335, 340};
+        ACE_barrelLengths[] = {406.4, 508.0, 609.6, 660.4};
+        class CamShakeExplode {
+            power = 2.2360699; // B_762x51_Ball: 2.8284299
+            duration = 0.4; // B_762x51_Ball: 0.6
+            frequency = 20; // B_762x51_Ball: 20
+            distance = 6.7082; // B_762x51_Ball: 8.48528
+        };
     };
     class ACE_762x67_Ball_Mk248_Mod_0: B_762x51_Ball {
         airFriction=-0.00072468;

addons/ballistics/scripts/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\ballistics\script_component.hpp"
+#include "\z\ace\addons\ballistics\script_component.hpp"

addons/ballistics/stringtable.xml

@@ -2763,21 +2763,29 @@
             <English>6.5x47 mm 30Rnd Sand Mag (HPBT Scenar)</English>
             <Japanese>6.5x47 mm 30発入り サンド 弾倉 (HPBT Scenar)</Japanese>
             <French>Ch. 6,5x47 mm 30Cps Sable (HPBT Scenar)</French>
+            <German>6.5x47 mm 30-Patronen-Magazin Sandfarben (HPBT Scenar)</German>
+            <Polish>Magazynek 6.5x47 mm 30rd Piaskowy (HPBT Scenar)</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_msbs_mag_Name">
             <English>6.5x47 mm 30Rnd Promet Mag (HPBT Scenar)</English>
             <Japanese>6.5x47 mm 30発入り プロメット 弾倉 (HPBT Scenar)</Japanese>
             <French>Ch. 6,5x47 mm 30Cps Promet (HPBT Scenar)</French>
+            <German>6.5x47 mm 30-Patronen-Magazin für Promet (HPBT Scenar)</German>
+            <Polish>Magazynek 6.5x47 mm 30rd Promet (HPBT Scenar)</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_black_mag_Name">
             <English>6.5x47 mm 30Rnd Black Mag (HPBT Scenar)</English>
             <Japanese>6.5x47 mm 30発入り ブラック 弾倉 (HPBT Scenar)</Japanese>
             <French>Ch. 6,5x47 mm 30Cps Noir (HPBT Scenar)</French>
+            <German>6.5x47 mm 30-Patronen-Magazin Schwarz (HPBT Scenar)</German>
+            <Polish>Magazynek 6.5x47 mm 30rd Czarny (HPBT Scenar)</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_khaki_mag_Name">
             <English>6.5x47 mm 30Rnd Khaki Mag (HPBT Scenar)</English>
             <Japanese>6.5x47 mm 30発入り カーキ 弾倉 (HPBT Scenar)</Japanese>
             <French>Ch. 6,5x47 mm 30Cps Kaki (HPBT Scenar)</French>
+            <German>6.5x47 mm 30-Patronen-Magazin Khaki (HPBT Scenar)</German>
+            <Polish>Magazynek 6.5x47 mm 30rd Khaki (HPBT Scenar)</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_mag_NameShort">
             <English>6.5 mm Lapua</English>
@@ -2834,21 +2842,29 @@
             <English>6.5 mm Creedmor 30Rnd Sand Mag</English>
             <Japanese>6.5 mm クリードモア 30発入り サンド 弾倉</Japanese>
             <French>Ch. 6,5 mm Creedmor 30Cps Sable</French>
+            <German>6.5 mm Creedmor 30-Patronen-Magazin Sandfarben</German>
+            <Polish>Magazynek 6.5 mm Creedmor 30Rnd Piaskowy</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_msbs_mag_Name">
             <English>6.5 mm Creedmor 30Rnd Promet Mag</English>
             <Japanese>6.5 mm クリードモア 30発入り プロメット 弾倉</Japanese>
             <French>Ch. 6,5 mm Creedmor 30Cps Promet</French>
+            <German>6.5 mm Creedmor 30-Patronen-Magazin für Promet</German>
+            <Polish>Magazynek 6.5 mm Creedmor 30Rnd Promet</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_black_mag_Name">
             <English>6.5 mm Creedmor 30Rnd Black Mag</English>
             <Japanese>6.5 mm クリードモア 30発入り ブラック 弾倉</Japanese>
             <French>Ch. 6,5 mm Creedmor 30Cps Noir</French>
+            <German>6.5 mm Creedmor 30-Patronen-Magazin Schwarz</German>
+            <Polish>Magazynek 6.5 mm Creedmor 30Rnd Czarny</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_khaki_mag_Name">
             <English>6.5 mm Creedmor 30Rnd Khaki Mag</English>
             <Japanese>6.5 mm クリードモア 30発入り カーキ 弾倉</Japanese>
             <French>Ch. 6,5 mm Creedmor 30Cps Kaki</French>
+            <German>6.5 mm Creedmor 30-Patronen-Magazin Khaki</German>
+            <Polish>Magazynek 6.5 mm Creedmor 30Rnd Khaki</Polish>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_mag_NameShort">
             <English>6.5 mm CM</English>

addons/captives/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\captives\script_component.hpp"
+#include "\z\ace\addons\captives\script_component.hpp"

addons/cargo/CfgVehicles.hpp

@@ -426,12 +426,20 @@ class CfgVehicles {
     class Land_CanisterFuel_F: Items_base_F {
         GVAR(size) = 1;
         GVAR(canLoad) = 1;
+        EGVAR(cargo,noRename) = 1;
+    };
+
+    // Flexible Fuel tanks, 300L
+    class FlexibleTank_base_F: ThingX {
+        GVAR(size) = 3;
+        GVAR(canLoad) = 1;
     };
 
     // objects
     class RoadCone_F: ThingX {
         GVAR(size) = 1;
         GVAR(canLoad) = 1;
+        EGVAR(cargo,noRename) = 1;
     };
     class RoadBarrier_F: RoadCone_F {
         GVAR(size) = 2;
@@ -441,15 +449,18 @@ class CfgVehicles {
     class Land_PortableLight_single_F: Lamps_base_F {
         GVAR(size) = 2;
         GVAR(canLoad) = 1;
+        EGVAR(cargo,noRename) = 1;
     };
     class FloatingStructure_F;
     class Land_Camping_Light_F: FloatingStructure_F {
         GVAR(size) = 0.2;
         GVAR(canLoad) = 1;
+        EGVAR(cargo,noRename) = 1;
     };
     class Land_Camping_Light_off_F: ThingX {
         GVAR(size) = 0.2;
         GVAR(canLoad) = 1;
+        EGVAR(cargo,noRename) = 1;
     };
 
 

addons/cargo/XEH_postInit.sqf

@@ -101,8 +101,7 @@ GVAR(objectActions) = [
             {(_target getVariable [QGVAR(canLoad), getNumber (configOf _target >> QGVAR(canLoad))]) in [true, 1]} &&
             {alive _target} &&
             {[_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith)} &&
-            {!((typeOf _target) in ["ACE_Wheel", "ACE_Track"])} && // Exclude Wheel and Track
-            {!(_target iskindOf "Land_CanisterFuel_F")} // Exclude Fuel Canisters
+            {(getNumber ((configOf _target) >> QGVAR(noRename))) == 0}
         }
     ] call EFUNC(interact_menu,createAction),
     [QGVAR(load), localize LSTRING(loadObject), "a3\ui_f\data\IGUI\Cfg\Actions\loadVehicle_ca.paa",
@@ -153,3 +152,10 @@ private _objectClassesAddClassEH = call (uiNamespace getVariable [QGVAR(objectCl
 {
     [_x, "initPost", DFUNC(initObject), nil, nil, true] call CBA_fnc_addClassEventHandler;
 } forEach _objectClassesAddClassEH;
+
+if (isServer) then {
+    ["ace_placedInBodyBag", {
+        params ["_target", "_bodyBag"];
+        _bodyBag setVariable [QGVAR(customName), [_target, false, true] call EFUNC(common,getName), true];
+    }] call CBA_fnc_addEventHandler;
+};

addons/cargo/functions/fnc_unloadItem.sqf

@@ -56,7 +56,7 @@ if (_object isEqualType objNull) then {
 } else {
     _object = createVehicle [_item, _emptyPosAGL, [], 0, "NONE"];
     _object setPosASL (AGLtoASL _emptyPosAGL);
-    
+
     [QEGVAR(common,fixCollision), _object] call CBA_fnc_localEvent;
     [QEGVAR(common,fixPosition), _object] call CBA_fnc_localEvent;
 };

addons/cargo/stringtable.xml

@@ -38,30 +38,40 @@
             <Japanese>名前を次に変更:&lt;br/&gt;%1</Japanese>
             <French>Renommé en :&lt;br/&gt;%1</French>
             <Russian>Переименовано в:</Russian>
+            <German>Neu Bewaffnet: &lt;br/&gt;%1</German>
+            <Polish>Nazwa zmieniona na:&lt;br/&gt;%1</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_clearedCustomName">
             <English>Custom name has been cleared.</English>
             <Japanese>カスタム名が削除されました。</Japanese>
             <French>Le nom personnalisé a été supprimé.</French>
             <Russian>Пользовательское название удалено.</Russian>
+            <German>Eigener Name wurde gelöscht.</German>
+            <Polish>Własna nazwa została usunięta</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_renameObjectUI">
             <English>Set New Name:</English>
             <Japanese>新しい名前:</Japanese>
             <French>Définir un nouveau nom :</French>
             <Russian>Задать новое название:</Russian>
+            <German>Neuen Namen setzen:</German>
+            <Polish>Ustaw nową nazwę:</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_ModuleSettings_enableRename">
             <English>Enable Rename Action</English>
             <Japanese>名前変更を有効化</Japanese>
             <French>Possibilité de renommage</French>
             <Russian>Включить возможность переименования</Russian>
+            <German>Aktiviere Umbenennungs-Aktion</German>
+            <Polish>Włącz możliwość zmiany nazwy</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_ModuleSettings_enableRename_Description">
             <English>Enables the rename action for renamable objects.</English>
             <Japanese>名前変更が可能なオブジェクトに対して、名前変更動作を有効化します。</Japanese>
             <French>Active la possibilité de donner un nom personnalisé aux objets transportables (si renommables).</French>
             <Russian>Включает переименование для объектов, допускающих переименование.</Russian>
+            <German>Aktiviert die Umbenennungs-Aktion für neu benennbare Objekte.</German>
+            <Polish>Włącza akcję zmiany nazwy dla obiektów z możliwością zmiany nazwy.</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_openMenu">
             <English>Cargo</English>
@@ -273,12 +283,16 @@
             <English>Custom Name</English>
             <Japanese>カスタム名</Japanese>
             <French>Nom personnalisé</French>
+            <German>Eigener Name</German>
+            <Polish>Własna nazwa</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_customName_edenDesc">
             <English>Set a custom cargo name used in the cargo interface.</English>
             <Japanese>カーゴ欄で使われるカスタム名を設定します。</Japanese>
             <French>Définit un nom de fret personnalisé qui sera visible dans le menu de cargaison.</French>
             <Russian>Установить пользовательское имя груза, используемое в интерфейсе погрузки.</Russian>
+            <German>Definiere eigenen Frachtnamen, welcher im Frachtraum genutzt wird.</German>
+            <Polish>Ustaw własną nazwę ładunku, używaną w menu ładunku.</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_space_edenName">
             <English>Cargo Space</English>
@@ -434,6 +448,8 @@
             <Japanese>カーゴ メニューを再度開く</Japanese>
             <French>Rouvrir le menu de cargaison</French>
             <Russian>Переоткрыть меню погрузки</Russian>
+            <German>Frachtmenü erneut öffnen</German>
+            <Polish>Ponownie otwórz menu załadunku</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_openAfterUnload_description">
             <English>Reopen the Cargo Menu after successful unload.</English>
@@ -441,6 +457,8 @@
             <Japanese>カーゴを降ろした後に再びカーゴ メニューを開きます。</Japanese>
             <French>Réouvre le menu de cargaison après un déchargement réussi.</French>
             <Russian>Переоткрыть меню погрузки после успешной выгрузки.</Russian>
+            <German>Frachtmenü erneut öffnen, nach erfolgreichen Entladen.</German>
+            <Polish>Ponownie otwórz menu załadunku po udanym wyładowaniu.</Polish>
         </Key>
     </Package>
 </Project>

addons/chemlights/CfgAmmo.hpp

@@ -2,57 +2,57 @@
 class CfgAmmo {
 
     class Chemlight_base;
-    
+
     class Chemlight_Blue: Chemlight_base {
         timeToLive = 28800; // 8h as per cyalume website
     };
-    
+
     class Chemlight_Red: Chemlight_base {
         timeToLive = 43200; // 12h as per cyalume website
     };
-    
+
     class Chemlight_Green: Chemlight_base {
         timeToLive = 43200;
     };
-    
+
     class Chemlight_Yellow: Chemlight_base {
         timeToLive = 43200;
     };
-    
+
     class ACE_G_Chemlight_Orange: Chemlight_base {
         timeToLive = 43200;
         effectsSmoke = "ACE_ChemlightEffect_Orange";
         model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit";
     };
-    
+
     class ACE_G_Chemlight_Orange_Infinite: ACE_G_Chemlight_Orange {
         timeToLive = 1e10;
     };
-    
+
     class ACE_G_Chemlight_White: Chemlight_base {
         timeToLive = 28800;
         effectsSmoke = "ACE_ChemlightEffect_White";
         model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit";
     };
-    
+
     class ACE_G_Chemlight_White_Infinite: ACE_G_Chemlight_White {
         timeToLive = 1e10;
     };
-    
-    class ACE_G_Chemlight_HiRed: Chemlight_Red {     
+
+    class ACE_G_Chemlight_HiRed: Chemlight_Red {
         effectsSmoke = "ACE_ChemlightEffect_HiRed";
         timeToLive = 1800;
     };
-    
+
     class ACE_G_Chemlight_HiRed_Infinite: ACE_G_Chemlight_HiRed {
         timeToLive = 1e10;
     };
-    
+
     class ACE_G_Chemlight_HiYellow: Chemlight_Yellow {
         effectsSmoke = "ACE_ChemlightEffect_HiYellow";
         timeToLive = 1800;
     };
-    
+
     class ACE_G_Chemlight_HiYellow_Infinite: ACE_G_Chemlight_HiYellow {
         timeToLive = 1e10;
     };
@@ -88,7 +88,7 @@ class CfgAmmo {
         effectsSmoke = "ACE_ChemlightEffect_UltraHiOrange";
         timeToLive = 300;
     };
-    
+
     class ACE_G_Chemlight_UltraHiOrange_Infinite: ACE_G_Chemlight_UltraHiOrange {
         timeToLive = 1e10;
     };

addons/chemlights/CfgLights.hpp

@@ -99,7 +99,7 @@ class CfgLights {
 
     class ACE_ChemlightLight_UltraHiOrange: ACE_ChemlightLight_Orange {
         intensity = 12000;
-        
+
         ULTRA_HI_ATTENUATION
     };
 

addons/common/functions/fnc_cachedCall.sqf

@@ -40,7 +40,7 @@ if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then {
                     INFO_1("Clear cached variables on event: %1",_eventName);
                 #endif
                 // Get the list of caches to clear
-                //IGNORE_PRIVATE_WARNING ["_eventName"]; 
+                //IGNORE_PRIVATE_WARNING ["_eventName"];
                 // _eventName is defined on the function that calls the event
                 private _varName = format [QGVAR(clearCache_%1), _eventName];
                 private _cacheList = missionNamespace getVariable [_varName, []];

addons/common/functions/fnc_getTurretIndex.sqf

@@ -20,7 +20,7 @@ params [["_unit", objNull, [objNull]]];
 private _vehicle = vehicle _unit;
 if (_unit == _vehicle) exitWith {[]};
 
-scopeName "main"; 
+scopeName "main";
 
 {
     if (_unit == (_vehicle turretUnit _x)) then {_x breakOut "main"};

addons/common/functions/fnc_readSettingsFromParamsArray.sqf

@@ -47,7 +47,7 @@ TRACE_1("Reading missionConfigFile params",_paramsArray);
             case (_settingType == "CHECKBOX"): {
                 _settingValue = _settingValue > 0;
                 _validValue = [_settingName, _settingValue] call CBA_settings_fnc_check;
-            }; 
+            };
             // Will not Handle ARRAY,COLOR,STRING??? (bool/scalar covers most important settings)
         };
 

addons/common/initSettings.sqf

@@ -1,4 +1,5 @@
-private _category = localize LSTRING(ACEKeybindCategoryCommon);
+private _category = LLSTRING(ACEKeybindCategoryCommon);
+private _categoryColors = [_category, format ["| %1 |", LELSTRING(common,subcategory_colors)]];
 
 [
     QGVAR(checkPBOsAction),
@@ -49,7 +50,7 @@ private _category = localize LSTRING(ACEKeybindCategoryCommon);
     QGVAR(displayTextColor),
     "COLOR",
     [LSTRING(SettingDisplayTextColorName),LSTRING(SettingDisplayTextColorDesc)],
-    _category,
+    _categoryColors,
     [0, 0, 0, 0.1],
     0
 ] call CBA_fnc_addSetting;
@@ -58,7 +59,7 @@ private _category = localize LSTRING(ACEKeybindCategoryCommon);
     QGVAR(displayTextFontColor),
     "COLOR",
     [LSTRING(SettingDisplayTextFontColorName),LSTRING(SettingDisplayTextFontColorDesc)],
-    _category,
+    _categoryColors,
     [1, 1, 1, 1],
     0
 ] call CBA_fnc_addSetting;

addons/common/scripts/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\common\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"

addons/common/stringtable.xml

@@ -498,6 +498,7 @@
             <Japanese>プレイヤーが不正規の PBO を所持している場合の動作を決定します。</Japanese>
             <Spanish>Define la accion a tomar si un jugador no tiene el PBO correcto</Spanish>
             <Russian>Определяет, какое действие будет предпринято, если игрок не имеет корректные PBO.</Russian>
+            <German>Definiert, was passieren soll, wenn ein Spieler nicht die korrekten PBOs nutzt.</German>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBOsCheckAll">
             <English>Check PBO All</English>
@@ -523,6 +524,7 @@
             <Japanese>ACE のみならず、全てのアドオンを検査します。</Japanese>
             <Spanish>Comprueba todos los complementos, no sólo los de ACE</Spanish>
             <Russian>Проверять все аддоны, а не только ACE.</Russian>
+            <German>Überprüft alle Erweiterungen, nicht nur die von ACE.</German>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBOsWhitelist">
             <English>Check PBO Whitelist</English>
@@ -548,6 +550,7 @@
             <Japanese>許可するアドオンを定義します。</Japanese>
             <Spanish>Comprueba la lista de PBOs permitidos</Spanish>
             <Russian>Задать список непроверяемых аддонов.</Russian>
+            <German>Ermöglicht das Erstellen einer Liste von immer erlaubten Erweiterungen.</German>
         </Key>
         <Key ID="STR_ACE_Common_SettingFeedbackIconsName">
             <English>Feedback icons</English>
@@ -677,6 +680,18 @@
             <Chinese>設定ACE提示文字的顏色。若提示字體並無指定其他顏色，將會自動選用ACE系統的預設顏色</Chinese>
             <Chinesesimp>设定ACE提示文字的颜色。若提示字体并无指定其他颜色，将会自动选用ACE系统的预设颜色。</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Common_subcategory_colors">
+            <English>Colors</English>
+            <Czech>Barvy</Czech>
+            <French>Couleurs</French>
+            <German>Farben</German>
+            <Italian>Colori</Italian>
+            <Polish>Kolory</Polish>
+            <Portuguese>Cores</Portuguese>
+            <Russian>Цвета</Russian>
+            <Spanish>Colores</Spanish>
+            <Japanese>色</Japanese>
+        </Key>
         <Key ID="STR_ACE_Common_SettingPersistentLaserName">
             <English>Persistent weapon laserpointer/flashlight</English>
             <Russian>Автоматический ЛЦУ/тактический фонарь</Russian>
@@ -1281,6 +1296,9 @@
             <Chinesesimp>ACE 载具按键</Chinesesimp>
             <Turkish>ACE Araçlar</Turkish>
         </Key>
+        <Key ID="STR_ACE_Common_categoryUncategorized">
+            <English>ACE Uncategorized</English>
+        </Key>
         <Key ID="STR_ACE_Common_NoRoomToUnload">
             <English>No Room to unload</English>
             <German>Kein Platz zum Entladen</German>
@@ -1440,6 +1458,10 @@
             <Chinese>只限玩家</Chinese>
             <Turkish>Sadece oyuncular</Turkish>
         </Key>
+        <Key ID="STR_ACE_Common_aiOnly">
+            <English>AI only</English>
+            <Polish>Tylko dla AI</Polish>
+        </Key>
         <Key ID="STR_ACE_Common_playersAndAI">
             <English>Players and AI</English>
             <Russian>Игроков и ботов</Russian>
@@ -1469,6 +1491,7 @@
             <Czech>Zobrazit akci v menu vlastních interakcí</Czech>
             <Russian>Показывать действие в меню взаимодействия с собой.</Russian>
             <Turkish>Kendi etkileşimim menüsünde animasyonları göster</Turkish>
+            <German>Zeigt die Aktion im Selbstinteraktionsmenü</German>
         </Key>
         <Key ID="STR_ACE_Common_both">
             <English>Both</English>
@@ -1476,30 +1499,40 @@
             <Japanese>両方</Japanese>
             <French>Les deux</French>
             <Russian>Оба</Russian>
+            <German>Beide</German>
+            <Polish>Oba</Polish>
         </Key>
         <Key ID="STR_ACE_Common_progressBarInfoName">
             <English>Additional progress bar information</English>
             <Japanese>プログレス バー詳細情報</Japanese>
             <French>Infos supplémentaires de la barre de progression</French>
             <Russian>Дополнительная информация прогресс-бара</Russian>
+            <German>Zusätzliche Informationen beim Fortschrittsbalken</German>
+            <Polish>Dodatkowe informacje na pasku postępu </Polish>
         </Key>
         <Key ID="STR_ACE_Common_progressBarInfoDesc">
             <English>Controls extra information shown in progress bar.</English>
             <Japanese>プログレス バーへ表示される情報量を決定します。</Japanese>
             <French>Définit quelles informations supplémentaires sont affichées dans la barre de progression.</French>
             <Russian>Устанавливает дополнительную информацию в прогресс-баре.</Russian>
+            <German>Kontrolliert zusätzliche Informationen beim Fortschrittsbalkens</German>
+            <Polish>Kontroluje dodatkowe informacje na pasku postępu.</Polish>
         </Key>
         <Key ID="STR_ACE_Common_progressBarInfoPercentage">
             <English>Percentage</English>
             <Japanese>パーセンテージ</Japanese>
             <French>Pourcentage</French>
             <Russian>Процент выполнения</Russian>
+            <German>Prozent</German>
+            <Polish>Procent</Polish>
         </Key>
         <Key ID="STR_ACE_Common_progressBarInfoTime">
             <English>Time remaining</English>
             <Japanese>残り時間</Japanese>
             <French>Temps restant</French>
             <Russian>Времени осталось</Russian>
+            <German>Zeit verbleibend</German>
+            <Polish>Pozostały czas</Polish>
         </Key>
         <Key ID="STR_ACE_Common_None">
             <English>None</English>
@@ -1538,6 +1571,8 @@
             <Japanese>残り時間: %1 秒</Japanese>
             <French>Temps restant : %1 s</French>
             <Russian>Оставшееся время: %1s</Russian>
+            <German>Zeit übrig %1s</German>
+            <Polish>Pozostały czas: %1s</Polish>
         </Key>
         <Key ID="STR_ACE_Common_LocationsBoostTraining_DisplayName">
             <English>Locations Boost Training</English>

addons/concertina_wire/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\concertina_wire\script_component.hpp"
+#include "\z\ace\addons\concertina_wire\script_component.hpp"

addons/cookoff/XEH_postInit.sqf

@@ -13,7 +13,7 @@
 
 [QGVAR(cleanupEffects), {
     params ["_vehicle", ["_effects", []]];
-    
+
     _effects = _effects + (_vehicle getVariable [QGVAR(effects), []]);
     if !(_effects isEqualTo []) then {
          { deleteVehicle _x } count _effects;

addons/cookoff/functions/fnc_cookOff.sqf

@@ -16,16 +16,23 @@
  * Public: No
  */
 
-params ["_vehicle", "_intensity", ["_instigator", objNull], ["_smokeDelayEnabled", true], ["_ammoDetonationChance", 0], ["_detonateAfterCookoff", false], ["_fireSource", ""], ["_canRing", true]];
+params ["_vehicle", "_intensity", ["_instigator", objNull], ["_smokeDelayEnabled", true], ["_ammoDetonationChance", 0], ["_detonateAfterCookoff", false], ["_fireSource", ""], ["_canRing", true], ["_maxIntensity", MAX_COOKOFF_INTENSITY, [0]]];
 
 if (GVAR(enable) == 0) exitWith {};
 if !(GVAR(enableFire)) exitWith {};
+if (_vehicle getVariable [QGVAR(enable), GVAR(enable)] in [0, false]) exitWith {};
+// exit if cook-off enabled only for players and no players in vehicle crew found
+if (_vehicle getVariable [QGVAR(enable), GVAR(enable)] isEqualTo 1 && {fullCrew [_vehicle, "", false] findIf {isPlayer (_x select 0)} == -1}) exitWith {};
 
-TRACE_8("cooking off",_vehicle,_intensity,_instigator,_smokeDelayEnabled,_ammoDetonationChance,_detonateAfterCookoff,_fireSource,_canRing);
+
+TRACE_9("cooking off",_vehicle,_intensity,_instigator,_smokeDelayEnabled,_ammoDetonationChance,_detonateAfterCookoff,_fireSource,_canRing,_maxIntensity);
 
 if (_vehicle getVariable [QGVAR(isCookingOff), false]) exitWith {};
 _vehicle setVariable [QGVAR(isCookingOff), true, true];
 
+// limit maximum value of intensity to prevent very long cook-off times
+_intensity = _intensity min _maxIntensity;
+
 private _config = _vehicle call CBA_fnc_getObjectConfig;
 private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {!((_vehicle selectionPosition _x) isEqualTo [0,0,0])};
 
@@ -36,7 +43,7 @@ if (_positions isEqualTo []) then {
         if (_pos isEqualTo [0, 0, 0]) exitWith {};
         _positions pushBack _x;
     } forEach DEFAULT_COMMANDER_HATCHES;
-    
+
     if (_positions isEqualTo []) then {
         _positions pushBack "#noselection";
     };
@@ -61,15 +68,15 @@ if (_smokeDelayEnabled) then {
             [QGVAR(cleanupEffects), [_vehicle, _smokeEffects]] call CBA_fnc_globalEvent;
             _vehicle setVariable [QGVAR(isCookingOff), false, true];
             [_pfh] call CBA_fnc_removePerFrameHandler;
-            
+
             if (_detonateAfterCookoff) then {
                 _vehicle setDamage 1;
             };
         };
-        
+
         private _lastFlameTime = _vehicle getVariable [QGVAR(lastFlame), 0];
         private _nextFlameTime = _vehicle getVariable [QGVAR(nextFlame), 0];
-        
+
         // Wait until we are ready for the next flame
         // dt = Tcurrent - Tlast
         // dt >= Tnext
@@ -78,39 +85,39 @@ if (_smokeDelayEnabled) then {
             if (!_ring && _intensity >= 2) then {
                 _ring = (0.7 > random 1);
             };
-            
+
             if !(_canRing) then {
                 _ring = false;
             };
-        
+
             private _time = linearConversion [0, 10, _intensity, 3, 20] + random COOKOFF_TIME;
-            
+
             if (_fireSource isEqualTo "") then {
                 _fireSource = selectRandom _positions;
             };
-            
+
             [QGVAR(cookOffEffect), [_vehicle, true, _ring, _time, _fireSource]] call CBA_fnc_globalEvent;
-            
+
             _intensity = _intensity - (0.5 max random 1);
             _vehicle setVariable [QGVAR(intensity), _intensity];
             _vehicle setVariable [QGVAR(lastFlame), CBA_missionTime];
             _vehicle setVariable [QGVAR(nextFlame), _time + (MIN_TIME_BETWEEN_FLAMES max random MAX_TIME_BETWEEN_FLAMES)];
-            
+
             {
                 [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator]] call CBA_fnc_globalEvent;
             } forEach crew _vehicle
         };
-        
+
         if (_ammoDetonationChance > random 1) then {
             private _lastExplosiveDetonationTime = _vehicle getVariable [QGVAR(lastExplosiveDetonation), 0];
             private _nextExplosiveDetonation = _vehicle getVariable [QGVAR(nextExplosiveDetonation), 0];
-                        
+
             if ((CBA_missionTime - _lastExplosiveDetonationTime) > _nextExplosiveDetonation) then {
                 if (_fireSource isEqualTo "") then {
                     _fireSource = selectRandom _positions;
                 };
                 createVehicle ["ACE_ammoExplosionLarge", (_vehicle modelToWorld (_vehicle selectionPosition _fireSource)), [], 0 , "CAN_COLLIDE"];
-                
+
                 _vehicle setVariable [QGVAR(lastExplosiveDetonation), CBA_missionTime];
                 _vehicle setVariable [QGVAR(nextExplosiveDetonation), random 60];
             };

addons/cookoff/functions/fnc_cookOffEffect.sqf

@@ -33,7 +33,7 @@ if (isServer) then {
     // I dont think there is an alternative that takes into effect distance and whatever, but if you find one please fix!
     private _soundName = selectRandomWeighted [QGVAR(Sound_low), 0.1, QGVAR(Sound_mid), 0.25, QGVAR(Sound_high), 0.65];
     _sound = createSoundSource [_soundName, position _obj, [], 0];
-    
+
     if (_ring) then {
         private _intensity = 6;
         private _radius = 1.5 * ((boundingBoxReal _obj) select 2);
@@ -53,30 +53,30 @@ if (isServer) then {
     };
     private _factor = (1 + (_elapsedTime / 2) min 2);
     private _flameSize = 1.5;
-    
+
     if (_elapsedTime > (_time * (3 / 4))) then {
         _factor = _factor * linearConversion [_time * (3 / 4), _time, _elapsedTime, 1, 0.5];
     };
-    
+
     _light setLightBrightness 5 * (_factor / 5);
-    
+
     if (_jet) then {
         private _particlePosition = (_obj selectionPosition _fireSelection) vectorAdd [-0.1 + random 0.2, -0.1 + random 0.2, 0];
-    
+
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "",
             "Billboard",
             1,
-            (0.1 + (random 0.2)) * _factor, 
+            (0.1 + (random 0.2)) * _factor,
             _particlePosition,
-            [0, 0, 15 * (_factor / 2)], 
+            [0, 0, 15 * (_factor / 2)],
             0,
             10,
             7.9,
-            0.075, 
-            [1.25 * _factor, 2.5 * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            0.075,
+            [1.25 * _factor, 2.5 * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1],
             1,
             0,
@@ -84,102 +84,102 @@ if (isServer) then {
             "",
             _obj
         ];
-        
+
         // make flame push object into ground to make effect seem more "alive"
         if (!isGamePaused && { local _obj }) then {
             private _force = [0, 0, _factor * -(0.5 min random 1.5) * (0.3 min random 1)] vectorMultiply getMass _obj;
             _obj addForce [_force, vectorUpVisual _obj];
         };
     };
-    
+
     if (_ring) then {
         private _ringOrigin = (_obj selectionPosition _fireSelection) vectorAdd [-0.1 + random 0.2, -0.1 + random 0.2, -1];
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [0, 20 * (_factor / 2), 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [0, 20 * (_factor / 2), 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [0, -20 * (_factor / 2), 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [0, -20 * (_factor / 2), 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [20 * (_factor / 2), 0, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [20 * (_factor / 2), 0, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             [-0.1 + random 0.2, -0.1 + random 0.2, -1],
-            [-20 * (_factor / 2), 0, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [-20 * (_factor / 2), 0, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
 
         private _dir = 20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [_dir, _dir, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [_dir, _dir, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
-        
+
         _dir = -20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [_dir, _dir, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [_dir, _dir, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
-        
+
         _dir = 20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [_dir, -_dir, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [_dir, -_dir, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
-        
+
         _dir = 20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
-            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, 
+            "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [-_dir, _dir, 0], 
-            0, 10, 7.9, 0.075, 
-            [1.25 * _factor, _flameSize * _factor], 
-            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], 
+            [-_dir, _dir, 0],
+            0, 10, 7.9, 0.075,
+            [1.25 * _factor, _flameSize * _factor],
+            [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _obj
         ];
     };

addons/cookoff/functions/fnc_smoke.sqf

@@ -17,7 +17,7 @@
  */
 
 params ["_vehicle", ["_positions", []]];
- 
+
 private _turretConfig = [_vehicle, [0]] call CBA_fnc_getTurret;
 private _positionBarrelEnd = getText (_turretConfig >> "gunBeg");
 

addons/cookoff/initSettings.sqf

@@ -1,5 +1,3 @@
-// CBA Settings [ADDON: ace_cookoff]:
-
 [
     QGVAR(enable), "LIST",
     [LSTRING(enable_hd_name), LSTRING(enable_hd_tooltip)],

addons/cookoff/script_component.hpp

@@ -27,6 +27,7 @@
 #define MIN_TIME_BETWEEN_FLAMES 5
 #define MAX_TIME_BETWEEN_FLAMES 15
 #define MAX_TIME_BETWEEN_AMMO_DET 25
+#define MAX_COOKOFF_INTENSITY 10
 
 // Delay between flame effect for players in a cooking off vehicle
 #define FLAME_EFFECT_DELAY 0.4

addons/cookoff/stringtable.xml

@@ -165,12 +165,16 @@
             <Japanese>誘爆火災を有効化</Japanese>
             <French>Véhicules - Feu durant l'auto-inflammation</French>
             <Russian>Включить возгорание поеприпасов</Russian>
+            <German>Aktiviert das in Brand setzen des Fahrzeugs während des Durchzündens der Munition</German>
+            <Polish>Włącz pożar pojazdu podczas samozapłonu</Polish>
         </Key>
         <Key ID="STR_ACE_CookOff_enableFire_tooltip">
             <English>Whether or not vehicles will catch on fire during cook-off</English>
             <Japanese>誘爆により車両が炎上するかどうかを設定します。</Japanese>
             <French>Définit si les véhicules prennent feu durant l'auto-inflammation de leurs munitions.</French>
             <Russian>Будет ли техника возгораться при подрыве боеприпасов</Russian>
+            <German>Ob Fahrzeuge in Brand gesetzt werden, während deren Munition durchzündet.</German>
+            <Polish>Określa, czy pojazdy zapalą się podczas samozapłonu ich amunicji.</Polish>
         </Key>
     </Package>
 </Project>

addons/csw/CfgMagazineGroups.hpp

@@ -74,7 +74,7 @@ class GVAR(groups) {
         ACE_1Rnd_82mm_Mo_HE_LaserGuided = 1;
         8Rnd_82mm_Mo_LG = 1;
     };
-    
+
     // A3 Titans (Spike) - just use handheld magazines
     class Titan_AT {
         1Rnd_GAT_missiles = 1;

addons/csw/CfgMagazines.hpp

@@ -53,7 +53,7 @@ class CfgMagazines {
         mass = 50;
         ACE_isBelt = 1;
     };
-    
+
     class 40Rnd_20mm_G_belt;
     class GVAR(20Rnd_20mm_G_belt): 40Rnd_20mm_G_belt {
         author = ECSTRING(common,ACETeam);

addons/csw/initSettings.sqf

@@ -1,5 +1,3 @@
-// CBA Settings [ADDON: ace_csw]:
-
 private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
 
 [

addons/csw/stringtable.xml

@@ -410,6 +410,7 @@
             <Polish>[CSW] Statyczny karabin maszynowy M2 z tarczą</Polish>
             <Russian>[CSW] Станковый M2 со щитом</Russian>
             <Japanese>[CSW] 設置型 防盾付き M2</Japanese>
+            <German>[CSW] Statisches M2 mit Schild</German>
         </Key>
         <Key ID="STR_ACE_CSW_StaticAutoHMGBag_displayName">
             <English>[CSW] Static XM312 Gun (Autonomous)</English>

addons/dagr/CfgEventHandlers.hpp

@@ -15,4 +15,4 @@ class Extended_PostInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
     };
-};
+};

addons/dagr/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\dagr\script_component.hpp"
+#include "\z\ace\addons\dagr\script_component.hpp"

addons/disarming/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\disarming\script_component.hpp"
+#include "\z\ace\addons\disarming\script_component.hpp"

addons/dogtags/XEH_preInit.sqf

@@ -7,5 +7,5 @@ PREP_RECOMPILE_START;
 PREP_RECOMPILE_END;
 
 GVAR(disabledFactions) = [] call CBA_fnc_createNamespace;
-    
+
 ADDON = true;

addons/dragging/CfgMovesBasic.hpp

@@ -3,13 +3,13 @@ class CfgMovesBasic {
         ACE_dragWithPistol = "ace_dragging";
         ACE_dragWithRifle = "AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2";
     };
-    
+
     class Actions {
         class MoveWithInjuredManDragger;
         class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger {
             Up = "amovpercmstpsraswrfldnon";
         };
-        
+
         class MoveWithInjuredManDraggerPst;
         class ACE_MoveWithInjuredManDraggerPst: MoveWithInjuredManDraggerPst {
             Default = "ace_dragging_static";

addons/dragging/CfgVehicles.hpp

@@ -247,6 +247,15 @@ class CfgVehicles {
         GVAR(dragPosition)[] = {0,0.7,0};
     };
 
+    // Flexible Fuel tanks, 300L
+    class FlexibleTank_base_F: ThingX {
+        GVAR(canCarry) = 1;
+        GVAR(carryPosition)[] = {0,0.65,0};
+
+        GVAR(canDrag) = 1;
+        GVAR(dragPosition)[] = {0,1,0};
+    };
+
     // some terrain objects
 
     class Land_CampingTable_F: ThingX {

addons/dragging/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\dragging\script_component.hpp"
+#include "\z\ace\addons\dragging\script_component.hpp"

addons/dragging/stringtable.xml

@@ -60,6 +60,7 @@
             <Japanese>オブジェクトを運ぶ/離す</Japanese>
             <Turkish>Objeyi Taşı/Bırak</Turkish>
             <Spanish>Arrastrar/Soltar Objeto</Spanish>
+            <German>Objekt tragen/loslassen</German>
         </Key>
         <Key ID="STR_ACE_Dragging_UnableToDrag">
             <English>Item too heavy</English>

addons/dragon/CfgAmmo.hpp

@@ -34,7 +34,7 @@ class CfgAmmo {
         cost = 500;
         simulationStep = 0.005;
         maxControlRange = 1500;
-        
+
         EGVAR(vehicle_damage,incendiary) = 1.0;
 
         class ace_missileguidance {

addons/dragon/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\dragon\script_component.hpp"
+#include "\z\ace\addons\dragon\script_component.hpp"

addons/explosives/ACE_Triggers.hpp

@@ -56,7 +56,7 @@ class ACE_Triggers {
         isAttachable = 1;
         displayName = CSTRING(timerName);
         picture = QPATHTOF(data\UI\Timer.paa);
-        onPlace = QUOTE([ARR_2(_this select 1, _this select 3 select 0)] call FUNC(startTimer); false);
+        onPlace = QUOTE([ARR_4(_this select 1, _this select 3 select 0, nil, _this select 0)] call FUNC(startTimer); false);
         onSetup = QUOTE(_this call FUNC(openTimerUI));
     };
     class Tripwire {

addons/explosives/functions/fnc_dialPhone.sqf

@@ -38,6 +38,6 @@ if (_unit == ace_player) then {
             playSound3D [QUOTE(PATHTO_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_this select 1),3.16228,1,75];
             (_this select 0) setVariable [QGVAR(Dialing), false, true];
         }, [_unit,_explosive select 0], 0.25 * (count _arr - 4)] call CBA_fnc_waitAndExecute;
-        [_explosive select 0,(0.25 * (count _arr - 1)) + (_explosive select 2), "ACE_Cellphone"] call FUNC(startTimer);
+        [_explosive select 0,(0.25 * (count _arr - 1)) + (_explosive select 2), "ACE_Cellphone", _unit] call FUNC(startTimer);
     };
 };

addons/explosives/functions/fnc_startTimer.sqf

@@ -7,6 +7,7 @@
  * 0: Explosive <OBJECT>
  * 1: Time till detonate <NUMBER>
  * 2: Trigger classname <STRING> (default: "#timer")
+ * 3: Unit <OBJECT>
  *
  * Return Value:
  * None
@@ -17,13 +18,13 @@
  * Public: Yes
  */
 
-params ["_explosive", "_delay", ["_trigger", "#timer", [""]]];
-TRACE_3("Starting timer",_explosive,_delay,_trigger);
+params ["_explosive", "_delay", ["_trigger", "#timer", [""]], ["_unit", objNull, [objNull]]];
+TRACE_4("Starting timer",_explosive,_delay,_trigger,_unit);
 
 [{
-    params ["_explosive", "_trigger"];
+    params ["_explosive", "_trigger", "_unit"];
     TRACE_1("Explosive detonating from timer",_explosive);
     if (!isNull _explosive) then {
-        [_explosive, -1, [_explosive, 0], _trigger] call FUNC(detonateExplosive);
+        [_unit, -1, [_explosive, 0], _trigger] call FUNC(detonateExplosive);
     };
-}, [_explosive, _trigger], _delay] call CBA_fnc_waitAndExecute;
+}, [_explosive, _trigger, _unit], _delay] call CBA_fnc_waitAndExecute;

addons/explosives/stringtable.xml

@@ -1089,6 +1089,7 @@
             <Japanese>最短時間</Japanese>
             <Spanish>Tiempo mínimo</Spanish>
             <Polish>Minimalny czas</Polish>
+            <German>Minimale Zeit</German>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerMax_DisplayName">
             <English>Maximum Time</English>
@@ -1097,6 +1098,7 @@
             <Japanese>最長時間</Japanese>
             <Spanish>Tiempo máximo</Spanish>
             <Polish>Maksymalny czas</Polish>
+            <German>Maximale Zeit</German>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerDefault_DisplayName">
             <English>Default Time</English>
@@ -1105,6 +1107,7 @@
             <Japanese>標準時間</Japanese>
             <Spanish>Tiempo por defecto</Spanish>
             <Polish>Domyślny czas</Polish>
+            <German>Standardmäßige Zeit</German>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerMin_Description">
             <English>Minimum time value (in seconds) for the explosive timer.</English>
@@ -1113,6 +1116,7 @@
             <Japanese>起爆タイマーの最低時間 (秒) を設定します。</Japanese>
             <Spanish>Tiempo mínimo (en segundos) para el temporizador del explosivo.</Spanish>
             <Polish>Minimalna wartość czasomierza dla ładunku (w sekundach).</Polish>
+            <German>Minimale Zeit (in Sekunden) für den Zeitzünder.</German>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerMax_Description">
             <English>Maximum time value (in seconds) for the explosive timer.</English>
@@ -1121,6 +1125,7 @@
             <Japanese>起爆タイマーの最長時間 (秒) を設定します。</Japanese>
             <Spanish>Tiempo máximo (en segundos) para el temporizador del explosivo.</Spanish>
             <Polish>Maksymalna wartość czasomierza dla ładunku (w sekundach).</Polish>
+            <German>Maximale Zeit (in Sekunden) für den Zeitzünder.</German>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerDefault_Description">
             <English>Default time value (in seconds) for the explosive timer.</English>
@@ -1129,6 +1134,7 @@
             <Japanese>起爆タイマーの標準時間 (秒) を設定します。</Japanese>
             <Spanish>Tiempo por defecto (en segundos) para el temporizador del explosivo.</Spanish>
             <Polish>Domyślna wartość czasomierza dla ładunku (w sekundach).</Polish>
+            <German>Standardmäßige Zeit (in Sekunden) für den Zeitzünder.</German>
         </Key>
     </Package>
 </Project>

addons/fastroping/CfgSounds.hpp

@@ -9,4 +9,4 @@ class CfgSounds {
         sound[] = {QUOTE(PATHTOF(data\sounds\fastroping_thud.ogg)), 10, 1.0};
         titles[] = {};
     };
-};
+};

addons/fastroping/initSettings.sqf

@@ -1,6 +1,4 @@
-// CBA Settings [ADDON: ace_fastroping]:
-
-private _category = ["ACE Uncategorized", LLSTRING(setting_categoryMenu_displayName)];
+private _category = [LELSTRING(common,categoryUncategorized), LLSTRING(setting_categoryMenu_displayName)];
 
 [
     QGVAR(requireRopeItems), "CHECKBOX",

addons/fastroping/stringtable.xml

@@ -276,6 +276,7 @@
             <Turkish>Halatla Kayma</Turkish>
             <Czech>Slaňování</Czech>
             <Russian>Спуск по канату</Russian>
+            <German>Schnelles-Abseilen</German>
         </Key>
         <Key ID="STR_ACE_Fastroping_setting_requireRopeItems_displayName">
             <English>Require rope item to deploy</English>

addons/fcs/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\fcs\script_component.hpp"
+#include "\z\ace\addons\fcs\script_component.hpp"

addons/field_rations/RscTitles.hpp

@@ -12,15 +12,15 @@ class RscTitles {
         class controls {
             class Thirst: RscPicture {
                 idc = IDC_COLORED_HUD_THIRST;
-                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
-                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
+                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
+                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
                 w = 2 * GUI_GRID_W;
                 h = 2 * GUI_GRID_H;
                 text = QPATHTOF(ui\icon_hud_thirststatus.paa);
             };
             class Hunger: Thirst {
                 idc = IDC_COLORED_HUD_HUNGER;
-                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
+                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
                 text = QPATHTOF(ui\icon_hud_hungerstatus.paa);
             };
         };
@@ -35,23 +35,23 @@ class RscTitles {
         class controlsBackground {
             class Thirst: RscPicture {
                 idc = -1;
-                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
-                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
+                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
+                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
                 w = 2 * GUI_GRID_W;
                 h = 2 * GUI_GRID_H;
                 text = QPATHTOF(ui\icon_hud_thirststatus.paa);
                 colorText[] = {1, 1, 1, 0.2};
             };
             class Hunger: Thirst {
-                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
+                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
                 text = QPATHTOF(ui\icon_hud_hungerstatus.paa);
             };
         };
         class controls {
             class ThirstGroup: RscControlsGroupNoScrollbars {
                 idc = IDC_DRAINING_HUD_THIRST_GROUP;
-                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
-                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
+                x = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W];
+                y = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
                 w = 2 * GUI_GRID_W;
                 h = 2 * GUI_GRID_H;
                 class controls {
@@ -67,7 +67,7 @@ class RscTitles {
             };
             class HungerGroup: ThirstGroup {
                 idc = IDC_DRAINING_HUD_HUNGER_GROUP;
-                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
+                x = 2 * GUI_GRID_W + (profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),X)), safeZoneX + safeZoneW - 4.2 * GUI_GRID_W]);
                 class controls: controls {
                     class Icon: Icon {
                         idc = IDC_DRAINING_HUD_HUNGER_ICON;

addons/field_rations/functions/fnc_handleHUD.sqf

@@ -55,7 +55,7 @@ if (XGVAR(hudType) == 0) then {
     ];
 } else {
     // Reposition controls group and icon to create draining effect
-    private _defaultY = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,GVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
+    private _defaultY = profileNamespace getVariable [QUOTE(TRIPLES(IGUI,XGVAR(grid),Y)), safeZoneY + safeZoneH - 2.2 * GUI_GRID_H];
     {
         _x params ["_status", "_groupIDC", "_iconIDC"];
 

addons/field_rations/stringtable.xml

@@ -196,6 +196,7 @@
             <Polish>Akcje przy źrodle wody</Polish>
             <Turkish>Su Içme Animasyonu</Turkish>
             <Japanese>水源動作</Japanese>
+            <German>Wasserquellen-Aktionen</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_WaterSourceActions_Description">
             <English>Controls what actions are available on water sources.</English>
@@ -203,6 +204,7 @@
             <Polish>Kontroluje jakie akcje są dostępne przy źrodle wody.</Polish>
             <Turkish>Su içerken hangi animasyonu yapacağını belirler</Turkish>
             <Japanese>水源で可能な動作を設定します。</Japanese>
+            <German>Bestimmt, welche Aktionen an Wasserquellen verfügbar sind.</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_RefillOnly">
             <English>Refill Only</English>
@@ -210,6 +212,7 @@
             <Polish>Tylko napełnij</Polish>
             <Turkish>Sadece içeceği iç</Turkish>
             <Japanese>汲むだけ</Japanese>
+            <German>Nur Befüllen</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_TerrainObjectActions_DisplayName">
             <English>Terrain Object Actions</English>
@@ -217,6 +220,7 @@
             <Polish>Akcje Objektu terenu</Polish>
             <Turkish>Varsayılan Nesne Animasyonu</Turkish>
             <Japanese>マップ オブジェクト動作</Japanese>
+            <German>Geländeobjekt-Aktionen</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_TerrainObjectActions_Description">
             <English>Enables water source actions for terrain objects.</English>
@@ -224,6 +228,7 @@
             <Polish>Umożliwia akcje przy źrodle wody na obiektach terenu.</Polish>
             <Turkish>Varsayılan nesneler için animasyonu etkinleştir</Turkish>
             <Japanese>マップに存在するオブジェクトを水源として動作するよう設定できます。</Japanese>
+            <German>Aktiviert Wasserquellen-Aktionen für Geländeobjekte.</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_AffectAdvancedFatigue_DisplayName">
             <English>Affect Advanced Fatigue</English>
@@ -502,6 +507,7 @@
             <Polish>Picie z źródła </Polish>
             <Turkish>Mataradan Içiliyor...</Turkish>
             <Japanese>水源から飲んでいます・・・</Japanese>
+            <German>Trinke von Quelle...</German>
         </Key>
         <Key ID="STR_ACE_Field_Rations_WaterBottle_DisplayName">
             <English>Water Bottle</English>

addons/finger/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\finger\script_component.hpp"
+#include "\z\ace\addons\finger\script_component.hpp"

addons/fire/CfgSounds.hpp

@@ -6,7 +6,7 @@ class GVAR(DOUBLES(scream,no)) { \
     sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), db + 8, 1};\
     titles[] = {}; \
 }
-    
+
 class CfgSounds {
     CREATE_SCREAM(1);
     CREATE_SCREAM(2);

addons/fire/RscTitles.hpp

@@ -8,7 +8,7 @@ class RscTitles {
         fadeout = 0.75;
         name = QGVAR(onFire1);
         onload = QUOTE(with uiNamespace do {GVAR(onFireIndicator1) = _this select 0});
-        
+
         class controls {
             class GVAR(indicator): RscPicture {
                 idc = -1;
@@ -26,12 +26,12 @@ class RscTitles {
             };
         };
     };
-    
+
     class GVAR(onFire2): GVAR(onFire1) {
         idd = -1;
         name = QGVAR(onFire2);
         onload = QUOTE(with uiNamespace do {GVAR(onFireIndicator2) = _this select 0});
-        
+
         class controls: controls {
             class GVAR(indicator): GVAR(indicator) {
                 text = PATHTOF(data\overlay_burn_2.paa);

addons/fire/XEH_PREP.hpp

@@ -2,6 +2,7 @@ PREP(burn);
 PREP(isBurning);
 PREP(isPlant);
 PREP(burnIndicator);
+PREP(burnReaction);
 PREP(fireManagerPFH);
 
 PREP(medical_progress);

addons/fire/XEH_postInit.sqf

@@ -3,7 +3,10 @@
 [QGVAR(burn), FUNC(burn)] call CBA_fnc_addEventHandler;
 [QGVAR(playScream), {
     params ["_scream", "_source"];
-    _source say3D _scream;
+    // only play sound if enabled in settings
+    if (GVAR(enableScreams)) then {
+        _source say3D _scream;
+    };
 }] call CBA_fnc_addEventHandler;
 
 ["ace_settingsInitialized", {
@@ -22,7 +25,7 @@
 
             [GVAR(fireSources), _key, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]] call CBA_fnc_hashSet;
         }] call CBA_fnc_addEventHandler;
-        
+
         [QGVAR(removeFireSource), {
             params ["_key"];
             [GVAR(fireSources), _key] call CBA_fnc_hashRem;

addons/fire/functions/fnc_burn.sqf

@@ -37,13 +37,13 @@ if (_isBurning) exitWith {};
     // looped function
     (_this getVariable "params") params ["_unit", "", "_instigator"];
     private _unitPos = getPosASL _unit;
-    
+
     _intensity = _unit getVariable [QGVAR(intensity), 0];
-    
+
     if (surfaceIsWater _unitPos && {(_unitPos#2) < 1}) then {
         _intensity = 0;
     };
-    
+
     _fireParticle setDropInterval (0.01 max linearConversion [MAX_INTENSITY, MIN_INTENSITY, _intensity, 0.03, 0.1, false]);
     _fireParticle setParticleParams [
         ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 10, 32], // sprite sheet values
@@ -86,7 +86,7 @@ if (_isBurning) exitWith {};
         0, // random direction period
         0 // random direction intensity
     ];
-    
+
     _smokeParticle setParticleCircle [0, [0, 0, 0]];
     _smokeParticle setParticleRandom [
         0, // life time
@@ -124,18 +124,18 @@ if (_isBurning) exitWith {};
         _unit // particle source
     ];
     _smokeParticle setDropInterval 0.15;
-    
+
     _fireLight setLightBrightness ((_intensity * 3) / 10);
     _lightFlare setLightBrightness (_intensity / 30);
-    
+
     private _distanceToUnit = (_unit distance ace_player);
     _fireLight setLightAttenuation [1, 10 max (5 min (10 - _intensity)), 0, 15];
     _lightFlare setLightFlareSize (_intensity * (3 / 4)) * FLARE_SIZE_MODIFIER;
-    
+
     if (!GVAR(enableFlare)) then {
         _lightFlare setLightFlareSize 0;
     };
-    
+
     // always keep flare visible to perceiving unit as long as it isnt the player
     if !(_unit isEqualTo ace_player) then {
         private _relativeAttachPoint = [0, 0, 0.3];
@@ -145,14 +145,14 @@ if (_isBurning) exitWith {};
         };
         _lightFlare attachTo [_unit, _relativeAttachPoint];
     };
-    
+
     if (!isGamePaused) then {
         // If the unit goes to spectator alive _unit == true and they will be on fire and still take damage
         // Only workaround I could think of, kinda clunky
         if (_isThisUnitAlive) then {
             _isThisUnitAlive = (alive _unit) && { getNumber ((configOf _unit) >> "isPlayableLogic") != 1 };
         };
-    
+
         // propagate fire
         if ((CBA_missionTime - _lastPropogateUpdate) >= BURN_PROPOGATE_UPDATE) then {
             _lastPropogateUpdate = CBA_missionTime;
@@ -178,7 +178,7 @@ if (_isBurning) exitWith {};
                 };
             };
         };
-    
+
         // update intensity/fire reactions
         if ((CBA_missionTime - _lastIntensityUpdate) >= INTENSITY_UPDATE) then {
             _lastIntensityUpdate = CBA_missionTime;
@@ -203,7 +203,7 @@ if (_isBurning) exitWith {};
                             } else {
                                 private _group = (group _unit);
                                 private _vehicle = vehicle _unit;
-                                
+
                                 if (_vehicle != _unit) then {
                                     TRACE_1("Ejecting", _unit);
                                     _unit leaveVehicle _vehicle;
@@ -227,16 +227,10 @@ if (_isBurning) exitWith {};
                                 _intensity = _intensity - (1 / _intensity);
                             };
                         };
-                    
-                        if ((_unit isEqualTo vehicle _unit) && { !(currentWeapon _unit isEqualTo "") }) then {
-                            [_unit] call EFUNC(hitreactions,throwWeapon);
-                        };
-                        
-                        private _soundID = floor (1 + random 15);
-                        private _sound = format [QGVAR(scream_%1), _soundID];
-                        [QGVAR(playScream), [_sound, _unit]] call CBA_fnc_globalEvent;
+
+                        [_unit] call FUNC(burnReaction);
                     };
-                    
+
                     // Common burn areas are the hands and face https://www.ncbi.nlm.nih.gov/pubmed/16899341/
                     private _woundSelection = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] selectRandomWeighted [0.77, 0.5, 0.8, 0.8, 0.3, 0.3];
                     if (GET_PAIN_PERCEIVED(_unit) < (PAIN_UNCONSCIOUS + random 0.2)) then {
@@ -249,7 +243,7 @@ if (_isBurning) exitWith {};
                 _unit setVariable [QGVAR(intensity), _intensity, true]; // globally sync intensity across all clients to make sure simulation is deterministic
             };
         };
-        
+
         private _burnIndicatorPFH = _unit getVariable [QGVAR(burnUIPFH), -1];
         if (_unit isEqualTo ace_player && { _isThisUnitAlive } && { _burnIndicatorPFH < 0 }) then {
             _burnIndicatorPFH = [FUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
@@ -261,30 +255,30 @@ if (_isBurning) exitWith {};
     // init function
     private _params = _this getVariable "params";
     _params params ["_unit", "_startingIntensity"];
-    
+
     _intensity = _startingIntensity;
     private _unitPos = getPos _unit;
-    
+
     _fireParticle = "#particlesource" createVehicleLocal _unitPos;
     _fireParticle attachTo [_unit, [0, 0, 0]];
     _fireParticle setDropInterval 0.03;
-    
+
     _smokeParticle = "#particlesource" createVehicleLocal _unitPos;
-    
+
     _fireLight = "#lightpoint" createVehicleLocal _unitPos;
     _fireLight setLightIntensity 0;
     _fireLight setLightAmbient [0.8, 0.6, 0.2];
     _fireLight setLightColor [1, 0.5, 0.4];
     _fireLight attachTo [_unit, [0, 0, 0]];
     _fireLight setLightDayLight false;
-    
+
     _lightFlare = "#lightpoint" createVehicleLocal _unitPos;
     _lightFlare setLightIntensity 0;
     _lightFlare setLightColor [1, 0.8, 0.8];
     _lightFlare setLightUseFlare true;
     _lightFlare setLightFlareMaxDistance 100;
     _lightFlare setLightFlareSize 0;
-    
+
     if !(_unit isEqualTo ace_player) then {
         private _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ace_player))) vectorMultiply 1;
         _relativeAttachPoint set [2, 0.5];
@@ -292,30 +286,28 @@ if (_isBurning) exitWith {};
     } else {
         _lightFlare attachTo [_unit, [0, 0, 0.3]];
     };
-    
+
     if (isServer) then {
         _fireSound = createSoundSource ["Sound_Fire", _unitPos, [], 0];
         _fireSound attachTo [_unit, [0, 0, 0], "destructionEffect1"];
     };
-    
+
     _unit setVariable [QGVAR(burning), true];
     _unit setVariable [QGVAR(intensity), _intensity];
     _unit setVariable [QGVAR(burnUIPFH), -1];
-    
+
     if (local _unit) then {
         if (_unit isEqualTo ace_player) then {
             private _burnIndicatorPFH = [FUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
             _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
         };
-        
-        private _soundID = floor (1 + random 15);
-        private _sound = format [QGVAR(scream_%1), _soundID];
-        [QGVAR(playScream), [_sound, _unit]] call CBA_fnc_globalEvent;
+
+        [_unit, false] call FUNC(burnReaction);
     };
-    
+
     _lastIntensityUpdate = 0;
     _lastPropogateUpdate = 0;
-    
+
     _isThisUnitAlive = true;
 }, {
     (_this getVariable "params") params ["_unit"];
@@ -326,7 +318,7 @@ if (_isBurning) exitWith {};
     deleteVehicle _fireLight;
     deleteVehicle _lightFlare;
     deleteVehicle _fireSound;
-    
+
     if (local _unit) then {
         if (!isPlayer _unit) then {
             _unit setUnitPos "AUTO";
@@ -340,9 +332,9 @@ if (_isBurning) exitWith {};
 }, {
     // exit condition
     (_this getVariable "params") params ["_unit"];
-    
+
     private _unitAlive = (alive _unit) && { getNumber ((configOf _unit) >> "isPlayableLogic") != 1 };
     private _unitIsUnit = { (_unit != vehicle _unit) && { isNull vehicle _unit } };
-    
+
     !_unitAlive || _unitIsUnit || { _intensity <= MIN_INTENSITY } || { !([_unit] call FUNC(isBurning)) }
 }, ["_intensity", "_fireParticle", "_smokeParticle", "_fireLight", "_fireSound", "_lightFlare", "_lastIntensityUpdate", "_lastPropogateUpdate", "_isThisUnitAlive"]] call CBA_fnc_createPerFrameHandlerObject;

addons/fire/functions/fnc_burnReaction.sqf

@@ -0,0 +1,31 @@
+#include "script_component.hpp"
+/*
+ * Author: Brandon (TCVM), veteran29
+ * Handles burning reactions of an unit, like screaming or throwing the weapons away due to pain.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Should unit throw its current weapon <BOOL>
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+
+params ["_unit", ["_throwWeapon", true]];
+
+if (
+    _throwWeapon
+    && {GVAR(dropWeapon) > 0}
+    && {_unit in _unit && { !(currentWeapon _unit isEqualTo "") }}
+    && {!isPlayer _unit || GVAR(dropWeapon >= 2)}
+) then {
+    [_unit] call EFUNC(hitreactions,throwWeapon);
+};
+
+if (_unit isKindOf "CAManBase") then {
+    private _soundID = floor (1 + random 15);
+    private _sound = format [QGVAR(scream_%1), _soundID];
+    [QGVAR(playScream), [_sound, _unit]] call CBA_fnc_globalEvent;
+};

addons/fire/functions/fnc_fireManagerPFH.sqf

@@ -31,7 +31,7 @@ params ["_args", "_handle"];
     if !(_attachedObject isEqualTo objNull) then {
         _sourcePos = getPosATL _attachedObject;
     };
-    
+
     private _nearEntities = _sourcePos nearEntities ["Man", _radius];
     {
         private _burning = [_x] call FUNC(isBurning);

addons/fire/initSettings.sqf

@@ -1,19 +1,40 @@
 [
     QGVAR(enabled), "CHECKBOX",
-    ["STR_A3_OPTIONS_ENABLED", LSTRING(setting_description)],
-    LSTRING(category_displayName),
+    ["STR_A3_OPTIONS_ENABLED", LSTRING(Setting_Description)],
+    LSTRING(Category_DisplayName),
     true, // default value
     true, // isGlobal
     {[QGVAR(fireEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableFlare), "CHECKBOX",
-    [LSTRING(setting_flareEnable), LSTRING(setting_flareDescription)],
-    LSTRING(category_displayName),
+    [LSTRING(Setting_FlareEnable), LSTRING(Setting_FlareDescription)],
+    LSTRING(Category_DisplayName),
     false, // default value
     true, // isGlobal
     {[QGVAR(flareEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(dropWeapon), "LIST",
+    [LSTRING(Setting_DropWeapon), LSTRING(Setting_DropWeapon_Description)],
+    LSTRING(Category_DisplayName),
+    [
+        [0,1,2],
+        [localize "STR_A3_OPTIONS_DISABLED", ELSTRING(common,aiOnly), ELSTRING(common,playersAndAI)],
+        1
+    ],
+    true // isGlobal
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(enableScreams), "CHECKBOX",
+    [LSTRING(Setting_EnableScreams), LSTRING(Setting_EnableScreams_Description)],
+    LSTRING(Category_DisplayName),
+    true,
+    false // isGlobal
+] call CBA_fnc_addSetting;
+

addons/fire/stringtable.xml

@@ -1,41 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Fire">
-        <Key ID="STR_ACE_Fire_category_displayName">
+        <Key ID="STR_ACE_Fire_Category_DisplayName">
             <English>ACE Fire</English>
             <Japanese>ACE 火災</Japanese>
             <French>ACE Feu</French>
             <Russian>ACE Возгорание</Russian>
+            <German>ACE Feuer</German>
+            <Polish>ACE Ogień</Polish>
         </Key>
         <Key ID="STR_ACE_Fire_Actions_PatDown">
             <English>Pat Down Fire</English>
             <Japanese>火を叩き消す</Japanese>
             <French>Éteindre le feu</French>
             <Russian>Потушить</Russian>
+            <German>Feuer löschen</German>
+            <Polish>Zgaś ogień</Polish>
         </Key>
         <Key ID="STR_ACE_Fire_Actions_PerformingPatDown">
             <English>Patting Down Fire</English>
             <Japanese>火を叩き消しています</Japanese>
             <French>Feu en cours d'extinction...</French>
             <Russian>Тушение</Russian>
+            <German>Feuer wird gelöscht...</German>
+            <Polish>Gaszenie ognia</Polish>
         </Key>
-        <Key ID="STR_ACE_Fire_setting_description">
+        <Key ID="STR_ACE_Fire_Setting_Description">
             <English>Allow units to catch fire</English>
             <Japanese>ユニットへ着火を許可</Japanese>
             <French>Définit si les unités peuvent prendre feu ou non.</French>
             <Russian>Включает возгорание</Russian>
+            <German>Erlaubt, dass Einheiten Feuer fangen können</German>
+            <Polish>Zezwól jednostkom na zapalenie się</Polish>
         </Key>
-        <Key ID="STR_ACE_Fire_setting_flareEnable">
+        <Key ID="STR_ACE_Fire_Setting_FlareEnable">
             <English>Enable fire-flare at night</English>
             <Japanese>夜間にフレア効果を有効化</Japanese>
             <French>Halo lumineux la nuit</French>
             <Russian>Включает сверкание пламени</Russian>
+            <German>Aktiviert Feuerschein bei Nacht.</German>
+            <Polish>Włącza efekt flary od ognia w nocy</Polish>
         </Key>
-        <Key ID="STR_ACE_Fire_setting_flareDescription">
+        <Key ID="STR_ACE_Fire_Setting_FlareDescription">
             <English>Uses a flare effect to increase fire intensity at night</English>
             <Japanese>夜間に火災の強さを上昇させるフレア効果を有効化します。</Japanese>
             <French>Ajoute un effet de halo lumineux afin d'accroitre l'intensité du feu durant la nuit.</French>
             <Russian>Включает ореол пламени для большей интенсивности ночью</Russian>
+            <German>Benutzt einen Feuerschein-Effekt um die Intensität des Feuers bei Nacht zu verstärken.</German>
+            <Polish>Używa efektu flary, aby zwiększyć jasność w nocy</Polish>
+        </Key>
+        <Key ID="STR_ACE_Fire_Setting_EnableScreams">
+            <English>Enable screams by units on fire</English>
+        </Key>
+        <Key ID="STR_ACE_Fire_Setting_EnableScreams_Description">
+            <English>Enables if units on fire will play the screaming sound</English>
+        </Key>
+        <Key ID="STR_ACE_Fire_Setting_DropWeapon">
+            <English>Drop Weapons When on Fire</English>
+            <Polish>Włącz wyrzucanie broni podczas płonięcia</Polish>
+        </Key>
+        <Key ID="STR_ACE_Fire_Setting_DropWeapon_Description">
+            <English>Controls whether units drop their weapons when on fire.</English>
+            <Polish>Powoduje że jednostki wyrzucają swoją broń gdy płoną.</Polish>
         </Key>
     </Package>
 </Project>

addons/flashlights/XEH_postInitClient.sqf

@@ -5,4 +5,4 @@ if (!hasInterface) exitWith {};
 
 LOG(MSG_INIT);
 
-//todo: make flashlights attachable to players
+//todo: make flashlights attachable to players

addons/fortify/XEH_PREP.hpp

@@ -15,3 +15,4 @@ ACEX_PREP(getPlaceableSet);
 ACEX_PREP(modifyAction);
 ACEX_PREP(setupModule);
 ACEX_PREP(buildLocationModule);
+ACEX_PREP(createObjectMarker);

addons/fortify/XEH_postInit.sqf

@@ -7,6 +7,15 @@ if (isServer) then {
         TRACE_3("objectPlaced",_unit,_side,_object);
         private _jipID = [QGVAR(addActionToObject), [_side, _object]] call CBA_fnc_globalEventJIP;
         [_jipID, _object] call CBA_fnc_removeGlobalEventJIP; // idealy this function should be called on the server
+
+        if (GVAR(markObjectsOnMap) isNotEqualTo 0 && {_object isKindOf "Static"}) then {
+            // Wait ensures correct marker pos/rot as object is moved into position after creation
+            [
+                FUNC(createObjectMarker),
+                [_unit, _object],
+                1
+            ] call CBA_fnc_waitAndExecute;
+        };
     }] call CBA_fnc_addEventHandler;
 };
 
@@ -63,3 +72,32 @@ GVAR(objectRotationZ) = 0;
         [_object, 0, ["ACE_MainActions"], _removeAction] call EFUNC(interact_menu,addActionToObject);
     };
 }] call CBA_fnc_addEventHandler;
+
+// Place object event handler
+[QGVAR(deployFinished), {
+    params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
+    _args params ["_unit", "_side", "_typeOf", "_posASL", "_vectorDir", "_vectorUp"];
+
+    private _newObject = _typeOf createVehicle _posASL;
+    _newObject setPosASL _posASL;
+    _newObject setVectorDirAndUp [_vectorDir, _vectorUp];
+
+    // Server will use this event to run the jip compatible QGVAR(addActionToObject) event and create the related map marker
+    [QXGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent;
+
+    if (cba_events_control) then {
+        // Re-run if ctrl key held
+        [_unit, _unit, [_side, _typeOf, [GVAR(objectRotationX), GVAR(objectRotationY), GVAR(objectRotationZ)]]] call FUNC(deployObject);
+    };
+
+    // Reset animation
+    [_unit, "", 1] call EFUNC(common,doAnimation);
+}] call CBA_fnc_addEventHandler;
+
+[QGVAR(deployCanceled), {
+    params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
+    _args params ["_unit", "_side", "_typeOf", "_posASL", "_vectorDir", "_vectorUp"];
+
+    // Reset animation
+    [_unit, "", 1] call EFUNC(common,doAnimation);
+}] call CBA_fnc_addEventHandler;

addons/fortify/functions/fnc_createObjectMarker.sqf

@@ -0,0 +1,48 @@
+#include "script_component.hpp"
+/*
+ * Author: Seb
+ * Creates a map marker for a created static object but only for sides friendly to the creator side.
+ *
+ * Arguments:
+ * 0: Unit placing <OBJECT>
+ * 1: Created fortify object <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, cursorObject] call ace_fortify_fnc_createObjectMarker
+ *
+ * Public: No
+ */
+
+params ["_unit", "_object"];
+TRACE_2("createObjectMarker",_unit,_object);
+
+// Get Object size and direction
+private _bbr = 0 boundingBoxReal _object;
+private _p1 = _bbr select 0;
+private _p2 = _bbr select 1;
+private _maxWidth = abs ((_p2 select 0) - (_p1 select 0));
+private _maxLength = abs ((_p2 select 1) - (_p1 select 1));
+private _direction = getDir _object;
+
+// Marker name unique to this object
+private _markerNameStr = format [QGVAR(marker_%1), hashValue _object];
+private _channel = if (GVAR(markObjectsOnMap) == 2) then { 0 } else { 1 };
+
+private _marker = createMarkerLocal [_markerNameStr, _object, _channel, _unit];
+TRACE_2("created",_marker,_channel);
+_marker setMarkerShapeLocal "RECTANGLE";
+_marker setMarkerBrushLocal "SolidFull";
+_marker setMarkerSizeLocal [(_maxWidth / 2),(_maxLength / 2)];
+_marker setMarkerDirLocal _direction;
+_marker setMarkerColor "ColorGrey";
+_object setVariable [QGVAR(mapMarker), _marker, false];
+
+_object addEventHandler ["Deleted", {
+    params ["_object"];
+    private _marker = _object getVariable QGVAR(mapMarker);
+    TRACE_2("cleaning up marker",_object,_marker);
+    deleteMarker _marker
+}];

addons/fortify/functions/fnc_deployConfirm.sqf

@@ -30,14 +30,29 @@ private _vectorDir = vectorDir _object;
 
 deleteVehicle _object;
 
-private _newObject = _typeOf createVehicle _posASL;
-_newObject setPosASL _posASL;
-_newObject setVectorDirAndUp [_vectorDir, _vectorUp];
+// Create progress bar to place object
+private _totalTime = _cost * GVAR(timeCostCoefficient) + GVAR(timeMin); // time = Ax + b
 
-// Server will use this event to run the jip compatible QGVAR(addActionToObject) event
-[QXGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent;
+private _perframeCheck = {
+    params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
+    _args params ["_unit", "_side", "_typeOf", "_posASL", "_vectorDir", "_vectorUp"];
 
-if (cba_events_control) then {
-    // Re-run if ctrl key held
-    [_unit, _unit, [_side, _typeOf, [GVAR(objectRotationX), GVAR(objectRotationY), GVAR(objectRotationZ)]]] call FUNC(deployObject);
+    // Animation loop (required for longer constructions)
+    if (animationState _unit isNotEqualTo "AinvPknlMstpSnonWnonDnon_medic4") then {
+        // Perform animation
+        [_unit, "AinvPknlMstpSnonWnonDnon_medic4"] call EFUNC(common,doAnimation);
+    };
+
+    // Return true always
+    true
 };
+
+[
+    _totalTime,
+    [_unit, _side, _typeOf, _posASL, _vectorDir, _vectorUp],
+    QGVAR(deployFinished),
+    QGVAR(deployCanceled),
+    LLSTRING(progressBarTitle),
+    _perframeCheck
+] call EFUNC(common,progressBar);
+

addons/fortify/initSettings.sqf

@@ -9,3 +9,36 @@
         2
     ]
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(timeCostCoefficient),
+    "SLIDER",
+    [LLSTRING(settingHint_timeCostCoefficient), LLSTRING(settingHintDesc_timeCostCoefficient)],
+    LLSTRING(settingsCategory),
+    [0, 10, 1, 2], // Min, Max, Default, Trailing Decimals, is Percentage
+    true //isGlobal
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(timeMin),
+    "SLIDER",
+    [LLSTRING(settingHint_timeMin), LLSTRING(settingHintDesc_timeMin)],
+    LLSTRING(settingsCategory),
+    [0, 25, 1.5, 2], // Min, Max, Default, Trailing Decimals, is Percentage
+    true //isGlobal
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(markObjectsOnMap),
+    "LIST",
+    [LLSTRING(markObjectsOnMap), LLSTRING(markObjectsOnMapDesc)],
+    LLSTRING(settingsCategory),
+    [
+        [0, 1, 2],
+        [LLSTRING(markObjectsOnMapNone), LLSTRING(markObjectsOnMapFriendly), LLSTRING(markObjectsOnMapEveryone)],
+        1
+    ],
+    true,
+    {},
+    true
+] call CBA_fnc_addSetting;

addons/fortify/stringtable.xml

@@ -51,6 +51,7 @@
             <Russian>Инициализирует систему фортификации с некоторыми базовыми параметрами.&lt;br/&gt;Предустановки взяты из configFile и missionConfigFile, формат смотри на wiki.</Russian>
             <Turkish>Inşa etme sistemini bazı temel parametrelerle başlatır. &lt;br/&gt; Ön ayarlar configFile ve missionConfigFile'dan alınır, format için wiki'ye bakın.</Turkish>
             <Japanese>要塞システムを初期設定に戻します。&lt;br/&gt;プリセットは configfile と missionConfigFile から参照されます。詳細は wiki を参照してください。</Japanese>
+            <German>Initialisiert das Verstärken-System, mit grundlegenden Einstellungen &lt;br/&gt;Vorseinstellungen werden aus der configFile und der missionConfigFile gezogen, für mehr Informationen: siehe das ACE Wiki.</German>
         </Key>
         <Key ID="STR_ACE_Fortify_rotate">
             <English>Rotate</English>
@@ -156,12 +157,69 @@
             <Russian>Показывать всегда</Russian>
             <Turkish>Her Zaman Göster</Turkish>
         </Key>
+        <Key ID="STR_ACE_Fortify_settingHint_timeCostCoefficient">
+            <English>Time-Cost Coefficient</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_settingHintDesc_timeCostCoefficient">
+            <English>Coefficient used to determine time to build structure.&lt;br/&gt;A in Ax + b where x is cost of object</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_settingHint_timeMin">
+            <English>Minimum Build Time</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_settingHintDesc_timeMin">
+            <English>Minimum time to build any structure.&lt;br/&gt;b in Ax + b where x is cost of object</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_progressBarTitle">
+            <English>Building</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_markObjectsOnMap">
+            <English>Create map markers</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_markObjectsOnMapDesc">
+            <English>Create map markers that look like terrain buildings when static fortifications are placed</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_markObjectsOnMapNone">
+            <English>Never</English>
+            <Czech>Nikdy</Czech>
+            <German>Nie</German>
+            <Russian>Никогда</Russian>
+            <Polish>Nigdy</Polish>
+            <Italian>Mai</Italian>
+            <Spanish>Nunca</Spanish>
+            <French>Jamais</French>
+            <Chinese>永不</Chinese>
+            <Japanese>なし</Japanese>
+            <Korean>항상 안 함</Korean>
+            <Portuguese>Nunca</Portuguese>
+            <Chinesesimp>永不</Chinesesimp>
+            <Turkish>Asla</Turkish>
+        </Key>
+        <Key ID="STR_ACE_Fortify_markObjectsOnMapFriendly">
+            <English>For units friendly to the placer</English>
+        </Key>
+        <Key ID="STR_ACE_Fortify_markObjectsOnMapEveryone">
+            <English>For everyone</English>
+            <Chinese>所有人</Chinese>
+            <French>Pour tous</French>
+            <Spanish>Para todos</Spanish>
+            <Italian>Per tutti</Italian>
+            <Polish>Dla wszystkich</Polish>
+            <Russian>Для всех</Russian>
+            <German>Für alle</German>
+            <Czech>Pro všechny</Czech>
+            <Portuguese>Para todos</Portuguese>
+            <Korean>모든 사람</Korean>
+            <Chinesesimp>针对每一个人</Chinesesimp>
+            <Japanese>全員に</Japanese>
+            <Turkish>Herkes için</Turkish>
+        </Key>
         <Key ID="STR_ACE_Fortify_small">
             <English>Small</English>
             <Polish>Małe</Polish>
             <Russian>Малый</Russian>
             <Turkish>Küçük</Turkish>
             <Japanese>小型</Japanese>
+            <German>Klein</German>
         </Key>
         <Key ID="STR_ACE_Fortify_smallGreen">
             <English>Small (Green)</English>
@@ -169,6 +227,7 @@
             <Polish>Małe (Zielone)</Polish>
             <Turkish>Küçük (Yeşil)</Turkish>
             <Japanese>小型 (グリーン)</Japanese>
+            <German>Klein (Grün)</German>
         </Key>
         <Key ID="STR_ACE_Fortify_medium">
             <English>Medium</English>
@@ -176,6 +235,7 @@
             <Russian>Средний</Russian>
             <Turkish>Orta</Turkish>
             <Japanese>中型</Japanese>
+            <German>Mittel</German>
         </Key>
         <Key ID="STR_ACE_Fortify_mediumGreen">
             <English>Medium (Green)</English>
@@ -183,6 +243,7 @@
             <Polish>Średnie (Zielone)</Polish>
             <Turkish>Orta (Yeşil)</Turkish>
             <Japanese>中型 (グリーン)</Japanese>
+            <German>Mittel (Grün)</German>
         </Key>
         <Key ID="STR_ACE_Fortify_big">
             <English>Big</English>
@@ -190,6 +251,7 @@
             <Russian>Большой</Russian>
             <Turkish>Büyük</Turkish>
             <Japanese>大型</Japanese>
+            <German>Groß</German>
         </Key>
         <Key ID="STR_ACE_Fortify_bigGreen">
             <English>Big (Green)</English>
@@ -197,6 +259,7 @@
             <Russian>Большой (Зеленый)</Russian>
             <Turkish>Büyük (Yeşil)</Turkish>
             <Japanese>大型 (グリーン)</Japanese>
+            <German>Groß (Grün)</German>
         </Key>
     </Package>
 </Project>

addons/frag/functions/fnc_addPfhRound.sqf

@@ -60,7 +60,7 @@ if (alive _round) then {
     private _spallTrackID = [];
 
     private _args = [
-        _round, getPosASL _round, velocity _round, _type, diag_frameno, _gun, _doSpall, _spallTrack, _spallTrackID,
+        _round, getPosASL _round, velocity _round, _type, diag_frameno, getPosASL _round, _doSpall, _spallTrack, _spallTrackID,
         getNumber (configFile >> "CfgAmmo" >> _type >> QGVAR(skip)),
         getNumber (configFile >> "CfgAmmo" >> _type >> "explosive"),
         getNumber (configFile >> "CfgAmmo" >> _type >> "indirectHitRange"),

addons/frag/functions/fnc_pfhRound.sqf

@@ -15,7 +15,7 @@
  * Public: No
  */
 
-params ["_round", "_lastPos", "_lastVel", "_shellType", "_firedFrame", "_gun", "_doSpall", "_spallTrack", "_foundObjectHPIds", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"];
+params ["_round", "_lastPos", "_lastVel", "_shellType", "_firedFrame", "_firedPos", "_doSpall", "_spallTrack", "_foundObjectHPIds", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"];
 
 if (_round in GVAR(blackList)) exitWith {
     false
@@ -26,13 +26,10 @@ if (!alive _round) exitWith {
         if (_skip == 0) then {
             if ((_explosive > 0.5 && {_indirectRange >= 4.5} && {_fragPower >= 35}) || {_force == 1}) then {
                 // shotbullet, shotShell don't seem to explode when touching water, so don't create frags
-                if (((_lastPos select 2) < 0) && {(toLower getText (configFile >> "CfgAmmo" >> _shellType >> "simulation")) in ["shotbullet", "shotshell"]}) exitWith {};
-                private _isArmed = true;
-                if (!isNil "_gun") then {
-                    private _fuseDist = getNumber(configFile >> "CfgAmmo" >> _shellType >> "fuseDistance");
-                    _isArmed = ((getPosASL _gun) distance _lastPos > _fuseDist);
-                    TRACE_2("",_fuseDist,_isArmed);
-                };
+                if ((surfaceIsWater _lastPos) && {(toLower getText (configFile >> "CfgAmmo" >> _shellType >> "simulation")) in ["shotbullet", "shotshell"]}) exitWith {};
+                private _fuseDist = getNumber(configFile >> "CfgAmmo" >> _shellType >> "fuseDistance");
+                private _isArmed =  _firedPos vectorDistance _lastPos >= _fuseDist; // rounds explode at exactly fuseDistance, so check inclusive
+                TRACE_2("",_fuseDist,_isArmed);
                 if (!_isArmed) exitWith {TRACE_1("round not armed",_this);};
                 TRACE_3("Sending frag event to server",_lastPos,_lastVel,_shellType);
                 [QGVAR(frag_eh), [_lastPos,_lastVel,_shellType]] call CBA_fnc_serverEvent;

addons/gforces/CfgWeapons.hpp

@@ -22,4 +22,4 @@ class CfgWeapons {
     class U_I_E_Uniform_01_coveralls_F: Uniform_Base {
         ACE_GForceCoef = 0.8;
     };
-};
+};

addons/gforces/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\gforces\script_component.hpp"
+#include "\z\ace\addons\gforces\script_component.hpp"

addons/gforces/stringtable.xml

@@ -9,6 +9,7 @@
             <Japanese>ACE G フォース</Japanese>
             <Turkish>ACE G-Kuvveti</Turkish>
             <Spanish>ACE Fuerza G</Spanish>
+            <German>ACE G-Kräfte</German>
         </Key>
         <Key ID="STR_ACE_GForces_enabledFor_displayName">
             <English>Gforces Effects</English>
@@ -65,6 +66,7 @@
             <Japanese>G 効果係数</Japanese>
             <Turkish>G-Kuvvet Katsayısı</Turkish>
             <Spanish>Coeficiente de Fuerza G</Spanish>
+            <German>G-Kräfte-Koeffizient</German>
         </Key>
         <Key ID="STR_ACE_GForces_Coefficient_Description">
             <English>Controls strength of G-Force affecting players.</English>
@@ -74,6 +76,7 @@
             <Japanese>G 効果がプレイヤーに与える影響量を設定できます。</Japanese>
             <Turkish>Oyuncuları etkileyen G-Force'un gücünü kontrol eder.</Turkish>
             <Spanish>Controla la intensidad de fuerza G que afecta a los jugadores.</Spanish>
+            <German>Bestimmt, wie stark G-Kräfte Spieler beeinflussen.</German>
         </Key>
     </Package>
 </Project>

addons/grenades/functions/fnc_flashbangExplosionEH.sqf

@@ -47,28 +47,42 @@ private _affected = (ASLtoAGL _grenadePosASL) nearEntities ["CAManBase", 20];
 _affected = _affected - [ACE_player];
 {
     if (local _x && {alive _x}) then {
-        private _strength = 1 - (((eyePos _x) vectorDistance _grenadePosASL) min 20) / 20;
+        private _unit = _x;
+        private _strength = 1 - (((eyePos _unit) vectorDistance _grenadePosASL) min 20) / 20;
 
-        TRACE_3("FlashBangEffect Start",_x,((getPosASL _x) vectorDistance _grenadePosASL),_strength);
+        TRACE_3("FlashBangEffect Start",_unit,((getPosASL _unit) vectorDistance _grenadePosASL),_strength);
 
-        [_x, true] call EFUNC(common,disableAI);
-
-        _x setSkill (skill _x / 50);
+        [_unit, true] call EFUNC(common,disableAI);
 
         // Make AI try to look away
-        private _dirToFlash = _x getDir _grenadePosASL;
-        _x setDir (_dirToFlash + linearConversion [0.2, 1, _strength, 40, 135] * selectRandom [-1, 1]);
+        private _dirToFlash = _unit getDir _grenadePosASL;
+        _unit setDir (_dirToFlash + linearConversion [0.2, 1, _strength, 40, 135] * selectRandom [-1, 1]);
 
-        [{
-            params ["_unit"];
+        private _flashReactionDebounce = _unit getVariable [QGVAR(flashReactionDebounce), 0];
+        _unit setVariable [QGVAR(flashReactionDebounce), _flashReactionDebounce max (CBA_missionTime + (7 * _strength))];
+        if (_flashReactionDebounce < CBA_missionTime) then {
+            // Not used interally but could be useful for other mods
+            _unit setVariable [QGVAR(flashStrength), _strength, true];
+            {
+                _unit setSkill [_x, (_unit skill _x) / 50];
+            } forEach SUBSKILLS;
+            [{
+                params ["_unit"];
+                CBA_missiontime >= _unit getVariable [QGVAR(flashReactionDebounce), 0]
+            },{
+                params ["_unit"];
 
-            //Make sure we don't enable AI for unconscious units
-            if !(_unit getVariable ["ace_isUnconscious", false]) then {
-                [_unit, false] call EFUNC(common,disableAI);
-            };
+                _unit setVariable [QGVAR(flashStrength), 0, true];
 
-            _unit setSkill (skill _unit * 50);
-        }, [_x], 7 * _strength] call CBA_fnc_waitAndExecute;
+                // Make sure we don't enable AI for unconscious units
+                if !(_unit getVariable ["ace_isUnconscious", false]) then {
+                    [_unit, false] call EFUNC(common,disableAI);
+                };
+                {
+                    _unit setSkill [_x, (_unit skill _x) * 50];
+                } forEach SUBSKILLS;
+            }, [_unit]] call CBA_fnc_waitUntilAndExecute;
+        };
     };
 } count _affected;
 

addons/grenades/functions/fnc_nextMode.sqf

@@ -33,7 +33,7 @@ private _hint = localize ([
     LSTRING(HighThrow),
     LSTRING(PreciseThrow),
     LSTRING(RollGrenade),
-    LSTRING(DropGrenade)  
+    LSTRING(DropGrenade)
 ] select _mode);
 
 [_hint] call EFUNC(common,displayTextStructured);

addons/grenades/functions/script_component.hpp

@@ -1 +1 @@
-#include "\z\ace\addons\grenades\script_component.hpp"
+#include "\z\ace\addons\grenades\script_component.hpp"

addons/grenades/stringtable.xml

@@ -528,6 +528,7 @@
             <Japanese>梱包爆薬 (投てき仕様)</Japanese>
             <Spanish>Carga de mochila explosiva (Lanzable)</Spanish>
             <Polish>Pakiet ładunków wybuchowych (Rzucany)</Polish>
+            <German>Rucksackladung (Werfbar)</German>
         </Key>
         <Key ID="STR_ACE_Grenades_SatchelCharge_Description">
             <English>Type: Charge&lt;br /&gt;Rounds: 1&lt;br /&gt;Used on: Things that need to die</English>
@@ -536,6 +537,7 @@
             <Japanese>種類: 爆薬&lt;br /&gt;弾数: 1&lt;br /&gt;次で使用: 破壊すべき物に</Japanese>
             <Spanish>Tipo: Carga&lt;br /&gt;Unidades: 1&lt;br /&gt;Usada: Cosas que necesitan morir</Spanish>
             <Polish>Typ: Ładunek&lt;br/&gt;Naboje: 1&lt;br/&gt;Użycie: Na rzeczach które mają zginąć</Polish>
+            <German>Typ: Ladung &lt;br/&gt;Patronen:1&lt;br/&gt;Benutzt für: Dinge die Sterben müssen</German>
         </Key>
         <Key ID="STR_ACE_Grenades_SatchelCharge_LibText">
             <English>An explosive satchel that is throwable. 7 second fixed fuse</English>
@@ -544,6 +546,7 @@
             <Japanese>投げられる梱包爆薬。起爆までの時間は 7 秒間</Japanese>
             <Spanish>Carga de mochila explosiva que se puede lanzar. Espoleta fija de 7 segundos</Spanish>
             <Polish>Rzucany pakiet ładunków wybuchowych. 7 sekundowy zapalnik</Polish>
+            <German>Werfbare Rucksackladung. 7 Sekunden Zeitzünder</German>
         </Key>
         <Key ID="STR_ACE_Grenades_DemoCharge_Remote_Mag_Throwable">
             <English>Explosive Charge (Throwable)</English>
@@ -552,6 +555,7 @@
             <Japanese>爆薬ブロック (投てき仕様)</Japanese>
             <Spanish>Carga explosiva (Lanzable)</Spanish>
             <Polish>Ładunek wybuchowy (Rzucany)</Polish>
+            <German>Sprengladung (Werfbar)</German>
         </Key>
         <Key ID="STR_ACE_Grenades_DemoCharge_LibText">
             <English>An explosive charge that is throwable. 7 second fixed fuse</English>
@@ -560,6 +564,7 @@
             <Japanese>投げられる爆薬ブロック。起爆までの時間は 7 秒間</Japanese>
             <Spanish>Carga explosiva que se puede lanzar. Espoleta fija de 7 segundos</Spanish>
             <Polish>Rzucany ładunkek wybuchowy. 7 sekundowy zapalnik</Polish>
+            <German>Werfbare Sprengladung. 7 Sekunden Zeitzünder</German>
         </Key>
         <Key ID="STR_ACE_Grenades_Convert_Fuse">
             <English>Convert to short fuse</English>
@@ -568,6 +573,7 @@
             <Japanese>短信管へ変更</Japanese>
             <Spanish>Convertir a espoleta corta</Spanish>
             <Polish>Konwertuj na krótki zapalnik</Polish>
+            <German>Zündschnur verkürzen</German>
         </Key>
         <Key ID="STR_ACE_Grenades_Remove_Fuse">
             <English>Remove short fuse</English>
@@ -576,6 +582,7 @@
             <Japanese>短信管を削除</Japanese>
             <Spanish>Quitar espoleta corta</Spanish>
             <Polish>Usuń krótki zapalnik</Polish>
+            <German>Kurze Zündschnur entfernen</German>
         </Key>
         <Key ID="STR_ACE_Grenades_Settings_DisplayName">
             <English>ACE Grenades</English>
@@ -600,6 +607,7 @@
             <Japanese>爆薬変更を許可</Japanese>
             <Spanish>Permitir conversión de explosivos</Spanish>
             <Polish>Pozwól na konwersję ładunków wybuchowych</Polish>
+            <German>Erlaube die Umwandlung von Sprengstoffen</German>
         </Key>
         <Key ID="STR_ACE_Grenades_convertExplosives_Description">
             <English>Allow converting explosives to throwables</English>
@@ -608,6 +616,7 @@
             <Japanese>爆発物を投てき仕様へ交換できるようにします。</Japanese>
             <Spanish>Permitir convertir explosivos a lanzables</Spanish>
             <Polish>Zezwala na konwersje ładunków wybuchowych na rzucane wersje</Polish>
+            <German>Erlaube die Umwandlung von Sprengstoffen in werfbare Ladungen</German>
         </Key>
     </Package>
 </Project>