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

384 commits

Author SHA1 Message Date
pahimar
c5763a0ac4 Merge pull request #251 from mnn/master 
Updated czech translation file
 2013-03-12 08:17:05 -07:00
Andrea Ruggiero
4962a72f71 Update it_IT.xml 2013-03-12 16:09:33 +01:00
moen
d787bb8159 Updated czech translation to 1.5. 2013-03-12 14:02:52 +01:00
pahimar
b429a76b48 Merge pull request #247 from walle1357/patch-1 
Pull request on behalf of @anonymouspineapple
 2013-03-12 05:36:21 -07:00
pahimar
ae0742a0fc Merge pull request #249 from RedRoserade/master 
Updated European Portuguese translation file
 2013-03-12 05:35:29 -07:00
pahimar
d9bfd83223 Swap out the old with the new 2013-03-11 23:32:53 -04:00
pahimar
bfc28d6597 Working implementation of custom models for the Calcinator and Aludel (Requires OBJ Loader lib) 2013-03-11 23:23:06 -04:00
RedRoserade
6f41bea733 Updated European Portuguese Language file 
Reflects latest upstream changes.
 2013-03-11 22:48:13 +00:00
RedRoserade
c4b81daca5 Merge remote-tracking branch 'upstream/master' 2013-03-11 14:15:10 +00:00
pahimar
811bbfe9f7 Not all of this will make sense; working on implementing custom models from Wavefront OBJ model files. 2013-03-10 22:26:55 -04:00
walle1357
9c0c36ee46 On behalf of @anonymouspineapple 2013-03-10 20:57:40 -03:00
pahimar
2d7987cd9b Whitespace derp 2013-03-09 15:27:31 -05:00
pahimar
af59bc543c Models 2013-03-09 15:21:11 -05:00
pahimar
ec7c35e604 Work on enabling custom inventory names 2013-03-06 21:46:19 -05:00
pahimar
a1733467d3 The Aludel, Alchemical Chest, and Calcinator all render again in MC 1.5 2013-03-06 19:02:12 -05:00
pahimar
30d3e3aef5 Standardize "alchemical" over "alchemy" for names, get all the items rendering again as they were prior to MC 1.5 2013-03-06 18:46:19 -05:00
pahimar
c9cb29ede5 Fix up more of the rendering stuff for 1.5 2013-03-05 16:17:54 -05:00
pahimar
f580e4646f Add the logo xcf file, and update the path to the image in the mcmod.info 2013-03-04 23:48:47 -05:00
pahimar
148bbacade Fix a fringe case with the Version Checker, finally figured out why some item textures weren't working, and got sounds working too 2013-03-04 23:26:26 -05:00
pahimar
0b49a57a19 More work on renders 2013-03-04 22:26:17 -05:00
pahimar
1116fb6351 More 1.5 work 2013-03-04 22:18:15 -05:00
pahimar
1a1aa173c3 Unstitching sprite sheets, and reorganizing resources to work with MC 1.5 2013-03-04 13:21:29 -05:00
pahimar
e43ba7463b Initial bit of work on 1.5 compatibility 2013-03-04 11:40:40 -05:00
RedRoserade
ab2ac0c064 Minor changes 2013-02-28 14:22:20 +00:00
André Carvalho
e9dc07aade Updated European Portuguese Localization. 2013-02-28 14:14:18 +00:00
pahimar
87c0dfea75 Lots of work on various things 2013-02-26 16:08:43 -05:00
pahimar
0f53144c8f Alchemical Chests have a working inventory/gui now, but still needs the render finished. Alchemical Bags have a half completed inventory/gui (still needs UUIDs and bag data). Commiting for the night because I'm tired :) 2013-02-24 23:03:45 -05:00
pahimar
df33604c43 Some sided work, and the skin for the alchemical chest 2013-02-23 20:25:04 -05:00
pahimar
f3ee8b022d Some GUI work 2013-02-19 10:46:32 -05:00
pahimar
cabf4b9786 Merge pull request #226 from crafteverywhere/patch-8 
Updated zh_CN for the alchemical chest
 2013-02-19 03:37:48 -08:00
crafteverywhere
f32ee2cdd5 Updated zh_TW for the alchemical chest 2013-02-19 17:25:36 +08:00
crafteverywhere
c5536bde6c Updated for the alchemical chest 2013-02-19 17:22:16 +08:00
pahimar
0a2cf2a3a9 Merge pull request #225 from crafteverywhere/patch-7 
Updated for the new EE machine & some fixs
 2013-02-18 19:21:10 -08:00
pahimar
a11577de7e Merge pull request #224 from crafteverywhere/patch-6 
Updated for the new EE machine & some fixs
 2013-02-18 19:21:02 -08:00
