Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source

# By karakufire
# Via Aidan (1) and karakufire (1)
* 'development' of https://github.com/aidancbrady/Mekanism:
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9

...

This commit is contained in:

aidancbrady 2016-05-21 13:52:34 -04:00

parent 0e0f9584f3 711fa80ed8

commit ffd39dc20d

1 changed files with 1086 additions and 927 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

2013

src/main/resources/assets/mekanism/lang/ja_JP.lang

View file

File diff suppressed because it is too large Load diff