Commit graph

231 commits

Author SHA1 Message Date
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
pahimar 9ae515a930 Getting ready for more Calcination 2012-10-04 07:59:46 -04:00
pahimar 5a11cc8142 Pull out the model from RenderCalcinator into its own Model class, for better IItemRenderer 2012-10-03 21:19:17 -04:00
pahimar 640a1cbb56 Merge remote-tracking branch 'origin/master' 2012-10-02 22:01:15 -04:00
pahimar b22f6dae4f Adding a fuel handler 2012-10-02 22:00:43 -04:00
pahimar e302df5b95 Merge remote-tracking branch 'origin/master' 2012-10-01 15:18:52 -04:00
pahimar fd5e247c59 Increase the size of the Calcinator GUI, and save the GIMP image files to the resources for easier modification by the masses 2012-10-01 15:18:38 -04:00
pahimar 1cbfb94d86 Simplify the loading of localization files now that our localization PR has been merged into FML and Forge 2012-09-29 21:48:44 -04:00
aritzhack eaa6037e0c Forgot to the translation to the Localizations.java 2012-09-29 16:20:59 +02:00
aritzhack dfca02b523 Added Spanish-Spain (es-ES) translation 2012-09-29 15:57:05 +02:00
pahimar 6d9ce5367b Merge remote-tracking branch 'origin/master' 2012-09-28 16:05:46 -04:00
pahimar eccf3082b8 Working on getting the Calcinator working 2012-09-28 16:05:29 -04:00
moen 85fc9df277 Added Czech translation. 2012-09-28 18:37:00 +02:00
pahimar eda9625786 Merge pull request #22 from ulikoehler/linuxbuild
Linux support and bugfix in build.xml
2012-09-28 09:18:10 -07:00
pahimar f8786ceb5b UTF-8 encoded pt_PT localization 2012-09-28 11:28:36 -04:00
pahimar ea92584788 Adding a bunch of user contributed localizations (thanks guys!) 2012-09-28 11:19:13 -04:00
pahimar 7a7cdf8483 Merge remote-tracking branch 'origin/master' 2012-09-28 11:11:08 -04:00
pahimar 82a40e82c8 Updated the configuration handler to no longer use deprecated methods, and adjusted the default ids to be in line with my requested range from the MinecraftForge website. 2012-09-28 11:10:55 -04:00
pahimar 20e29782c8 Merge pull request #14 from dionrhys/welsh-localisation
Add Welsh Localisation
2012-09-28 08:07:01 -07:00
Uli Köhler bd42969ae1 Removed ee3_server directory from build target (doesn't exist any more)
Added Linux targets for recompile and reobfuscate
2012-09-27 23:45:27 +02:00
Dion Williams 317abb063b Add Welsh Localisation 2012-09-26 21:29:37 +01:00
pahimar 603d74b732 Merge pull request #13 from Brammm/master
Made small adjustment
2012-09-26 12:50:11 -07:00
pahimar d63558bc52 Fixed calling of non-static method 2012-09-26 15:45:06 -04:00
pahimar 632825181e Fixing a typo 2012-09-26 15:42:40 -04:00
pahimar 60c5abe720 Switch to loading the file from URL 2012-09-26 15:13:21 -04:00
Bram Van der Sype 7687e8c628 Adjusted connection_error 2012-09-26 21:05:17 +02:00