Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unknown soldier1 localization tools #109

Merged

Conversation

quill18
Copy link
Member

@quill18 quill18 commented Aug 18, 2016

Resolved conflicts in #61

UnknownDude1 and others added 9 commits August 17, 2016 14:34
Added localization tools and added translation files for English.
Due to me reverting a change before it seems that the code got broke. I
changed that, it should work now.
…r1/ProjectPorcupine into UnknownSoldier1-Localization-Tools

Conflicts:
	Assets/Scripts/Models/Furniture.cs
@quill18 quill18 merged commit 7fe945e into TeamPorcupine:master Aug 18, 2016
@quill18 quill18 mentioned this pull request Aug 18, 2016
@quill18 quill18 deleted the UnknownSoldier1-Localization-Tools branch August 20, 2016 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants