From 7258bc5efc14e8c1851d67bbb46d2a9d88d1ba06 Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 8 Oct 2015 17:55:54 +0200 Subject: [PATCH 1/4] Fix link in deploy tool --- tools/deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/deploy.py b/tools/deploy.py index ff2d499d9f..c6e96f85f3 100755 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -17,7 +17,7 @@ from pygithub3 import Github TRANSLATIONISSUE = 367 TRANSLATIONBODY = """**How to translate ACE3:** -https://github.com/acemod/ACE3/blob/master/documentation/development/how-to-translate-ace3.md +http://ace3mod.com/wiki/development/how-to-translate-ace3.html {} """ From fc7230359f6da4a8e624012169e191be08e1af4a Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 8 Oct 2015 21:58:02 +0200 Subject: [PATCH 2/4] Remove redundant variables (left-over from deploy wiki to gh-pages) --- tools/deploy.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/deploy.py b/tools/deploy.py index c6e96f85f3..0b3a730470 100755 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -26,9 +26,6 @@ REPOUSER = "acemod" REPONAME = "ACE3" REPOPATH = "{}/{}".format(REPOUSER,REPONAME) -USERNAME = "ACE3 Travis" -USEREMAIL = "travis@ace3mod.com" - def update_translations(token): diag = sp.check_output(["python3", "tools/stringtablediag.py", "--markdown"]) From 15cba66b9b3ca3f04ee9d39ab929f7c3522f826c Mon Sep 17 00:00:00 2001 From: jonpas Date: Fri, 9 Oct 2015 20:49:23 +0200 Subject: [PATCH 3/4] Fix spelling of separate in LICENSE --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 01832682d7..037f1df2f3 100644 --- a/LICENSE +++ b/LICENSE @@ -22,13 +22,13 @@ source code of the individual modules. When publishing a derivative of this product you may not use a name that might create the impression that your version is an official release. -Some folders of this project may contain a seperate LICENSE file. Should +Some folders of this project may contain a separate LICENSE file. Should that be the case, everything in that folder and all subfolders is subject to that license instead. ============================================================================ - Full Gnu General Public License Text + Full GNU General Public License Text ============================================================================ From 53f833b68cafb9d29629d98984f7657374873e58 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 10 Oct 2015 00:19:09 -0500 Subject: [PATCH 4/4] #2702 - Cargo: Make "Supply Box" pallets heavy --- addons/cargo/CfgVehicles.hpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp index ccc23a99aa..1fae56749f 100644 --- a/addons/cargo/CfgVehicles.hpp +++ b/addons/cargo/CfgVehicles.hpp @@ -218,6 +218,24 @@ class CfgVehicles { GVAR(size) = 2; // 1 = small, 2 = large GVAR(canLoad) = 1; }; + //"Supply Box" - Small Pallets + class B_supplyCrate_F: ReammoBox_F { + GVAR(size) = 6; + }; + class O_supplyCrate_F: ReammoBox_F { + GVAR(size) = 6; + }; + class I_supplyCrate_F: ReammoBox_F { + GVAR(size) = 6; + }; + class IG_supplyCrate_F: ReammoBox_F { + GVAR(size) = 6; + }; + class C_supplyCrate_F: ReammoBox_F { + GVAR(size) = 6; + }; + + class Scrapyard_base_F; class Land_PaperBox_closed_F: Scrapyard_base_F { @@ -425,5 +443,5 @@ class CfgVehicles { selection = ""; }; }; - }; + }; };