pahimar
4cd352c7dc
Merge remote-tracking branch 'refs/remotes/origin/master'
2013-03-19 10:41:57 -04:00
pahimar
5bc6c54e83
Testing some new version check functionality (different release types)
2013-03-19 10:38:34 -04:00
pahimar
0eb764a237
Merge pull request #259 from CaptainShadows/master
...
Updated es_ES.xml
2013-03-19 06:03:02 -07:00
pahimar
6ed5b2150f
Merge pull request #260 from crafteverywhere/patch-1
...
Update zh_CN.xml
2013-03-19 06:02:44 -07:00
pahimar
80007e00d4
Merge pull request #261 from crafteverywhere/patch-3
...
Update zh_TW.xml
2013-03-19 06:02:34 -07:00
pahimar
bd6700f62e
Merge pull request #262 from Cakejoke/master
...
German localization update
2013-03-19 06:02:23 -07:00
pahimar
373837812c
Merge pull request #265 from PizzAna/master
...
Updated Finnish localization and tweaked some old translates
2013-03-19 06:01:52 -07:00
pahimar
a36373ff33
Merge pull request #267 from N00byEdge/patch-2
...
Update sv_SE.xml
2013-03-19 06:01:07 -07:00
N00byEdge
7cb9469f6a
Update sv_SE.xml
...
Removed all bag colours, added translation for bags in general.
2013-03-19 08:26:38 +01:00
pahimar
bf864e3f88
Simplify some stuff related to the new OBJ loading
2013-03-18 22:37:03 -04:00
pahimar
3a3afc4651
Fix import
2013-03-18 20:42:05 -04:00
pahimar
2749f79aba
Merge pull request #263 from aginsun/patch-1
...
Letting arrow death work
2013-03-17 15:25:15 -07:00
crafteverywhere
b8e20c8e54
Update zh_TW.xml
2013-03-17 21:33:21 +08:00
crafteverywhere
a795f6f8ec
Update zh_TW.xml
2013-03-17 21:26:50 +08:00
N00byEdge
d2758dc53c
Update sv_SE.xml
...
Updated for 1.5 :)
2013-03-17 12:05:45 +01:00
crafteverywhere
9c7c8a5032
Update zh_TW.xml
2013-03-17 11:14:30 +08:00
PizzAna
d2a2a40cd7
Updated Finnish localization and tweaked some translates
2013-03-16 23:46:33 +02:00
aginsun
27962c6351
Letting arrow death work
...
makes it so that when mobs killed with a bow have a chance of dropping minium shards.
2013-03-16 12:50:54 +01:00
Cakejoke
a53f3f7b74
Update german localization
2013-03-16 12:20:56 +01:00
Roman Sandu
e1e898e717
Russian translations update.
...
Whoops, I missed one <entry>, and forgot about header <comment>.
2013-03-16 14:05:03 +04:00
crafteverywhere
3eafe3a360
Update zh_TW.xml
2013-03-16 12:44:05 +08:00
crafteverywhere
23f639d72b
Update zh_CN.xml
2013-03-16 12:40:58 +08:00
Captain of all Shadows
5bc10a4b46
es_ES updated to 1.5
...
Updated the Spanish traslation file to the newest version of EE3
2013-03-15 17:27:15 -04:00
Roman Sandu
1e6f916773
Fixed and updated Russian translations.
...
Current Russian translations make all my friends(and not only them, any Russian people) laugh. They were made using google translate, and most of them are not correct. Now fixed(I am from Russia).
P.S.
Updated it to latest en_US translations.
2013-03-15 23:44:14 +04:00
pahimar
fe153ca8bb
Cleanup
2013-03-15 15:20:17 -04:00
pahimar
1f9f579663
More pruning
2013-03-15 15:18:01 -04:00
pahimar
7a8ac2650b
Dropping the free form geometry portion of the loader (since it wasn't implemented anyways). Can be added again (and actually implemented) in the future if folks need it
2013-03-14 22:55:11 -04:00
pahimar
d2b27fc7c7
More parring down of OBJ loading; still to be pretty-fied.
2013-03-14 22:40:05 -04:00
pahimar
ee1e091e9c
Cleanup pass (should really do these before committing changes...)
2013-03-14 22:32:24 -04:00
pahimar
51df757c9c
Faces now store the GL drawing mode for them, and updated the Models of EE3 to reflect this (it simplifies things). More work still coming on the OBJ stuff before its ready for MCForge
2013-03-14 22:31:47 -04:00
pahimar
d27009d621
Source cleanup pass
2013-03-14 22:23:02 -04:00
pahimar
164affe403
Shrink the block boundaries of the Calcinator to match its model, clean up the WavefrontObject class some more
2013-03-14 22:22:01 -04:00
pahimar
3ea9614926
Fix the Transmutation Overlay to work with MC 1.5, and temporarily storing some classes I'm working on for OBJ model loading in MCForge
2013-03-14 22:14:02 -04:00
pahimar
80c7d7fdb4
Merge pull request #253 from Kehlim/master
...
(Correction) Updated german translation
2013-03-13 04:44:24 -07:00
Kehlim
db37134dd5
Updated german translation
...
alright! now with new localization and correct tags.
I changed the translation of the inert stone to the correct german word
2013-03-12 22:05:22 +01:00
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
