Commit graph

909 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
pahimar
3aa77ce260 Merge pull request #252 from pupaxxo/patch-5
Update it_IT.xml now correct :)
2013-03-12 08:16:26 -07:00
Andrea Ruggiero
4962a72f71 Update it_IT.xml 2013-03-12 16:09:33 +01:00
moen
f47daba3c3 Merge branch 'master' of github.com:mnn/Equivalent-Exchange-3
Conflicts:
	resources/com/pahimar/ee3/lang/cs_CZ.xml
2013-03-12 14:08:32 +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
2a4d2eedcb Code cleanup 2013-03-11 23:24:05 -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
f58258f8f0 Merge branch 'refs/heads/snapshot_1_5' 2013-03-09 15:23:09 -05:00
pahimar
af59bc543c Models 2013-03-09 15:21:11 -05:00
pahimar
4e7c8ebdc5 Javadoc related updates and code cleanup 2013-03-08 13:40:59 -05:00
pahimar
6a8098ecbc Alchemical Bags can now be dyed 2013-03-07 22:45:55 -05:00
pahimar
509cc8f6ca Calcinator and Aludel now support custom names, some work on getting Alchemical Bags to support being dyed 2013-03-07 21:26:42 -05:00
pahimar
7326032b24 TileEE's properly synch custom NBT data, and Alchemical Chests properly display custom inventory names. 2013-03-07 16:12:19 -05:00
pahimar
72830edbaa Suppress some warnings we can't do anything about right now 2013-03-06 21:52:30 -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
987689d193 Fix saving of configuration related changes 2013-03-05 23:51:29 -05:00
pahimar
c9cb29ede5 Fix up more of the rendering stuff for 1.5 2013-03-05 16:17:54 -05:00
moen
ce1e12c781 Updated czech translation. 2013-03-05 19:37:26 +01: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
e3f6491c4f More 1.5 port work (and general cleanup). Still doesn't build yet. 2013-03-04 16:02:24 -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
77697c78b2 Fixes Issue #230 2013-02-26 11:43:40 -05:00
pahimar
676200a1d5 Alchemical Chest lid functions properly, and shift click functionality 2013-02-25 22:00:57 -05:00
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