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

673 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Adam
2b7a4156d0 Traditional Chinese commands 
These mirror those made in the Simplified Chinese one.
 2013-01-13 21:26:42 -05:00
Adam
c668c1f8eb Simplified Chinese commands + grammar fix 
Simplified Chinese commands! Probably not the best translations; someone more eloquent than I should probably look those over.
Also removed an extra character in version.current.
 2013-01-13 21:21:10 -05:00
pahimar
5b6be262f6 Merge pull request #174 from YoWazzup/patch-1 
Fixed grammar fails in dutch loc.
 2013-01-13 08:23:23 -08:00
YoWazzup
de090bddd7 Fixed grammar fails in dutch loc. 
Read title.
 2013-01-13 12:20:45 +01:00
pahimar
311ce1e286 Merge pull request #172 from dionrhys/welsh-localisation 
Updated Welsh localisation. Thanks for the command changes! :)
 2013-01-11 17:51:06 -08:00
Dion Williams
f4aabec501 Updated Welsh localisation. Thanks for the command changes :)! 2013-01-11 22:25:32 +00:00
pahimar
2f54130cbf Merge pull request #171 from Sirquini/master 
Update resources/com/pahimar/ee3/lang/es_ES.xml
 2013-01-11 12:46:21 -08:00
pahimar
5b35d78475 Merge pull request #170 from Grovert11/patch-3 
Update resources/com/pahimar/ee3/lang/nl_NL.xml
 2013-01-11 12:46:09 -08:00
Santiago Quintero
5a96039cd7 Updated es_ES localization, deleted commands localization 2013-01-11 15:36:10 -05:00
Grovert11
516e50ca2b Update resources/com/pahimar/ee3/lang/nl_NL.xml 
Hope this is right now.
Again, couldn't think of a fitting translation of "overlay", but I think it will be clear enough.
 2013-01-11 21:16:51 +01:00
pahimar
d4a97f97be De-localized a fair bit of the commands system (response messages can be localized, but the actual commands you type in will not be localized), changed the colour of the response message the player sees to gray, re-org'd some files, etc 2013-01-11 15:01:47 -05:00
Wliu
7bd5bccd93 Update README.md 
wut
 2013-01-10 16:02:41 -05:00
Wliu
ff0efd6497 Update README.md 
Updated to 1.4.7 official, fixed derps.  Deleted useless step.
 2013-01-10 16:02:29 -05:00
Santiago Quintero
22f33456c4 Spanish es_ES translation file update 2013-01-10 00:33:52 -05:00
pahimar
8c26feab5b Derped and didn't fix the remote URL. Also made the client message portion of the version check wait for th e result to finally be determined before reporting to the player in game. 2013-01-09 15:37:29 -05:00
pahimar
e570fc3139 Fixed non-OPs using /ee3 command on servers, localize a more of the /ee3 command (feel free to submit localizations again), and threaded the version checker 2013-01-09 15:22:21 -05:00
Bram
240f2462a7 Updated Dutch translations 2013-01-09 15:21:07 +01:00
André Carvalho
7acb6f617d Merge remote-tracking branch 'upstream/master' 2013-01-06 15:59:07 +00:00
pahimar
e6ee07e46c Merge pull request #156 from LuzanelL/master 
Update Portuguese(Brazil) pt_BR translation file
 2013-01-06 04:26:20 -08:00
pahimar
c2c9af66f3 Merge pull request #158 from dionrhys/welsh-localisation 
Updated Welsh localisation. Don't worry, I didn't add the unfinished tags!
 2013-01-06 04:26:08 -08:00
pahimar
f0c476b8e8 Merge pull request #155 from 50Wliu/README 
Update README.md
 2013-01-06 04:25:58 -08:00
Dion Williams
7af63d6f12 Updated Welsh localisation. Don't worry, I didn't add the unfinished tags! 2013-01-06 05:55:43 +00:00
André Carvalho
ff334a9727 Merge remote-tracking branch 'upstream/master' 2013-01-05 10:59:34 +00:00
pahimar
a6f11d9394 plugged in more stubs - will put in actual values in the morning. hold off on PRs for these new tags until finished please! 2013-01-04 22:55:48 -05:00
Lure
a62b697dbf Update Portuguese(Brazil) pt_BR translation file 
Getting lang file up-to-date. If those empty tags get filled today I may
be doing more of these commits :D. Also, perhaps the "command.ee3.usage"
tag is off a bit, perhaps not, fill me in in this ok?
 2013-01-04 22:42:09 -04:00
Lure
f599475f69 Merge pull request #18 from pahimar/master 
Updating repo
 2013-01-04 18:32:23 -08:00
pahimar
b1c3cfff50 fixed indentation in the Localizations file listing, added a missing locale to the list, and put in some stubs for the new command localizations 2013-01-04 21:26:58 -05:00
pahimar
9d7eb635e5 Localization support for the ee3 command, fix a bug with the minium stone in SMP, and a stub to remind me to make the charging/decharging of the pstone fire packets for sounds as opposed to directly playing them for all 2013-01-04 18:53:34 -05:00
Wliu
4e42b43495 Update README.md (1.4.7/pre1f) 
Updated for `1.4.7/pre1f`.  Updated some other stuff, made the source a bit cleaner.  Added a `latest version` at the very top.  Removed credits.

Also, the **** is Markdown automatically making `0.` `1.`? a;oruwfid
 2013-01-04 17:24:50 -05:00
Wliu
1cd4972129 Revert "Update README.md" 
This reverts commit 7755f9ecf6.
 2013-01-04 17:11:26 -05:00
Wliu
a8d77738f3 Revert "Update README.md" 
This reverts commit d48b11e678.
 2013-01-04 17:11:04 -05:00
pahimar
4b9c42f3c4 Fixed the double packet bug thanks to @cpw 2013-01-03 21:43:30 -05:00
pahimar
cd5f58196e Player specific sound options, and various other things 2013-01-03 21:17:49 -05:00
pahimar
71989cfef1 Merge pull request #150 from nevercast/fix-smpbug 
Fix SMP Bug -- Again
 2013-01-02 17:09:27 -08:00
pahimar
fbb042513b Merge pull request #151 from xxAKSxx/patch-1 
Corrected auto-replace mistakes
 2013-01-02 17:08:45 -08:00
pahimar
27d4679a2b Merge pull request #152 from PizzAna/master 
Added Finnish localization
 2013-01-02 17:08:24 -08:00
Antti
dc05bfd54a added Finnish localization 2013-01-01 21:25:24 +02:00
Antti
c6d411083c added Finnish localization 2013-01-01 21:24:48 +02:00
Antti
999d74f167 added Finnish localization 2013-01-01 21:23:54 +02:00
Antti
b499e335e8 added Finnish localization 2013-01-01 21:22:44 +02:00
Antti
f24d3387f5 added Finnish localization 2013-01-01 21:21:36 +02:00
André Carvalho
e67fb0c94b Merge remote-tracking branch 'upstream/master' 2013-01-01 17:13:36 +00:00
Antti
7b63917b1b Added Finnish localization 2013-01-01 02:12:07 -08:00