Merged branch release-v3.8.3 into master

This commit is contained in:
Glowbal 2016-12-13 23:14:12 +01:00
commit c8ef10341e
6 changed files with 27 additions and 7 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.8.2-blue.svg?style=flat-square" alt="ACE3 Version"> <img src="https://img.shields.io/badge/Version-3.8.3-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 @@
#define MAJOR 3 #define MAJOR 3
#define MINOR 8 #define MINOR 8
#define PATCHLVL 2 #define PATCHLVL 3
#define BUILD 13 #define BUILD 14

View File

@ -225,6 +225,26 @@
<English>Remove existing instead of adding new</English> <English>Remove existing instead of adding new</English>
<Japanese>新しく追加するために削除します</Japanese> <Japanese>新しく追加するために削除します</Japanese>
</Key> </Key>
<Key ID="STR_ACE_Zeus_ModuleEditableObjects_DisplayName">
<English>Update Editable Objects</English>
<Japanese>編集可能なオブジェクトを更新</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleEditableObjects_curators">
<English>All Curators</English>
<Japanese>全キュレーター</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleEditableObjects_curators_desc">
<English>Apply changes to all curators</English>
<Japanese>全キュレーターへ変更を適用</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleEditableObjects_removal">
<English>Remove Objects</English>
<Japanese>オブジェクトの削除</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleEditableObjects_removal_desc">
<English>Remove existing instead of adding new</English>
<Japanese>新しく追加するために削除します</Japanese>
</Key>
<Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_DisplayName"> <Key ID="STR_ACE_Zeus_ModuleGlobalSetSkill_DisplayName">
<English>Global AI Skill</English> <English>Global AI Skill</English>
<French>Compétence global de l'IA</French> <French>Compétence global de l'IA</French>

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.8.2-blue.svg?style=flat-square" alt="ACE3 Version"> <img src="https://img.shields.io/badge/Version-3.8.3-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.8.2-blue.svg?style=flat-square" alt="ACE3 Wersja"> <img src="https://img.shields.io/badge/Wersja-3.8.3-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

@ -1,8 +1,8 @@
name = "Advanced Combat Environment 3.8.2"; name = "Advanced Combat Environment 3.8.3";
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.8.2"; description = "ACE3 - Version 3.8.3";
logo = "logo_ace3_ca.paa"; logo = "logo_ace3_ca.paa";
logoOver = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa";
tooltip = "ACE3"; tooltip = "ACE3";