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

848 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pahimar
306fa616b2 Merge pull request #221 from crafteverywhere/patch-5 
Fixed some mistakes for traditional Chinese.
 2013-02-13 09:09:51 -08:00
crafteverywhere
ee0677aa54 Fixed some mistakes for traditional Chinese. 2013-02-14 01:00:55 +08:00
pahimar
455307b193 Some more work on the calcinator 2013-02-12 21:47:17 -05:00
pahimar
79abcd0991 Some brief Calcinator work, continuing more tonight 2013-02-12 16:02:40 -05:00
pahimar
8a532daa1e Merge pull request #219 from crafteverywhere/patch-3 
fixed many mistakes.
 2013-02-12 07:18:15 -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
pahimar
4d5bc77bd6 Merge pull request #216 from anonymouspineapple/patch-36 
Traditional Chinese mirror to @50Wliu's stuff
 2013-02-09 09:01:46 -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
pahimar
d2a77d255f Merge pull request #214 from 50Wliu/Localization 
Localization update (zh_CN)
 2013-02-08 15:06:45 -08: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
Wliu
180831ab86 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 into Localization 2013-02-08 14:50:58 -05:00
pahimar
f6e5e2fdbf Merge remote-tracking branch 'origin/master' 2013-02-04 08:03:21 -05:00
pahimar
d24b4d1b45 Packetized charging sounds for the PStone (got missed before) 2013-02-04 08:03:10 -05:00
pahimar
4b986ed57f Merge pull request #205 from OSDemirci/patch-2 
Update resources/com/pahimar/ee3/lang/tr_TR.xml
 2013-02-02 13:33:32 -08:00
pahimar
a5505ed3af Merge pull request #210 from Vazkii/patch-1 
Make GeneralHelper.isHostileEntity apply to all mobs. We'll give this a go
 2013-02-02 13:30:53 -08:00
Vazkii
8cc805ca4d Make GeneralHelper.isHostileEntity apply to all mobs 
Not all mobs extend EntityMob (e.g. Ghasts), the interface IMob, trough, encompasses all mobs.
 2013-02-02 20:55:01 +00: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
17439563ff Merge pull request #204 from 50Wliu/README 
Update README.md
 2013-01-31 18:13:51 -08:00
Wliu
3d08090dd8 Update README.md 
More apparent warning messages.
Made the Contributing section a bit better.
Minor stuff.
 2013-01-31 20:32:12 -05:00
Wliu
8b90504af3 Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 into Localization 2013-01-31 20:21:18 -05:00
Wliu
eeb861ab0e Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3 into README 2013-01-31 20:20:04 -05:00
Wliu
92f606d611 Preparing to update Repo 2013-01-31 20:19:57 -05:00
pahimar
113e36572f Some more portable transmutation work, added a new NBT tag for it and refactored the existing one. GUI/Container for it still to be finished 2013-01-29 22:15:59 -05: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
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