Merge branch 'master' into HALO

.gitignore

@@ -1,13 +1,13 @@
+@AresModAchillesExpansion/keys/private
 @Release/*
-Tools/AchillesTestServer.bat
+Tools/AchillesConnectToServer.bat
+Tools/AchillesAddonBuilder.bat
 *.bikey
 *.biprivatekey
 *.pbo
 *.bisign
 *.lnk
 .vscode/
-
 .idea
-/*.iml
 *.ini
-Tools/AddonBuilder/config.ini
+*.log

.travis.yml

@@ -4,12 +4,12 @@ python:
 before_script:
   - pip3 install sqflint
 script:
-  - python3 Tools/sqf_validator.py
-  - python3 Tools/config_style_checker.py
+  - python3 tools/travis/sqf_validator.py
+  - python3 tools/travis/config_style_checker.py
   - sqflint -d @AresModAchillesExpansion/addons
 notifications:
   email: false
   webhooks:
     urls:
       - https://mechilles.herokuapp.com/webhook
-    on_success: change
+    on_success: change

@AresModAchillesExpansion/addons/settings_f/scripts/XEH_preInit.sqf

@@ -12,7 +12,7 @@
 
 #include "module_tree.sqf"
 #include "curator_vision.sqf"
-// #include "available_factions.sqf"
+#include "available_factions.sqf"
 #include "icon_selection.sqf"
 #include "keybindings.sqf"
 #include "debugMessages.sqf"

@AresModAchillesExpansion/addons/ui_f/functions/eventHandler/fn_onModuleTreeLoad.sqf

@@ -114,15 +114,15 @@ _categoryIndex = _tree_ctrl tvAdd [[],_categoryName];
 */
 
 //collapse unit tree or remove faction
-if (/*count Achilles_var_excludedFactions > 0 or*/ Achilles_var_moduleTreeCollapse) then
+if (count Achilles_var_excludedFactions > 0 or Achilles_var_moduleTreeCollapse) then
 {
 	{
 		private _tree_ctrl = _display displayCtrl _x;
 		for "_i" from ((_tree_ctrl tvCount []) - 1) to 0 step -1 do
 		{
 			private _path = [_i];
 			private _faction_name = _tree_ctrl tvText _path;
-			if (/*_faction_name in Achilles_var_excludedFactions*/ false) then
+			if (_faction_name in Achilles_var_excludedFactions) then
 			{
 				_tree_ctrl tvDelete _path;
 			} else
@@ -164,7 +164,7 @@ if (Achilles_var_moduleTreeCollapse) then
 	{
 		private _path = [0,_i];
 		private _faction_name = _tree_ctrl tvText _path;
-		if (/*_faction_name in Achilles_var_excludedFactions*/ false) then
+		if (_faction_name in Achilles_var_excludedFactions) then
 		{
 			_tree_ctrl tvDelete _path;
 		} else

@AresModAchillesExpansion/changelog.md

@@ -39,8 +39,13 @@ Our versioning follows the guidelines set by [Semantic Versioning 2.0](https://s
 ##### Revised
 * Paradrop (also applies to the key-binding and reinforcement module)
 	- Fix: Chute openning animation is smoother. #321
+
 	- Feature: AI accounts to a certain extend for paradrop displacment according to [fitted functions](https://gyazo.com/32afcfefef24ba2cdc36eaa4c0467147).
 	- Change: Paradroopers won't open their chute immediately at high altitude (>120 m) => HALO. #321
+#### Settings
+##### Revised
+* Faction filter
+	- Change: The faction filter is available agian.
 
 ### v1.0.2
 #### Modules