pahimar
a37685ff8d
Goofed and had two comments, corrected now
2012-10-26 10:30:34 -04:00
pahimar
5778be58ec
Merge remote-tracking branch 'origin/master'
...
Conflicts:
resources/ee3/lang/pt_PT.xml
2012-10-26 10:23:32 -04:00
pahimar
8c292e1e7b
Updating the Portugese version as per RedRoserade's PR ( #29 )
2012-10-26 10:21:32 -04:00
pahimar
e1ae788ee8
Merge pull request #41 from laz2727/master
...
RU localization file update
2012-10-26 07:17:45 -07:00
pahimar
070694ff79
Merge pull request #42 from 0xXxDEADxXx0/sv-SE
...
Updated Swedish translation!
2012-10-26 07:17:20 -07:00
pahimar
a710484361
Merge pull request #43 from Pyker/master
...
Update Portuguese translation
2012-10-26 07:17:12 -07:00
pahimar
5499a1c1c3
Updated the build script to automagically inject the version number from the build properties into the code and mcmod.info file
2012-10-26 10:14:46 -04:00
Pedro Cunha
457de818e4
Updated pt-PT translation
2012-10-26 12:50:36 +01:00
0xXxDEADxXx0
6a85283094
Updated Swedish translation
...
I updated Swdish translation before the prerelase.
Fixed some strange spelling and added Inert Stone
2012-10-26 11:40:22 +02:00
ΛAZ27
b034652c27
RU localization file update
2012-10-26 13:21:40 +06:00
pahimar
3cd83d283c
Clean up some references, and getting ready for the ant build file to auto fill in version details at build time
2012-10-25 22:17:19 -04:00
pahimar
c32bf44d61
Changed out the temp recipe for the Minium Stone to use an Inert Stone instead of a diamond
2012-10-25 22:13:25 -04:00
pahimar
1f63826b6f
Updated the build ant script for MC 1.4.2
2012-10-25 21:56:40 -04:00
pahimar
3e9c60a39c
Getting closer to pre1!
2012-10-25 20:55:26 -04:00
pahimar
4c35f7810c
Fix some file encodings for localizations (remember it HAS to be UTF-8 folks) and fix the Portable Crafting GUI to show labels
2012-10-24 22:08:10 -04:00
pahimar
f47d87f639
Merge remote-tracking branch 'origin/master'
2012-10-24 21:53:51 -04:00
pahimar
4e8cbd16f9
Make a Colours lib and "abstact" some textures to grayscale (we can recolour them with colour overlays and reuse the texture more efficiently)
2012-10-24 21:53:41 -04:00
pahimar
4f509ebdb1
When I localized key bindings, I missed updating the KeyPressed packet to also accomodate the change - whoops!
2012-10-23 22:01:41 -04:00
pahimar
30c0d78eba
Merge pull request #25 from aritzhack/master
...
Added Spanish-Spain (es-ES) translation
2012-10-22 09:27:54 -07:00
pahimar
ee5d45b2b2
Merge pull request #36 from mnn/master
...
Czech translation
2012-10-22 09:27:22 -07:00
pahimar
7a0d09f7c1
Merge pull request #37 from 0xXxDEADxXx0/sv-SE
...
Updated Swedish translation
2012-10-22 09:27:00 -07:00
pahimar
6958969944
Merge pull request #38 from phpr/master
...
French Localization
2012-10-22 09:26:45 -07:00
phpr
04d70e77fc
Update Localizations.java file for the French version
2012-10-22 18:21:57 +02:00
phpr
160add5837
French Localization
2012-10-22 18:21:25 +02:00
aritzhack
4af874ba70
Updated the Spanish-Spain (ES-es) translation on 22/10/2012
...
Signed-off-by: aritzhack <aritzhack@gmail.com>
2012-10-22 15:47:32 +02:00
aritzhack
9e56c39703
Merge remote-tracking branch 'upstream/master'
2012-10-22 15:37:44 +02:00
0xXxDEADxXx0
1caccc8dce
Updated Swedish translation
2012-10-22 12:40:15 +02:00
moen
833ed52d63
Updated Czech translation file.
2012-10-22 09:56:08 +02:00
moen
64ce176250
Merge branch 'master' of https://github.com/mnn/Equivalent-Exchange-3
2012-10-22 09:54:16 +02:00
pahimar
cfb4d74002
Update naming to MC 1.4
2012-10-21 22:39:43 -04:00
pahimar
8957e6ae34
Merge pull request #33 from Brammm/master
...
Updated Dutch translations.
2012-10-21 19:04:22 -07:00
pahimar
fbc09b61de
Merge pull request #28 from laz2727/master
...
RU localization file update
2012-10-21 19:02:00 -07:00
pahimar
3f1664c322
getPrev done
2012-10-21 19:56:52 -04:00
Bram Van der Sype
72eee45753
Updated Dutch translations
...
If possible, we should have some context for the key words. It's hard to
translate them sometimes without knowing what the context will be. I'm
guessing they'll be used for the keybindings?
2012-10-19 10:43:40 +02:00
pahimar
d0036f1d85
Getting the Equivalency Handler back online, finishing it up tonight
2012-10-17 16:01:43 -04:00
pahimar
95f5230d24
Basic get/sets for the EMCRegistry
2012-10-16 13:31:27 -04:00
pahimar
e666b0f546
Fix some whitespace issues, and some renames for EMC types
2012-10-16 10:38:31 -04:00
pahimar
eeadd08ef0
TINY bit more work before bed
2012-10-15 21:56:50 -04:00
pahimar
040500292d
tab cleanup in comments, might take the whole table out of the comments
2012-10-15 21:45:38 -04:00
pahimar
fa94dc6d5e
Some work on the DynEMC system
2012-10-15 21:42:57 -04:00
ΛAZ27
9861d701cd
RU localization file update
2012-10-12 22:23:05 +06:00
pahimar
51bd858f8b
First fledging steps into in world transmutation again (more tomorrow), and localized the key bindings
2012-10-11 21:47:35 -04:00
pahimar
156eaa9d17
After catching that ExtraBiomes and BuildCraft had their own Logger (and how they did it), I went about doing it for EE3 :)
2012-10-11 21:17:40 -04:00
pahimar
4053cdf2d3
Proper EE3 logger, the start of it at least
2012-10-11 16:05:02 -04:00
pahimar
792543eaac
Localized the name of the Calcinator in its Gui
2012-10-11 13:33:50 -04:00
pahimar
4f188ca935
Config options to enable/disable the version check, updated lang (en_US) with final version check text, reports in the log where it is checking the version number
2012-10-11 13:23:21 -04:00
pahimar
9d69168a5e
Add a value for the @Instance annotation, thanks iChun for pointing out my failures in life :-p
2012-10-09 15:14:02 -04:00
pahimar
c211e0ab2e
The Calcinator now renders as a 3D object when dropped in world, held in hand, or in the players inventory. Thanks Soaryn for the help!
2012-10-09 15:03:19 -04:00
pahimar
a985fc9bac
Fix up some Z conflicts, seam issues, and simplified the model code further
2012-10-04 15:02:34 -04:00
pahimar
6fd34ac357
Merge remote-tracking branch 'origin/master'
2012-10-04 08:00:10 -04:00