pahimar
dc74e1cf7b Lots of work! 2013-02-18 20:13:24 -05:00
crafteverywhere
143e3ad4fc Updated for the new EE machine & some fixs 2013-02-19 09:01:57 +08:00
crafteverywhere
5d593c53cf Updated for the new EE machine & some fixs 2013-02-19 08:58:44 +08:00
pahimar
0a5f552deb Some work on a new EE machine! 2013-02-17 21:30:11 -05:00
pahimar
d998cd00c2 More work on the shared storage GUI 2013-02-17 15:00:36 -05:00
pahimar
223f42a07c Some starting work on the alchemical bag/chest gui 2013-02-17 08:53:35 -05:00
pahimar
ca8d51a5a3 Re-worked the version check to only nag the player in game once per newly detected version. Still need to massage the text a bit and work out how to pull down a changelog. 2013-02-16 15:10:28 -05:00
pahimar
e729971f3b Moving around some of the .xcf files into a more logical place 2013-02-16 09:43:08 -05:00
pahimar
44aea6de97 Merge remote-tracking branch 'origin/master' 2013-02-13 15:52:10 -05:00
pahimar
e8c31c468a Move around some sprites 2013-02-13 15:52:00 -05:00
crafteverywhere
ee0677aa54 Fixed some mistakes for traditional Chinese. 2013-02-14 01:00:55 +08:00
crafteverywhere
04d34793cd fixed many mistakes. 
Hope people don't do this by machine translation,there are so many mistakes in the last version.
 2013-02-11 21:57:33 +08:00
Adam
a3db5e6891 Traditional Chinese mirror to @50Wliu's stuff 
So @50Wliu was having trouble converting simplified to traditional; here's his pull, fixed, and correctly updated to match the simplified changes.
 2013-02-09 01:42:07 -05:00
Wliu
fc74d10bab Update resources/com/pahimar/ee3/lang/zh_CN.xml 
Updated with @anonymouspineapple's changes, and did my own.
Translated the version checks into Chinese.
 2013-02-08 17:52:53 -05:00
OSDemirci
fd7a4841a2 Update resources/com/pahimar/ee3/lang/tr_TR.xml 
Updated according to new entries
 2013-02-01 11:41:31 +02:00
pahimar
11d8fd14f2 Merge pull request #203 from laz2727/master 
JAFU
 2013-01-31 18:14:33 -08:00
pahimar
e2a1a4e160 Merge pull request #202 from anonymouspineapple/patch-32 
Traditional Chinese mirror
 2013-01-31 18:14:26 -08:00
pahimar
15377dc671 Merge pull request #201 from anonymouspineapple/patch-31 
Simplified Chinese localization update
 2013-01-31 18:14:20 -08:00
pahimar
bb4f04629b Merge pull request #200 from philip98/patch-1 
Update resources/com/pahimar/ee3/lang/de_DE.xml
 2013-01-31 18:14:13 -08:00
pahimar
6a0329f73a Some work on the portable transmutation mode for the transmutation stones 2013-01-28 15:52:28 -05:00
ΛAZ27
fc8fb6dc71 JAFU 2013-01-27 12:59:49 +06:00
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
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
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
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
André Carvalho
b170467a53 Updated to reflect latest upstream changes. 2013-01-20 14:11:09 +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
Adam
21dd30b42a Removal of unused commands in pt_BR localization 2013-01-17 20:20:04 -05: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
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
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
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
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
YoWazzup
de090bddd7 Fixed grammar fails in dutch loc. 
Read title.
 2013-01-13 12:20:45 +01: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
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
Santiago Quintero
22f33456c4 Spanish es_ES translation file update 2013-01-10 00:33:52 -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
pahimar
e6ee07e46c Merge pull request #156 from LuzanelL/master 
Update Portuguese(Brazil) pt_BR translation file
 2013-01-06 04:26:20 -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
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
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
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
7b63917b1b Added Finnish localization 2013-01-01 02:12:07 -08:00
Ege
cd14319dda Corrected auto-replace mistakes 2013-01-01 00:55:48 +02:00
Ege
83ae6185d5 Localization add tr_TR 2012-12-31 14:41:44 +02:00
pahimar
984dcd7b4a Some fixes 2012-12-31 03:14:44 -05:00
Pedro Cunha
908d490827 Fixed BOM in localization files 2012-12-30 01:14:49 +00:00
Colonel Rogue
dd7f523791 Update resources/com/pahimar/ee3/lang/la_IT.xml 
Modified standalone infinitives to imperatives
 2012-12-25 21:09:10 -08:00
pahimar
606c968d20 Merge pull request #133 from anonymouspineapple/patch-19 
Removal of duplicate entries
 2012-12-24 13:38:34 -08:00
pahimar
3dc7af889b Merge pull request #132 from anonymouspineapple/patch-18 
Updated Red Water translations
 2012-12-24 13:38:16 -08:00
pahimar
6c8551277e Merge pull request #134 from anonymouspineapple/patch-20 
Removed impure / pure
 2012-12-24 13:38:00 -08:00
Adam
2c30734d29 Removal of Latin impure / pure 2012-12-23 22:23:44 -05:00
Adam
19f13dfa99 Removed impure / pure 2012-12-23 22:23:01 -05:00
Adam
1f77317d8a Removal of duplicate entries 2012-12-23 22:18:59 -05:00
Adam
47e27da3ec Updated Red Water translations 
Parentheses for consistency's sake and capitalization too.
 2012-12-23 22:06:05 -05:00
