Merge 100% text strings draft 1

Also updated contributors and gitignore
2018-05-28 19:30:43 -04:00 · 2018-05-28 19:30:43 -04:00 · 74a60bc60b
parent cc42c4ca62
commit 74a60bc60b
3 changed files with 2105 additions and 1449 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,6 +10,7 @@ snapshots/
 notes/
 fresh/
 armtest/
+saves/
 working/*.asm
 working/*.bin
 armips.exe
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@ -14,6 +14,9 @@ Text conversion:
  ShadowOne333
  PhoenixBound
  Pidgin
+  Karmageddon
+  Masaru
+  Sterophonick

 Special thanks:
-  TragicManner
+  TragicManner
--- a/working/m12-strings-english.txt
+++ b/working/m12-strings-english.txt