Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1766 commits 1 branch 0 tags 11 MiB
Commit graph

1766 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
5a91c53ab3 Traditional Chinese mirror 
Mirroring the Simplified Chinese localization update.
 2013-01-26 18:16:23 -05:00
Adam
18ebd04798 Simplified Chinese localization update 
Finally figured out a semi-good way to translate that pesky "for @MINECRAFT_VERSION@" into Chinese.
50Wliu, feel free to change this, just make sure next time you mirror the changes into Traditional.
You can convert using Google Translate.
 2013-01-26 18:15:03 -05:00
philip98
b0ee850b42 Update resources/com/pahimar/ee3/lang/de_DE.xml 2013-01-26 23:54:03 +01:00
pahimar
f23729793f More work on the portable transmutation GUI 2013-01-25 16:13:20 -05:00
pahimar
a7b257bdb4 Some more GUI work 2013-01-23 20:00:41 -05:00
pahimar
1883774658 Just some properly layering to the XCF 2013-01-23 19:21:36 -05:00
pahimar
4ed69bb135 Some GUI work 2013-01-23 19:21:34 -05:00
pahimar
d4db5f8968 Just some properly layering to the XCF 2013-01-23 19:18:20 -05:00
pahimar
aad123a0b2 Some GUI work 2013-01-23 18:53:10 -05:00
Wliu
2039277af1 Update README.md 
Minor fixes, forgot to mention that you have to install the JRE.  Oops.  Made source easier to read again.
 2013-01-22 21:15:48 -05:00
pahimar
fd76b2c205 Merge pull request #198 from Lartza/master 
Updated Finnish localization
 2013-01-22 17:46:05 -08:00
pahimar
b63c9dfb46 EE3 transmutation stones now properly take durability damage when used for portable crafting 2013-01-22 15:40:15 -05:00
Lartza
ece8226959 Updated Finnish localization 
Not sure why it shows every line as changed, maybe since I changed it to
BOM.
 2013-01-22 13:58:30 +02:00
pahimar
3ae9ae154d Some work on getting Portable Crafting to properly damage transmutuation stones, finishing this up tomorrow 2013-01-21 22:15:51 -05:00
pahimar
00122fbf9b Merge pull request #197 from Deatrathias/master 
Updated French localization
 2013-01-21 16:51:20 -08:00
Deatrathias
4e332a2bed Updated french localization 2013-01-21 22:57:11 +01:00
pahimar
72c6cd2e98 Merge pull request #195 from RedRoserade/master 
Updated European Portuguese translation file
 2013-01-20 08:00:56 -08:00
pahimar
e669198cf8 Merge pull request #192 from gbibgim/master 
Corrected a typo,
 2013-01-20 08:00:49 -08:00
André Carvalho
b170467a53 Updated to reflect latest upstream changes. 2013-01-20 14:11:09 +00:00
André Carvalho
4cef7a5cc0 Merge remote-tracking branch 'upstream/master' 2013-01-20 13:25:58 +00:00
gbibgim
88a90a0ca8 Update resources/com/pahimar/ee3/lang/pl_PL.xml 
Corrected a typo, changed one translation to be more correct
 2013-01-19 15:43:36 +01:00
pahimar
56edefb8d2 Stones make the "break" noise when they are used up during world block transmutation 2013-01-18 16:12:27 -05:00
pahimar
4f444fb5a8 Merge pull request #191 from anonymouspineapple/patch-30 
Removal of unused commands in pt_BR localization
 2013-01-18 05:49:33 -08:00
pahimar
d16887932e Solved Minium/Philosopher stone taking damage on world block transmutation, while also respecting EE3 world block protection. Yay! 2013-01-17 22:36:35 -05:00
Adam
21dd30b42a Removal of unused commands in pt_BR localization 2013-01-17 20:20:04 -05:00
pahimar
671fe3f20f Merge pull request #187 from anonymouspineapple/patch-29 
Traditional Chinese localization update
 2013-01-17 05:36:07 -08:00
Adam
1d4f3d5b65 Traditional Chinese localization update 
Alright, alright, 50Wliu, you win. No 的. :P
Just mirroring the changes he made to the simplified localization- spaces and removed periods for consistency, and that little 的 issue.
 2013-01-16 19:07:21 -05:00
Wliu
79db716094 Update README.md 
PSA:  UPDATE TO JAVA 7u11!  THIS FIXES A MAJOR EXPLOIT!
Minor additions/changes, added latest version link.
 2013-01-15 20:49:50 -05:00
Wliu
ae9577aacb Update README.md 
wut
 2013-01-15 20:49:49 -05:00
Wliu
b954713a56 Update README.md 
Updated to 1.4.7 official, fixed derps.  Deleted useless step.
 2013-01-15 20:49:48 -05:00
pahimar
5449c672ac Merge pull request #186 from 50Wliu/README 
Update README.md
 2013-01-15 15:53:20 -08:00
Wliu
09f74323f1 Update README.md 
PSA:  UPDATE TO JAVA 7u11!  THIS FIXES A MAJOR EXPLOIT!
Minor additions/changes, added latest version link.
 2013-01-15 18:41:34 -05:00
pahimar
37b16673e8 Merge pull request #184 from 50Wliu/Localization 
Localization update (zh_CN)
 2013-01-14 17:49:58 -08:00
Wliu
0ca5f57b95 Update resources/com/pahimar/ee3/lang/zh_CN.xml 
And...deleted periods for consistency.
 2013-01-14 17:20:52 -05:00
Wliu
e4fb0fe062 Update resources/com/pahimar/ee3/lang/zh_CN.xml 
stupid font showing a space when there wasn't one >.>
 2013-01-14 17:19:53 -05:00
Wliu
6ff6dcfa0d Update resources/com/pahimar/ee3/lang/zh_CN.xml 
Spacing, *rough* translation of some more version check stuff, and fixed Pineapple's mistakes.
 2013-01-14 17:18:44 -05:00
Wliu
edd18c42bf Merge http://github.com/pahimar/Equivalent-Exchange-3 into Localization 2013-01-14 17:05:58 -05:00
pahimar
647f600cba Fixed a logic derp in the version checker, and hopefully fixed positioning of the overlay for all possible positions. 2013-01-14 14:57:12 -05:00
pahimar
abfa38e288 Merge pull request #181 from anonymouspineapple/patch-27 
Grammar fix to Chinese (simplified) localization
 2013-01-14 03:39:51 -08:00
pahimar
44f85cbd84 Merge pull request #182 from anonymouspineapple/patch-28 
Grammar fix to Chinese (traditional) localization
 2013-01-14 03:39:45 -08:00
pahimar
b4bb5ab833 Merge pull request #183 from Brammm/master 
Updated Dutch translations some more
 2013-01-14 03:39:36 -08:00
Bram
5a20a0e21d Fixed grammar (subject to discussion) 2013-01-14 09:16:19 +01:00
Bram
fc1ce1d19b Fixed typo 2013-01-14 09:16:06 +01:00
Bram
ae36beeeae Merge branch 'master' of https://gthub.com/pahimar/Equivalent-Exchange-3 
Conflicts:
	resources/com/pahimar/ee3/lang/nl_NL.xml
 2013-01-14 09:09:24 +01:00
Adam
06aca4ef01 Grammar fix to Chinese (traditional) localization 2013-01-13 22:09:04 -05:00
Adam
52d9a43ae6 Grammar fix to Chinese (simplified) localization 2013-01-13 22:08:14 -05:00
pahimar
1d0f7560ed Merge pull request #177 from anonymouspineapple/patch-23 
Simplified Chinese commands
 2013-01-13 18:46:54 -08:00
pahimar
aa32149a7b Merge pull request #178 from anonymouspineapple/patch-24 
Traditional Chinese commands
 2013-01-13 18:46:29 -08:00
pahimar
aade6c4216 Merge pull request #180 from anonymouspineapple/patch-26 
Updated itemGroup.EE3 for Turkish localization
 2013-01-13 18:45:27 -08:00
Adam
10e48f292d Updated itemGroup.EE3 for Turkish localization 
If I'm not mistaken, these should all be in English.
 2013-01-13 21:31:38 -05:00