pahimar
754bd0bf48 Some more command stuff, and re-organizing the resources to fit the new package structure 2012-12-21 10:25:18 -05:00
Adam
0806bb9ec3 Updated Alchemy Bag capitalization + colors 
Capitalized everything for consistency, changed colors to match those used in the vanilla game, and fixed a typo (Irridiscente) found by my Italian-speaking friend.
 2012-12-20 19:25:05 -05:00
Andrea Ruggiero
efd7bc70d1 Update resources/ee3/lang/it_IT.xml 2012-12-18 14:00:58 +01:00
Lure
720b2136d1 Merge pull request #16 from anonymouspineapple/patch-16 
Better "extra" translation for Traditional Chinese
 2012-12-17 13:16:55 -08:00
pahimar
e03797f1ca Repackaging EE3 packages/classes to better match up with the MC repackaging 2012-12-17 15:21:53 -05:00
Adam
70f72600d6 Better "extra" translation for Traditional Chinese 2012-12-16 19:00:29 -05:00
Andrea Ruggiero
3fb39a911e Update resources/ee3/lang/it_IT.xml 2012-12-14 21:15:55 +01:00
pahimar
a5a8f32683 Merge pull request #113 from Cakejoke/master 
German localization update
 2012-12-14 09:30:18 -08:00
pahimar
7a311262c6 Merge pull request #114 from LuzanelL/master 
Chinese(Simplified and Traditional ) Localization Update
 2012-12-14 09:29:11 -08:00
iggythemad
9630571357 Update resources/ee3/lang/pl_PL.xml 
Revised and updated for the new entries.
 2012-12-14 11:18:30 +00:00
Lure
83cf510248 Merge pull request #12 from anonymouspineapple/patch-13 
Chinese localization update
 2012-12-13 15:16:36 -08:00
Lure
92c3c1475a Merge pull request #13 from anonymouspineapple/patch-14 
Updated Traditional Chinese localization
 2012-12-13 15:16:03 -08:00
Cakejoke
c18009af2e Update german localization 2012-12-13 18:11:51 +01:00
pahimar
45a2c97c81 Merge pull request #110 from laz2727/master 
JAFU
 2012-12-13 07:05:57 -08:00
Adam
4153f76464 Traditional Chinese update 2012-12-12 22:36:31 -05:00
Adam
00753aa99e "Extra" translation for Chinese 2012-12-12 22:34:45 -05:00
pahimar
9ece2719de Fixed some formatting derps 2012-12-11 11:29:49 -05:00
ΛAZ27
77189cffb9 JAFU 2012-12-10 22:16:44 +06:00
pahimar
e11c48abfb Merge pull request #104 from remuladgryta/master 
Updated Swedish localization
 2012-12-10 06:39:37 -08:00
pahimar
b608563114 Merge pull request #105 from RedRoserade/master 
Updated European Portuguese translation file
 2012-12-10 06:39:15 -08:00
pahimar
870fa5eebc Merge pull request #107 from LuzanelL/master 
Chinese(Simplified and Traditional ) Localization Update
 2012-12-10 06:38:55 -08:00
TJ
d4603139b8 Latin Localization Update 2012-12-09 22:35:44 -08:00
Lure
88395b35a1 Merge pull request #11 from anonymouspineapple/patch-12 
Updated Traditional Chinese localization
 2012-12-09 17:28:45 -08:00
Adam
f7cf338601 Updated Traditional Chinese localization 
To match the simplified changes.
 2012-12-09 20:26:53 -05:00
Adam
feb8b7eeea Updated Chinese calcinators 
Better translation, as well as reordering to match English one.
 2012-12-09 20:25:08 -05:00
André Carvalho
275fbf5288 Long overdue update to the pt_PT translation 
Sorry for the delay.
The translation file has been updated to reflect upstream changes.
 2012-12-07 11:44:51 +00:00
remuladgryta
b905c60250 Updated Swedish localization 2012-12-07 10:05:25 +01:00
Adam
0d7199ccd4 Removed duplicate Red Water entries 2012-12-05 18:04:06 -05:00
pahimar
3e708574d7 Merge pull request #101 from LuzanelL/master 
Updated formatting for Czech localization file
 2012-12-04 07:43:50 -08:00
Dion Williams
9753091d29 Updated Welsh localisation with alchemical bag names and revised version checker messages 2012-12-04 15:16:14 +00:00
Adam
44f951b924 Updated formatting for Czech localization file 
Reordered terms to match the rest of the files, for consistency's sake.
 2012-12-03 18:42:32 -05:00
Lure
b1473dfe35 Merge pull request #7 from anonymouspineapple/patch-8 
Japanese alchemy bags
 2012-12-02 19:27:57 -08:00
Adam
9624b1067a Japanese alchemy bags 
In this context the term 奇術 to mean "alchemical" is a tad more logical than 錬金術 IMO.
 2012-12-02 21:17:10 -05:00
Lure
66534f127d Merge pull request #6 from anonymouspineapple/patch-7 
Spanish alchemy bags
 2012-12-02 15:45:51 -08:00
Adam
b106fed3ba Spanish alchemy bags 2012-12-02 17:54:22 -05:00