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

869 commits

This branch
This branch
All branches
Author SHA1 Message Date
pahimar
c012aab4a9 A little extra work on getting the lid working :) 2013-02-25 16:03:45 -05:00
pahimar
3c4c6a60f8 Alchemical Chest renders in world now, only thing remaining is TE data on the lid angle. Will handle in the morning. 2013-02-25 00:33:21 -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
pahimar
2ae95763df Merge pull request #227 from crafteverywhere/patch-9 
Updated zh_TW for the alchemical chest
 2013-02-19 03:37:42 -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
4192236cd8 Some more rendering work on the new block, and a simplification to the Calcinator model 2013-02-18 18:00:25 -05:00
pahimar
214bb9e7d5 More work on the new block! 2013-02-18 13:55:57 -05: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
3be4bc05eb Small changes 2013-02-16 17:49:33 -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
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