Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

Update of Japanese translation #259

Closed
wants to merge 1 commit into from

Conversation

classicarma
Copy link
Contributor

Supported to new entries

Copy link
Member

@mharis001 mharis001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May need to be moved to ACE3 repo if/when ACEX merge goes through.

@jonpas
Copy link
Member

jonpas commented Oct 12, 2021

I will merge it across at that point, no worry.

@jonpas jonpas mentioned this pull request Oct 13, 2021
2 tasks
jonpas added a commit to acemod/ACE3 that referenced this pull request Oct 13, 2021
jonpas added a commit to acemod/ACE3 that referenced this pull request Oct 13, 2021
PabstMirror added a commit to acemod/ACE3 that referenced this pull request Oct 14, 2021
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed

* Resolve issues

* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

* Remove unnecessary backwards compat

* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove maintainers from merged ACEX components

* Cleanup unused module and faction classes

* Sitting - Add more object configs by @Dystopian
acemod/ACEX#255

* Translations - Add Japanese by @classicarma
acemod/ACEX#259

* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
acemod/ACEX#251

* Add ACEX authors and sort authors file

* acex - final tweaks (#8513)

* acex - handle old funcs

* replace thirst/hunger setvars to acex naming

fix macro

Revert "fix macro"

This reverts commit d807e5e.

Revert "replace thirst/hunger setvars to acex naming"

This reverts commit bafc607.

x

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@jonpas
Copy link
Member

jonpas commented Oct 14, 2021

Merged in acemod/ACE3#8415.

@jonpas jonpas closed this Oct 14, 2021
@jonpas jonpas added this to the 3.5.5 milestone Oct 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants