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

2040 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pahimar
62872b13ee Improved GUI calling for the portable crafting interface, fixing an inefficient Red Water check, get more of the PStone functionality working, and included some texture work from spikeof2010 2012-10-28 23:16:32 -04:00
pahimar
2cd5558f8f Merge pull request #54 from Minalien/master 
Serbian Localization
 2012-10-28 11:22:50 -07:00
André Carvalho
952699e083 update some stuff 2012-10-28 17:33:28 +00:00
Ken "Minalien" Murray
fba64655ef Updated encoding on Japanese & Serbian language files. 
Files were using UTF-8 without BOM, rather than regular UTF-8.
 2012-10-28 09:51:48 -07:00
Ken "Minalien" Murray
717dfe4cc0 Added Serbian localization file, from Vladan899. 2012-10-28 09:37:20 -07:00
André Carvalho
8a838c53a8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	resources/ee3/lang/pt_PT.xml
 2012-10-28 16:32:15 +00:00
pahimar
3b0f1c8623 Merge pull request #52 from Cakejoke/master 
German localization update
 2012-10-28 07:31:22 -07:00
pahimar
36a99d3166 Merge pull request #49 from Minalien/master 
(Rough) Japanese Language File
 2012-10-28 07:31:10 -07:00
pahimar
24069bee71 Merge pull request #48 from TheJohlin/master 
Modified Swedish localization
 2012-10-28 07:30:37 -07:00
pahimar
9e21fe643c Merge pull request #47 from Pyker/master 
Update Portuguese translation
 2012-10-28 07:30:01 -07:00
pahimar
dea425915f Merge pull request #45 from dionrhys/welsh-localisation 
Updated Welsh localisation
 2012-10-28 07:29:24 -07:00
Pedro Cunha
d8c58c96ea Minor corrections to pt-PT translation as per RedRoserade's suggestions 2012-10-28 13:53:31 +00:00
Cakejoke
7680c695d0 Updated german localization 2012-10-28 11:08:59 +01:00
Ken "Minalien" Murray
523eb8d503 Added (very) rough draft of Japanese language file. 2012-10-27 18:21:17 -07:00
TheJohlin
35609f54bf Updated translation for Swedish 2012-10-28 02:16:06 +01:00
Pedro Cunha
541a3e17db Updated Portuguese translation 2012-10-28 01:14:12 +01:00
pahimar
e3ef89d38e Javadoc update 2012-10-27 17:41:02 -04:00
pahimar
942f97eda3 Custom EE3 Creative Tab and working in world transmutation. Just some testing and updated javadoc to go! 2012-10-27 16:04:43 -04:00
pahimar
16d9d6dedb Work on a recursive method for transmuting equivalent blocks in world - switching PCs so easier to commit 2012-10-27 12:33:04 -04:00
Dion Williams
07064b7094 Updating Welsh localisation for commit pahimar/Equivalent-Exchange-3@c32bf44d61 2012-10-26 17:17:33 +01:00
pahimar
f3fc5f48e0 Misc cleanup 2012-10-26 11:34:05 -04:00
André Carvalho
3932bcba9a Updated Portuguese localization file with Inert Stone 2012-10-26 16:12:48 +01:00
pahimar
a50bc0c661 Merge pull request #44 from aritzhack/master 
Updated with Inert Stone
 2012-10-26 07:45:46 -07:00
pahimar
d83adda9fb Nothing to see here 2012-10-26 10:45:27 -04:00
aritzhack
e7f7915136 Updated ES-es with Inert Stone 
Signed-off-by: aritzhack <aritzhack@gmail.com>
 2012-10-26 16:36:22 +02:00
pahimar
4b29fb2b0b Added some of the new localizations to the listing of files, and corrected the comments (it's Localizations, not BlockIds....) 2012-10-26 10:32:35 -04:00
pahimar
a37685ff8d Goofed and had two comments, corrected now 2012-10-26 10:30:34 -04:00
pahimar
5778be58ec Merge remote-tracking branch 'origin/master' 
Conflicts:
	resources/ee3/lang/pt_PT.xml
 2012-10-26 10:23:32 -04:00
pahimar
8c292e1e7b Updating the Portugese version as per RedRoserade's PR (#29) 2012-10-26 10:21:32 -04:00
pahimar
e1ae788ee8 Merge pull request #41 from laz2727/master 
RU localization file update
 2012-10-26 07:17:45 -07:00
pahimar
070694ff79 Merge pull request #42 from 0xXxDEADxXx0/sv-SE 
Updated Swedish translation!
 2012-10-26 07:17:20 -07:00
pahimar
a710484361 Merge pull request #43 from Pyker/master 
Update Portuguese translation
 2012-10-26 07:17:12 -07:00
pahimar
5499a1c1c3 Updated the build script to automagically inject the version number from the build properties into the code and mcmod.info file 2012-10-26 10:14:46 -04:00
Pedro Cunha
457de818e4 Updated pt-PT translation 2012-10-26 12:50:36 +01:00
0xXxDEADxXx0
6a85283094 Updated Swedish translation 
I updated Swdish translation before the prerelase.
Fixed some strange spelling and added Inert Stone
 2012-10-26 11:40:22 +02:00
ΛAZ27
b034652c27 RU localization file update 2012-10-26 13:21:40 +06:00
pahimar
3cd83d283c Clean up some references, and getting ready for the ant build file to auto fill in version details at build time 2012-10-25 22:17:19 -04:00
pahimar
c32bf44d61 Changed out the temp recipe for the Minium Stone to use an Inert Stone instead of a diamond 2012-10-25 22:13:25 -04:00
pahimar
1f63826b6f Updated the build ant script for MC 1.4.2 2012-10-25 21:56:40 -04:00
pahimar
3e9c60a39c Getting closer to pre1! 2012-10-25 20:55:26 -04:00
pahimar
4c35f7810c Fix some file encodings for localizations (remember it HAS to be UTF-8 folks) and fix the Portable Crafting GUI to show labels 2012-10-24 22:08:10 -04:00
pahimar
f47d87f639 Merge remote-tracking branch 'origin/master' 2012-10-24 21:53:51 -04:00