Commit graph

2032 commits

Author SHA1 Message Date
Wliu
dc5fb94fcd Continue README.md
Continuing Readme, trying out new stuff.
2012-11-15 17:50:51 -05:00
Wliu
f9cfa9d0da Test
test
2012-11-15 17:46:46 -05:00
Wliu
4f64ae9fc8 Make README.md
Making a Readme for EE3, this is not done yet!
2012-11-15 17:31:12 -05:00
Wliu
55ca9beef5 Added README.md
Nothing in it yet, going to change it on Github (online).
2012-11-15 17:17:33 -05:00
aritzhack
1d0d954b77 Updated spanish translation on 11/11/2012
Signed-off-by: aritzhack <aritzhack@gmail.com>
2012-11-11 17:10:14 +01:00
pahimar
12c69647bd Merge pull request #76 from Brammm/master
Updated Dutch translations.
2012-11-09 14:52:29 -08:00
Bram Van der Sype
235403a67d Updated Dutch translations
Added the latest lines, updated a few older ones.
2012-11-09 23:04:51 +01:00
pahimar
4c3ecdb896 Merge remote-tracking branch 'origin/master' 2012-11-07 13:32:49 -05:00
pahimar
b0d0e13a22 Proper fix for Pull #75 2012-11-07 13:32:34 -05:00
pahimar
ec5295554a Merge pull request #74 from laz2727/master
RU localization file update
2012-11-07 08:37:29 -08:00
ΛAZ27
99b53e0ddc JAFU 2012-11-07 22:34:07 +06:00
pahimar
efeea57d50 Merge pull request #73 from Minerman/master
Fixing self-submitted portable smelting issue.
2012-11-07 08:12:26 -08:00
Minerman
b1f15e0050 Fixing minor Auto-detected smelting issue
Auto-detected portable smelting recipes should now take into account the output number of the recipe.

Example here (Wheat Block smelts to 3 Bread each) : http://puu.sh/1nuLD
2012-11-07 11:09:48 -05:00
pahimar
5b4a6e1128 Merge pull request #66 from shal5/master
The Norwegian Language File
2012-11-07 06:50:03 -08:00
pahimar
2509ae570c Merge pull request #72 from RedRoserade/master
Updated European Portuguese language file
2012-11-07 06:47:16 -08:00
pahimar
6c1d670eaf Merge pull request #71 from gishicrafter/ja_JP-2
Update and enable ja_JP
2012-11-07 06:46:43 -08:00
André Carvalho
bb380d2229 Updated European Portuguese language file
-Updated the European Portuguese language file in order to reflect the
latest upstream changes:
--Purity
--Dusts
--Ash

As always, I am open to suggestions regarding possible alternatives to
the translations I've provided.
2012-11-07 14:32:23 +00:00
André Carvalho
89c2c8784d Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-07 14:24:54 +00:00
gishicrafter
b6f438983f Update and enable ja_JP 2012-11-07 23:13:05 +09:00
pahimar
86e01679a3 New Strings lib for holding common names/etc, merge in some of the block/item initialization stuff into their respective classes, proper config loading for Alchemy Dusts, oh yeah Alchemy Dusts, some new Localization keys, etc 2012-11-06 15:49:43 -05:00
André Carvalho
9a49a03bf2 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-06 11:52:49 +00:00
pahimar
15b710d17f Merged in some new sprites from Djohaal for the dusts 2012-11-05 15:38:50 -05:00
André Carvalho
2935fc0a1a Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-05 10:24:04 +00:00
shal5
de66792505 Added Norwegian Language File 2012-11-04 19:22:32 +01:00
pahimar
8fc5bf43b9 Amazing how you can spend a whole morning fixing small things; new Inert Stone recipe, initial class for the base alchemy dusts to extend, dropping the use of colour overlays. 2012-11-04 13:14:51 -05:00
André Carvalho
2720b38e4c Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-04 12:38:04 +00:00
pahimar
33e539aa37 Merged in some new sprites that may/may not get used on items that may/may not be decided upon. 2012-11-03 22:20:29 -04:00
pahimar
0f353593af Updated the EE3 link thread in the localizations, finally fixed the derp in the pl_PL.xml localization (missing /), and fixed my own derp in keybinding localization (I wasn't doing it properly). 2012-11-03 22:11:41 -04:00
pahimar
7abe7a428f Merge pull request #64 from Cakejoke/master
Some more work on german localization
2012-11-03 14:24:45 -07:00
Cakejoke
40e1d90cbc Rename calcinator (again) 2012-11-03 17:37:13 +01:00
André Carvalho
f2d5948ef8 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-03 11:59:09 +00:00
Cakejoke
85dc8f72d3 Update resources/ee3/lang/de_DE.xml 2012-11-02 23:40:42 +01:00
pahimar
272aa21b31 Blah 2012-11-02 16:06:08 -04:00
André Carvalho
ed5e3c1c57 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-11-01 13:49:24 +00:00
pahimar
4a469388b2 Merge pull request #60 from Minalien/master
Added partial Chinese localization by wtmhahagd from IRC channel.
2012-10-31 17:17:11 -07:00
pahimar
b232096258 Merge pull request #63 from Pyker/master
Fix UTF-8 for Spanish translation
2012-10-31 17:14:53 -07:00
Pedro Cunha
799281c6b2 Fix UTF-8 for Spanish translation 2012-10-31 18:46:57 +00:00
André Carvalho
94caeaecb5 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-10-31 09:22:23 +00:00
pahimar
d225d8b479 Merge pull request #62 from iggythemad/master
Adding Polish (PL) localization
2012-10-30 18:44:55 -07:00
Iggy the Mad
ca5ca555de Adding Polish (pl_PL) localization 2012-10-30 21:51:13 +00:00
Ken "Minalien" Murray
a8e4e2585a Revert "Adding English (Great Britain) localization."
This reverts commit 905a3eb806.
2012-10-30 13:15:49 -07:00
Ken "Minalien" Murray
905a3eb806 Adding English (Great Britain) localization. 2012-10-30 13:11:37 -07:00
Minalien
b61abd7cd5 Revert "Renamed Chinese localization file (partial translation is Simplified Chinese, not Traditional)."
This reverts commit 23e335066a.
2012-10-30 10:48:39 -07:00
Ken "Minalien" Murray
23e335066a Renamed Chinese localization file (partial translation is Simplified Chinese, not Traditional).
Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
2012-10-30 10:26:28 -07:00
Ken "Minalien" Murray
8402662efe Added partial Chinese localization by wtmhahagd from IRC channel.
Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
2012-10-30 10:13:16 -07:00
André Carvalho
014865ee7f Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-10-30 09:49:55 +00:00
pahimar
309e13cfe8 Merge pull request #55 from gishicrafter/ja-JP
fix Japanese translation
2012-10-29 18:37:57 -07:00
André Carvalho
f130ac8506 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 2012-10-29 10:37:40 +00:00
gishicrafter
7d977413cc Rename file 2012-10-29 18:34:10 +09:00
gishicrafter
6a84fcba02 Correction of ja-JP by a native speaker 2012-10-29 18:24:06 +09:00