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

227 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pahimar
4e8cbd16f9 Make a Colours lib and "abstact" some textures to grayscale (we can recolour them with colour overlays and reuse the texture more efficiently) 2012-10-24 21:53:41 -04:00
pahimar
4f509ebdb1 When I localized key bindings, I missed updating the KeyPressed packet to also accomodate the change - whoops! 2012-10-23 22:01:41 -04:00
pahimar
30c0d78eba Merge pull request #25 from aritzhack/master 
Added Spanish-Spain (es-ES) translation
 2012-10-22 09:27:54 -07:00
pahimar
ee5d45b2b2 Merge pull request #36 from mnn/master 
Czech translation
 2012-10-22 09:27:22 -07:00
pahimar
7a0d09f7c1 Merge pull request #37 from 0xXxDEADxXx0/sv-SE 
Updated Swedish translation
 2012-10-22 09:27:00 -07:00
pahimar
6958969944 Merge pull request #38 from phpr/master 
French Localization
 2012-10-22 09:26:45 -07:00
phpr
04d70e77fc Update Localizations.java file for the French version 2012-10-22 18:21:57 +02:00
phpr
160add5837 French Localization 2012-10-22 18:21:25 +02:00
aritzhack
4af874ba70 Updated the Spanish-Spain (ES-es) translation on 22/10/2012 
Signed-off-by: aritzhack <aritzhack@gmail.com>
 2012-10-22 15:47:32 +02:00
aritzhack
9e56c39703 Merge remote-tracking branch 'upstream/master' 2012-10-22 15:37:44 +02:00
0xXxDEADxXx0
1caccc8dce Updated Swedish translation 2012-10-22 12:40:15 +02:00
moen
833ed52d63 Updated Czech translation file. 2012-10-22 09:56:08 +02:00
moen
64ce176250 Merge branch 'master' of https://github.com/mnn/Equivalent-Exchange-3 2012-10-22 09:54:16 +02:00