Merge branch 'release'

This commit is contained in:
jonpas 2017-07-18 23:00:48 +02:00
commit 6aad1c8af6
16 changed files with 20 additions and 20 deletions

View File

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

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Cargo"> <Package name="Cargo">
<Key ID="STR_ACE_Cargo_loadObject"> <Key ID="STR_ACE_Cargo_loadObject">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Hellfire"> <Package name="Hellfire">
<Key ID="STR_ACE_Hellfire_hellfireModeAction"> <Key ID="STR_ACE_Hellfire_hellfireModeAction">

View File

@ -1,4 +1,4 @@
#define MAJOR 3 #define MAJOR 3
#define MINOR 10 #define MINOR 10
#define PATCHLVL 1 #define PATCHLVL 2
#define BUILD 21 #define BUILD 22

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="NLAW"> <Package name="NLAW">
<Key ID="STR_ACE_NLAW_trackTarget"> <Key ID="STR_ACE_NLAW_trackTarget">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="QuickMount"> <Package name="QuickMount">
<Key ID="STR_ACE_QuickMount_Category"> <Key ID="STR_ACE_QuickMount_Category">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Rearm"> <Package name="Rearm">
<Key ID="STR_ACE_Rearm_RearmSettings_Module_DisplayName"> <Key ID="STR_ACE_Rearm_RearmSettings_Module_DisplayName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Refuel"> <Package name="Refuel">
<Key ID="STR_ACE_Refuel_RefuelSettings_Module_DisplayName"> <Key ID="STR_ACE_Refuel_RefuelSettings_Module_DisplayName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="repair"> <Package name="repair">
<Key ID="STR_ACE_Repair_SpareTrack"> <Key ID="STR_ACE_Repair_SpareTrack">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Spectator"> <Package name="Spectator">
<Key ID="STR_ACE_Spectator_DisplayName"> <Key ID="STR_ACE_Spectator_DisplayName">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Zeus"> <Package name="Zeus">
<Key ID="STR_ACE_Zeus_Settings_DisplayName"> <Key ID="STR_ACE_Zeus_Settings_DisplayName">

View File

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

View File

@ -3,7 +3,7 @@
</p> </p>
<p align="center"> <p align="center">
<a href="https://github.com/acemod/ACE3/releases"> <a href="https://github.com/acemod/ACE3/releases">
<img src="https://img.shields.io/badge/Wersja-3.10.1-blue.svg?style=flat-square" alt="ACE3 Wersja"> <img src="https://img.shields.io/badge/Wersja-3.10.2-blue.svg?style=flat-square" alt="ACE3 Wersja">
</a> </a>
<a href="https://github.com/acemod/ACE3/issues"> <a href="https://github.com/acemod/ACE3/issues">
<img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia">

View File

@ -9,8 +9,8 @@ ace:
version: version:
major: 3 major: 3
minor: 10 minor: 10
patch: 1 patch: 2
build: 21 build: 22
acex: acex:
githubUrl: https://github.com/acemod/ACEX githubUrl: https://github.com/acemod/ACEX

View File

@ -11,8 +11,8 @@ ace:
version: version:
major: 3 major: 3
minor: 10 minor: 10
patch: 1 patch: 2
build: 21 build: 22
acex: acex:
githubUrl: https://github.com/acemod/ACEX githubUrl: https://github.com/acemod/ACEX

View File

@ -1,8 +1,8 @@
name = "Advanced Combat Environment 3.10.1"; name = "Advanced Combat Environment 3.10.2";
picture = "logo_ace3_ca.paa"; picture = "logo_ace3_ca.paa";
actionName = "GitHub"; actionName = "GitHub";
action = "https://github.com/acemod/ACE3"; action = "https://github.com/acemod/ACE3";
description = "ACE3 - Version 3.10.1"; description = "ACE3 - Version 3.10.2";
logo = "logo_ace3_ca.paa"; logo = "logo_ace3_ca.paa";
logoOver = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa";
tooltip = "ACE3"; tooltip = "ACE3";