Commit graph

1139 commits

Author SHA1 Message Date
pahimar
6c75fe478c Merge pull request #352 from MartijnWoudstra/patch-4
Dutch translation update
2013-05-07 16:33:55 -07:00
MartijnWoudstra
e0e866cc53 Dutch translation update
changed order to match en_US.
Added container.glassBell
2013-05-08 00:15:23 +03:00
pahimar
dbf52792b3 Net sync for item rendering in the Glass Bell. Light levels still not immediately synced though. Working on that. 2013-05-07 15:44:39 -04:00
pahimar
4e5c5ecff1 Merge pull request #350 from felix1801/patch-2
Update fr_FR.xml
2013-05-07 05:59:01 -07:00
pahimar
2f54402320 Merge pull request #351 from crafteverywhere/patch-4
Update zh_CN.xml
2013-05-07 05:58:53 -07:00
crafteverywhere
ede1f85cb7 Update zh_CN.xml 2013-05-07 13:19:31 +08:00
felix1801
c50656ef05 Update fr_FR.xml 2013-05-06 17:30:53 +03:00
pahimar
0173ebcd0d Merge pull request #349 from felix1801/patch-1
Update fr_FR.xml
2013-05-06 05:52:38 -07:00
felix1801
0fa6820fa9 Update fr_FR.xml
In french, toggle is not "Baculer" but "Basculer"
2013-05-06 13:52:07 +03:00
pahimar
cde484b44c Fix a derp in the sr_RS locale file 2013-05-03 13:38:15 -04:00
pahimar
4b64ffc4f7 Renaming the Aludel block to Aludel Base 2013-05-02 21:16:10 -04:00
pahimar
15365266b6 Merge pull request #344 from PizzAna/master
Updated Finnish localization with Glass Bell and fixed some old derps
2013-04-29 08:02:39 -07:00
PizzAna
3a224ba65a Fixed my derps in old localization PR and added localizations for Glass Bell 2013-04-29 17:45:31 +03:00
pahimar
e433958312 Merge pull request #328 from kol999/master
Russian translations update.
2013-04-29 06:16:50 -07:00
pahimar
9f7e5db434 Merge pull request #329 from Zmiko/master
Serbian translations update.
2013-04-29 06:15:52 -07:00
pahimar
94c1d8e375 Merge pull request #330 from MartijnWoudstra/patch-3
Dutch translation update
2013-04-29 06:15:41 -07:00
pahimar
fe86b3fc10 Merge pull request #333 from CaptainShadows/patch-1
Update es_ES.xml
2013-04-29 06:10:41 -07:00
pahimar
3aedc4c5b7 Merge pull request #334 from lluixhi/master
de_DE changes
2013-04-29 06:10:04 -07:00
pahimar
370dfee515 Merge pull request #336 from addobandre/master
Translation pt_PT.xml
2013-04-29 06:09:39 -07:00
pahimar
b27bc0983b Merge pull request #337 from Lapiman/patch-3
Glass bell- Simplified Chinese
2013-04-29 06:09:17 -07:00
pahimar
d1684b5641 Merge pull request #338 from Lapiman/patch-4
Glass bell- Traditional Chinese
2013-04-29 06:09:08 -07:00
pahimar
01235d1be1 Merge pull request #339 from Lapiman/patch-5
Glass bell- Japanese
2013-04-29 06:07:29 -07:00
Lluixhi
0adee541d2 Fixed some things based on Kehlim's recommendations 2013-04-28 13:53:27 -07:00
pahimar
b7bac517c2 Add crafting recipe for the Glass Bell, and remove an old debug print statement 2013-04-27 13:17:25 -04:00
pahimar
a1de8c660f Transmutation overly no longer will render when the game is paused or the GUI turned off (nice screenshots possible again :) ) 2013-04-27 12:34:23 -04:00
pahimar
451c2d6e8d Items rendered inside the Glass Bell should appear in the correct location now (Glass Bell is still buggy however) 2013-04-27 12:15:14 -04:00
pahimar
3d32a63475 More work on Glass Bell rendering (now will mount to walls and ceilings, and will emit light based on the item in it's inventory). Still buggy and incomplete. 2013-04-27 00:31:27 -04:00
Lapiman
214ddfdd2e Glass bell- Japanese
Japanese is depressingly lacking, but might as well keep it up to date.
2013-04-26 21:20:11 -03:00
Lapiman
5048e97a84 Glass bell- Traditional Chinese 2013-04-26 21:18:21 -03:00
Lapiman
78ed0ec05d Glass bell- Simplified Chinese 2013-04-26 21:16:36 -03:00
pahimar
76dde33ae1 Some work on the rendering of the Glass Bell 2013-04-25 22:54:37 -04:00
addobandre
1a20c99e25 Update pt_PT.xml
Made a little typing mistake here... Fixed
2013-04-25 23:48:51 +02:00
addobandre
57da180ec1 Update pt_PT.xml
Fixed minor issues. -> Some words just don't have a translation to Portuguese... Others are just used incorrectly(eg.:Alquímico/Alquémico).
2013-04-25 23:43:05 +02:00
Robotic-Brain
21121e6f96 Fixed language loading from Jar not working 2013-04-25 23:13:06 +02:00
Zmiko
4e52571101 Minor change in translation. 2013-04-25 13:10:14 +03:00
Lluixhi
02aecd3751 Made things in de_DE match up 2013-04-24 21:02:51 -07:00
Lluixhi
4452aab7ae fixed transmutation overlay stuff (de_DE)
Now reads: "Transmutation overlay will be set to _____"
Was: "Transmutation display was in the ____"
2013-04-24 20:48:50 -07:00
Lluixhi
ad232471d6 Unchanged some of the de_DE changes 2013-04-24 20:30:29 -07:00
Lluixhi
0a7feaa6ef Changed Some German Translations
Added spaces between many of the item names, fixed the "Amaranth Dust,"
changed the s-zett to double s because s-zett is becoming less used.
2013-04-24 20:10:51 -07:00
Captain Shadows
3ab0d59cf1 Update es_ES.xml 2013-04-25 00:10:10 -03:00
Robotic-Brain
a76dda6444 Derped commit message
the last commit fixes #317
2013-04-24 21:23:26 +02:00
Robotic-Brain
3df69fd48b Removed hardcoded localization array
Added localization directory parsing
(May need some refactoring)
2013-04-24 21:10:00 +02:00
Zmiko
3dcf78a556 Deleted the newline at the end for 50Wliu. xD 2013-04-24 21:13:11 +03:00
MartijnWoudstra
a7dd87ec24 Dutch translation update
Same issue as the russian language file
https://github.com/pahimar/Equivalent-Exchange-3/issues/237#issuecomment-16946946
Change to the right translation now
2013-04-24 21:05:10 +03:00
Robotic-Brain
a4613980c8 Merge remote-tracking branch 'origin/master' 2013-04-24 19:05:12 +02:00
Zmiko
1484edef39 Improved and updated Serbian translations. 2013-04-24 17:42:13 +03:00
Roman Sandu
b0ec9b940a Update of ru_RU.xml.
Yeah, in vanilla minecraft only first word in entry starts from capital letter, and other ones are not (Example, eng: "Diamond Sword" rus: "Алмазный меч"). Also, resynced my fork.
2013-04-24 17:22:45 +04:00
pahimar
a61b5d4559 Merge pull request #327 from Tencha/master
Update nb_NO.xml
2013-04-24 06:01:24 -07:00
Tencha
ccb3244f78 Update nb_NO.xml
Added translation for glass bell and fixed typo.
2013-04-22 23:51:00 +02:00
Robotic-Brain
7fb230847f Merged origin/master 2013-04-22 21:00:28 +02:00