Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3

README.md

@@ -0,0 +1,28 @@
+## Welcome to Equivalent Exchange 3!
+The Compilation part (Setup) was done mostly by Minalien, I just changed it a bit.  Some credit goes to BuildCraft's README.md, which I based this README off of.
+
+The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3).
+
+### Compiling Equivalent Exchange 3
+IMPORTANT: This is not guaranteed to work as it has not been tested extensively (only done on Linux so far, partly on Windows).
+____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________
+#### Setup MCP
+1. Create an empty directory for EE3 development. This directory is referenced as `mcdev` from now on.
+2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary.
+3. Install Apache Ant [here] (ant.apache.org.)
+3. Inside `mcdev`, create a directory named `mcp` and unzip the MCP ZIP file into it
+4. To verify, check if a file name `CHANGELOG` exists inside the mcp directory.
+5. Get a clean (unmodded!) copy of minecraft. Currently EE3 runs on 1.4.2 but that might have changed.
+6. From your .minecraft directory, copy the bin and the resources directory to the `jars` directory inside `mcp`.
+7. Get a clean (unmodded!) copy of minecraft_server.jar and also place it into `jars`.
+8. Download the latest forge source for Minecraft 1.4.2 and unzip it into `mcp` so that `mcp/forge/install.sh` exists. You need at least Forge 6.0.1, best way is to get it from [here] (http://files.minecraftforge.net/): http://files.minecraftforge.net/ NOTE: 6.0.1.355 was the last version to support 1.4.2, do not get anything later than that for 1.4.2 versions of EE3!
+9. Execute `mcdev/mcp/forge/install.sh` or `mcp/forge/install.cmd`, depending on your platform. On Linux you might have to `chmod +x` `install.sh` before you can execute it. On some system configurations you need to execute `install.sh` from within the forge directory whereas on others it doesn't matter. Just check the output for error messages to find out what you need to do.
+
+#### Setup EE3
+1. Inside `mcdev`, create a directory named `source`. Clone EE3 into this directory.
+2. [FOR WINDOWS] Open up cmd.  Type `cmd` in Run.
+3. [FOR WINDOWS] Navigate to `mcdev\source` by executing `cd [wherever your mcdev is located, just copy and paste the path in]`.
+2. Inside `sources\Equivalent-Exchange-3` execute `ant build -Ddir.development=../../`. If you've done everything right, BUILD SUCCESSFUL is displayed.
+3. Execute `ant recompile -Ddir.development=../../`.
+4. Execute `ant reobfuscate -Ddir.development=../../`.
+5. If you've done everything right AND the source code currently compiles, you can execute startclient.sh or startclient.bat inside the mcp directory now to start Minecraft with EE3.

ee3_client/ee3/client/core/handlers/SoundHandler.java

@@ -27,10 +27,9 @@ public class SoundHandler {
         for (String soundFile : Sounds.soundFiles) {
             // Try to add the custom sound file to the pool of sounds
             try {
-                event.manager.addSound(soundFile, new File(this.getClass().getResource("/" + soundFile).toURI()));
+                event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile));
             }
-            // If we cannot add the custom sound file to the pool, log the
+            // If we cannot add the custom sound file to the pool, log the exception
-            // exception
             catch (Exception e) {
                 LogHelper.log(Level.WARNING, "Failed loading sound file: " + soundFile);
             }

ee3_client/ee3/client/core/helper/RenderUtils.java

@@ -0,0 +1,47 @@
+package ee3.client.core.helper;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.src.FontRenderer;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.RenderEngine;
+import net.minecraft.src.Tessellator;
+
+public class RenderUtils {
+
+    public static void renderItemIntoGUI(FontRenderer fontRenderer, RenderEngine renderEngine, ItemStack stack, int x, int y) {
+
+        int itemID = stack.itemID;
+        int meta = stack.getItemDamage();
+        int iconIndex = stack.getIconIndex();
+
+        GL11.glDisable(GL11.GL_LIGHTING);
+
+        renderEngine.bindTexture(renderEngine.getTexture(stack.getItem().getTextureFile()));
+
+        int overlayColour = Item.itemsList[itemID].getColorFromItemStack(stack, 0);
+        float var17 = (float) (overlayColour >> 16 & 255) / 255.0F;
+        float var16 = (float) (overlayColour >> 8 & 255) / 255.0F;
+        float var12 = (float) (overlayColour & 255) / 255.0F;
+
+        GL11.glColor4f(var17, var16, var12, 1.0F);
+
+        drawTexturedQuad(x, y, iconIndex % 16 * 16*4, iconIndex / 16 * 16*4, 16*4, 16*4, -90);
+        GL11.glEnable(GL11.GL_LIGHTING);
+    }
+
+    public static void drawTexturedQuad(int x, int y, int u, int v, int width, int height, double zLevel) {
+
+        float var7 = 0.00390625F/4;
+        float var8 = 0.00390625F/4;
+        Tessellator var9 = Tessellator.instance;
+        var9.startDrawingQuads();
+        var9.addVertexWithUV(x + 0, y + height, zLevel, (u + 0) * var7, (v + height) * var8);
+        var9.addVertexWithUV(x + width, y + height, zLevel, (u + width) * var7, (v + height) * var8);
+        var9.addVertexWithUV(x + width, y + 0, zLevel, (u + width) * var7, (v + 0) * var8);
+        var9.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * var7, (v + 0) * var8);
+        var9.draw();
+    }
+
+}

ee3_common/ee3/common/EquivalentExchange3.java

@@ -28,6 +28,7 @@ import ee3.common.core.handlers.ItemPickupHandler;
 import ee3.common.core.handlers.LocalizationHandler;
 import ee3.common.core.handlers.PacketHandler;
 import ee3.common.core.handlers.PlayerDestroyItemHandler;
+import ee3.common.core.handlers.RenderTickHandler;
 import ee3.common.core.handlers.VersionCheckTickHandler;
 import ee3.common.core.helper.LogHelper;
 import ee3.common.core.helper.VersionHelper;
@@ -78,6 +79,9 @@ public class EquivalentExchange3 {
         // Initialize the Version Check Tick Handler (Client only)
         TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT);
         
+        // Initialize the Render Tick Handler (Client only)
+        TickRegistry.registerTickHandler(new RenderTickHandler(), Side.CLIENT);
+        
         // Register the KeyBinding Handler (Client only)
         proxy.registerKeyBindingHandler();
 

ee3_common/ee3/common/core/handlers/RenderTickHandler.java

@@ -0,0 +1,93 @@
+package ee3.common.core.handlers;
+
+import java.util.EnumSet;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.RenderHelper;
+import net.minecraft.src.RenderItem;
+import net.minecraft.src.ScaledResolution;
+
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.ITickHandler;
+import cpw.mods.fml.common.TickType;
+import ee3.client.core.helper.RenderUtils;
+import ee3.common.core.helper.VersionHelper;
+import ee3.common.item.ItemPhilosopherStone;
+import ee3.common.lib.ConfigurationSettings;
+import ee3.common.lib.Reference;
+
+public class RenderTickHandler implements ITickHandler {
+
+    @Override
+    public void tickStart(EnumSet<TickType> type, Object... tickData) {
+
+    }
+
+    @Override
+    public void tickEnd(EnumSet<TickType> type, Object... tickData) {
+
+        Minecraft minecraft = FMLClientHandler.instance().getClient();
+        EntityPlayer player = minecraft.thePlayer;
+        ItemStack currentItemStack = null;
+
+        if (type.contains(TickType.RENDER)) {
+            if (player != null) {
+                currentItemStack = player.inventory.getCurrentItem();
+            }
+
+            if ((player != null) && (currentItemStack != null) && (minecraft.inGameHasFocus) && (currentItemStack.getItem() instanceof ItemPhilosopherStone)) {
+                renderStoneHUD(minecraft, player, currentItemStack, (Float) tickData[0]);
+            }
+        }
+    }
+
+    @Override
+    public EnumSet<TickType> ticks() {
+
+        return EnumSet.of(TickType.CLIENT, TickType.CLIENTGUI, TickType.RENDER);
+    }
+
+    @Override
+    public String getLabel() {
+
+        return Reference.MOD_NAME + ": " + this.getClass().getSimpleName();
+    }
+
+    private static void renderStoneHUD(Minecraft minecraft, EntityPlayer player, ItemStack stack, float partialTicks) {
+ 
+        int loc = player.inventory.currentItem*20;
+        int shift = player.capabilities.isCreativeMode?0:20;
+        GL11.glPushMatrix();
+        
+            ScaledResolution sr = new ScaledResolution(minecraft.gameSettings, minecraft.displayWidth, minecraft.displayHeight);
+            GL11.glClear(256);
+            GL11.glMatrixMode(GL11.GL_PROJECTION);
+            GL11.glLoadIdentity();
+            GL11.glOrtho(0.0D, sr.getScaledWidth_double(), sr.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D);
+            GL11.glMatrixMode(GL11.GL_MODELVIEW);
+            GL11.glLoadIdentity();
+            GL11.glTranslatef(0.0F, 0.0F, -2000.0F);
+            int k = sr.getScaledWidth();
+            int l = sr.getScaledHeight();
+            
+            GL11.glPushMatrix();
+                RenderHelper.enableGUIStandardItemLighting();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+                GL11.glEnable(GL11.GL_COLOR_MATERIAL);
+                GL11.glEnable(GL11.GL_LIGHTING);
+                RenderItem itemRenderer = new RenderItem();
+                RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, 0, 0);
+                //itemRenderer.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, 0, 0);
+                GL11.glDisable(GL11.GL_LIGHTING);
+            GL11.glPopMatrix();
+        
+        GL11.glPopMatrix();
+    }
+
+}

ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java

@@ -4,7 +4,9 @@ import java.util.EnumSet;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.ITickHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.TickType;
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import ee3.common.core.helper.VersionHelper;
 import ee3.common.lib.Colours;
 import ee3.common.lib.ConfigurationSettings;
@@ -13,7 +15,8 @@ import ee3.common.lib.Reference;
 /**
  * VersionCheckTickHandler
  * 
- * Class for notifying the player on their client when they get in game the outcome of the remote version check
+ * Class for notifying the player on their client when they get in game the
+ * outcome of the remote version check
  * 
  * @author pahimar
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
@@ -21,37 +24,42 @@ import ee3.common.lib.Reference;
  */
 public class VersionCheckTickHandler implements ITickHandler {
 
-	private static boolean initialized = false;
+    private static boolean initialized = false;
-	
-	@Override
-	public void tickStart(EnumSet<TickType> type, Object... tickData) { }
 
-	@Override
+    @Override
-	public void tickEnd(EnumSet<TickType> type, Object... tickData) {
+    public void tickStart(EnumSet<TickType> type, Object... tickData) {
-		if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
-			if (!initialized) {
-				for (TickType tickType : type) {
-					if (tickType == TickType.CLIENT) {
-						if (FMLClientHandler.instance().getClient().currentScreen == null) {
-							initialized = true;
-							if (VersionHelper.result != VersionHelper.CURRENT){ 
-							    FMLClientHandler.instance().getClient().ingameGUI.getChatGUI().printChatMessage(Colours.VERSION_CHECK_PREFIX + "[" + Reference.MOD_NAME + "] " + VersionHelper.getResultMessage());
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 
-	@Override
+    }
-	public EnumSet<TickType> ticks() {
+
-		return EnumSet.of(TickType.CLIENT);
+    @Override
-	}
+    public void tickEnd(EnumSet<TickType> type, Object... tickData) {
+
+        if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
+            if (!initialized) {
+                for (TickType tickType : type) {
+                    if (tickType == TickType.CLIENT) {
+                        if (FMLClientHandler.instance().getClient().currentScreen == null) {
+                            initialized = true;
+                            if (VersionHelper.result == VersionHelper.OUTDATED) {
+                                FMLClientHandler.instance().getClient().ingameGUI.getChatGUI().printChatMessage(VersionHelper.getResultMessageForClient());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public EnumSet<TickType> ticks() {
+
+        return EnumSet.of(TickType.CLIENT);
+    }
+
+    @Override
+    public String getLabel() {
+
+        return Reference.MOD_NAME + ": " + this.getClass().getSimpleName();
+    }
 
-	@Override
-	public String getLabel() {
-		return Reference.MOD_NAME + ": " + this.getClass().getSimpleName();
-	}
-	
 }

ee3_common/ee3/common/core/helper/GeneralHelper.java

@@ -3,22 +3,8 @@ package ee3.common.core.helper;
 import java.util.ArrayList;
 
 import net.minecraft.src.Block;
-import net.minecraft.src.EntityBlaze;
-import net.minecraft.src.EntityCaveSpider;
-import net.minecraft.src.EntityCreeper;
-import net.minecraft.src.EntityDragon;
-import net.minecraft.src.EntityEnderman;
-import net.minecraft.src.EntityGhast;
 import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityMagmaCube;
+import net.minecraft.src.EntityMob;
-import net.minecraft.src.EntityPigZombie;
-import net.minecraft.src.EntitySilverfish;
-import net.minecraft.src.EntitySkeleton;
-import net.minecraft.src.EntitySlime;
-import net.minecraft.src.EntitySpider;
-import net.minecraft.src.EntityWitch;
-import net.minecraft.src.EntityWither;
-import net.minecraft.src.EntityZombie;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
 
@@ -58,21 +44,7 @@ public class GeneralHelper {
     }
     
     public static boolean isHostileEntity(EntityLiving entity) {
-        if ((entity instanceof EntityBlaze) || 
+        if (entity instanceof EntityMob) {
-            (entity instanceof EntityCaveSpider) ||
-            (entity instanceof EntityCreeper) ||
-            (entity instanceof EntityDragon) ||
-            (entity instanceof EntityEnderman) ||
-            (entity instanceof EntityGhast) ||
-            (entity instanceof EntityMagmaCube) ||
-            (entity instanceof EntityPigZombie) ||
-            (entity instanceof EntitySilverfish) ||
-            (entity instanceof EntitySkeleton) ||
-            (entity instanceof EntitySlime) ||
-            (entity instanceof EntitySpider) ||
-            (entity instanceof EntityWitch) ||
-            (entity instanceof EntityWither) ||
-            (entity instanceof EntityZombie)) {
             return true;
         }
         else {

ee3_common/ee3/common/core/helper/RecipeHelper.java

@@ -139,10 +139,16 @@ public class RecipeHelper {
         list[0] = stone;
         list[1] = fuel;
 
-        for (int i = 2; i < 9; i++)
+        for (int i = 2; i < 9; i++) {
             list[i] = new ItemStack(input.getItem(), 1, input.getItemDamage());
+        }
 
-        GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), 7, result.getItemDamage()), list);
+        if (result.stackSize * 7 <= result.getItem().getItemStackLimit()) {
+        	GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), (result.stackSize*7), result.getItemDamage()), list);
+        }
+        else {
+        	GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), result.getItem().getItemStackLimit(), result.getItemDamage()), list);
+        }
     }
     
 }

ee3_common/ee3/common/core/helper/VersionHelper.java

@@ -1,131 +1,151 @@
 package ee3.common.core.helper;
 
-import java.io.BufferedReader;
+import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStream;
 import java.net.URL;
+import java.util.Properties;
 import java.util.logging.Level;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.LanguageRegistry;
+import ee3.common.lib.Colours;
 import ee3.common.lib.ConfigurationSettings;
 import ee3.common.lib.Reference;
+import ee3.common.lib.Strings;
 
 /**
  * VersionHelper
  * 
- * Contains methods for checking the version of the currently running instance of the mod against a remote version number authority.
+ * Contains methods for checking the version of the currently running instance
- * Meant to help users by notifying them if they are behind the latest published version of the mod
+ * of the mod against a remote version number authority. Meant to help users by
+ * notifying them if they are behind the latest published version of the mod
  * 
  * @author pahimar
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  * 
  */
 public class VersionHelper {
-	
-	// The (publicly available) remote version number authority file
-	private static final String REMOTE_VERSION_FILE = "https://dl.dropbox.com/u/25591134/EE3/version.txt";
-	
-	// All possible results of the remote version number check
-	public static final byte UNINITIALIZED = 0;
-	public static final byte CURRENT = 1;
-	public static final byte OUTDATED = 2;
-	public static final byte CONNECTION_ERROR = 3;
-	
-	// Localization keys
-	private static final String VERSION_CHECK_DISABLED = "version.check_disabled";
-	private static final String VERSION_CHECK_INIT_LOG_MESSAGE = "version.init_log_message";
-	private static final String UNINITIALIZED_MESSAGE = "version.uninitialized";
-	private static final String CURRENT_MESSAGE = "version.current";
-	private static final String OUTDATED_MESSAGE = "version.outdated";
-	private static final String CONNECTION_ERROR_MESSAGE = "version.connection_error";
 
-	// Var to hold the result of the remote version check, initially set to uninitialized
+    // The (publicly available) remote version number authority file
-	public static byte result = UNINITIALIZED;
+    private static final String REMOTE_VERSION_XML_FILE = "https://raw.github.com/pahimar/Equivalent-Exchange-3/master/version.xml";
-	
+
-	/***
+    public static Properties remoteVersionProperties = new Properties();
-	 * Checks the version of the currently running instance of the mod against the remote version authority, and sets the result of the check appropriately
+
-	 */
+    // All possible results of the remote version number check
-	public static void checkVersion() {
+    public static final byte UNINITIALIZED = 0;
-		try {
+    public static final byte CURRENT = 1;
-			URL url = new URL(REMOTE_VERSION_FILE);
+    public static final byte OUTDATED = 2;
-			
+    public static final byte GENERAL_ERROR = 3;
-			InputStreamReader isr = new InputStreamReader(url.openStream());
+
-			BufferedReader reader = new BufferedReader(isr);
+    // Var to hold the result of the remote version check, initially set to uninitialized
-			
+    public static byte result = UNINITIALIZED;
-			String line = null;
+    public static String remoteVersion = null;
-			
+    public static String remoteUpdateLocation = null;
-			// While we are not at the end of the file, fetch the next line in the file
+
-			while ((line = reader.readLine()) != null) {
+    /***
-				// If the current line is for this version of Minecraft, read further
+     * Checks the version of the currently running instance of the mod against
-				if (line.startsWith(Loader.instance().getMCVersionString())) {
+     * the remote version authority, and sets the result of the check
-					// If the current line is also for this mod, read further
+     * appropriately
-					if (line.contains(Reference.CHANNEL_NAME)) {
+     */
-						// If the current line is also the same as the running version of the mod, set the result appropriately
+    public static void checkVersion() {
-						if (line.endsWith(Reference.VERSION)) {
+
-							// Set the version check result to CURRENT
+        InputStream remoteVersionRepoStream = null;
-							result = CURRENT;
+
-							
+        try {
-							// Close the associated network resources
+            URL remoteVersionURL = new URL(REMOTE_VERSION_XML_FILE);
-							reader.close();
+            remoteVersionRepoStream = remoteVersionURL.openStream();
-							isr.close();
+            remoteVersionProperties.loadFromXML(remoteVersionRepoStream);
-							
+
-							return;
+            String remoteVersionProperty = remoteVersionProperties.getProperty(Loader.instance().getMCVersionString());
-						}
+
-					}
+            if (remoteVersionProperty != null) {
-				}
+                remoteVersion = remoteVersionProperty.substring(0, remoteVersionProperty.indexOf("|"));
-			}
+                remoteUpdateLocation = remoteVersionProperty.substring(remoteVersionProperty.indexOf("|") + 1);
-			
+            }
-			// Since this mod version is not the current version, set the version check appropriately
+
-			result = OUTDATED;
+            if ((remoteVersion != null) && (remoteVersion.equals(Reference.VERSION))) {
-			
+                result = CURRENT;
-			// Close the associated network resources
+                return;
-			reader.close();
+            }
-			isr.close();
+
-		} catch (Exception e) {
+            result = OUTDATED;
-			// If we cannot connect to the remote version number authority, set the version check appropriately
+        }
-			e.printStackTrace(System.err);
+        catch (IOException e) {
-			result = CONNECTION_ERROR;
+            e.printStackTrace();
-		}
+        }
-		
+        finally {
-	}
+            if (result == UNINITIALIZED) {
-	
+                result = GENERAL_ERROR;
-	public static void logResult() {
+            }
-		if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
+
-			LogHelper.log(Level.INFO, LanguageRegistry.instance().getStringLocalization(VERSION_CHECK_INIT_LOG_MESSAGE) + " " + REMOTE_VERSION_FILE);
+            try {
-			if ((result == CURRENT) || (result == OUTDATED)) {
+                if (remoteVersionRepoStream != null) {
-				LogHelper.log(Level.INFO, getResultMessage());
+                    remoteVersionRepoStream.close();
-			}
+                }
-			else {
+            }
-				LogHelper.log(Level.WARNING, getResultMessage());
+            catch (IOException ex) {
-			}
+                ex.printStackTrace();
-		}
+            }
-		else {
+        }
-			LogHelper.log(Level.INFO, getResultMessage());
+    }
-		}
+
-	}
+    public static void logResult() {
-	
+
-	public static String getResultMessage() {
+        if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
-		if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
+            LogHelper.log(Level.INFO, LanguageRegistry.instance().getStringLocalization(Strings.VERSION_CHECK_INIT_LOG_MESSAGE) + " " + REMOTE_VERSION_XML_FILE);
-			if (result == UNINITIALIZED) {
+            if ((result == CURRENT) || (result == OUTDATED)) {
-				return LanguageRegistry.instance().getStringLocalization(UNINITIALIZED_MESSAGE);
+                LogHelper.log(Level.INFO, getResultMessage());
-			}
+            }
-			else if (result == CURRENT) {
+            else {
-				return LanguageRegistry.instance().getStringLocalization(CURRENT_MESSAGE);
+                LogHelper.log(Level.WARNING, getResultMessage());
-			}
+            }
-			else if (result == OUTDATED) {
+        }
-				return LanguageRegistry.instance().getStringLocalization(OUTDATED_MESSAGE);
+        else {
-			}
+            LogHelper.log(Level.INFO, getResultMessage());
-			else if (result == CONNECTION_ERROR) {
+        }
-				return LanguageRegistry.instance().getStringLocalization(CONNECTION_ERROR_MESSAGE);
+    }
-			}
+
-			else {
+    public static String getResultMessage() {
-				return null;
+
-			}
+        if (ConfigurationSettings.ENABLE_VERSION_CHECK) {
-		}
+            if (result == UNINITIALIZED) {
-		else {
+                return LanguageRegistry.instance().getStringLocalization(Strings.UNINITIALIZED_MESSAGE);
-			return LanguageRegistry.instance().getStringLocalization(VERSION_CHECK_DISABLED);
+            }
-		}
+            else if (result == CURRENT) {
-	}
+                String returnString = LanguageRegistry.instance().getStringLocalization(Strings.CURRENT_MESSAGE);
+                returnString = returnString.replace("@REMOTE_MOD_VERSION@", remoteVersion);
+                returnString = returnString.replace("@MINECRAFT_VERSION@", Loader.instance().getMCVersionString());
+                return returnString;
+            }
+            else if (result == OUTDATED) {
+                String returnString = LanguageRegistry.instance().getStringLocalization(Strings.OUTDATED_MESSAGE);
+                returnString = returnString.replace("@MOD_NAME@", Reference.MOD_NAME);
+                returnString = returnString.replace("@REMOTE_MOD_VERSION@", remoteVersion);
+                returnString = returnString.replace("@MINECRAFT_VERSION@", Loader.instance().getMCVersionString());
+                returnString = returnString.replace("@MOD_UPDATE_LOCATION@", remoteUpdateLocation);
+                return returnString;
+            }
+            else if (result == GENERAL_ERROR) {
+                return LanguageRegistry.instance().getStringLocalization(Strings.GENERAL_ERROR_MESSAGE);
+            }
+            else {
+                return null;
+            }
+        }
+        else {
+            return LanguageRegistry.instance().getStringLocalization(Strings.VERSION_CHECK_DISABLED);
+        }
+    }
+
+    public static String getResultMessageForClient() {
+
+        String returnString = LanguageRegistry.instance().getStringLocalization(Strings.OUTDATED_MESSAGE);
+        returnString = returnString.replace("@MOD_NAME@", Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE);
+        returnString = returnString.replace("@REMOTE_MOD_VERSION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE);
+        returnString = returnString.replace("@MINECRAFT_VERSION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE);
+        returnString = returnString.replace("@MOD_UPDATE_LOCATION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE);
+        return returnString;
+    }
 
 }

ee3_common/ee3/common/item/ItemAlchemyDust.java

@@ -45,24 +45,15 @@ public class ItemAlchemyDust extends ItemEE {
     }
 	
 	public String getItemNameIS(ItemStack stack) {
-        int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
+        int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 5);
-        return super.getItemName() + "." + alchemyDustNames[meta / 2];
+        return super.getItemName() + "." + alchemyDustNames[meta];
     }
 	
-	@SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
-		int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
-		
-		String key = (meta % 2 == 0) ? Strings.TEXT_IMPURE : Strings.TEXT_PURE;
-
-		list.add(LanguageRegistry.instance().getStringLocalization(key));
-	}
-	
 	@SideOnly(Side.CLIENT)
     public boolean hasEffect(ItemStack stack) {
-		int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
+		int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 5);
         
-		if (meta >= 10) {
+		if (meta == 5) {
 			return true;
 		}
 		else {
@@ -74,7 +65,7 @@ public class ItemAlchemyDust extends ItemEE {
     public EnumRarity getRarity(ItemStack stack) {
 		int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
 		
-		switch(meta / 2) {
+		switch(meta) {
 			case 0: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL);
 			case 1: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL);
 			case 2: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.UNCOMMON);
@@ -89,7 +80,7 @@ public class ItemAlchemyDust extends ItemEE {
 	@SideOnly(Side.CLIENT)
     public void getSubItems(int id, CreativeTabs creativeTab, List list)
     {
-        for (int meta = 0; meta < 12; ++meta) {
+        for (int meta = 0; meta < 6; ++meta) {
             list.add(new ItemStack(id, 1, meta));
         }
     }

ee3_common/ee3/common/item/ItemMiniumStone.java

@@ -32,7 +32,7 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone {
     
     public ItemMiniumStone(int id) {
         super(id);
-        this.setIconCoord(2, 0);
+        this.setIconCoord(1, 0);
         this.setItemName(Strings.MINIUM_STONE_NAME);
         this.setCreativeTab(EquivalentExchange3.tabsEE3);
         this.setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1);
@@ -72,8 +72,9 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone {
     }
 	
 	@SideOnly(Side.CLIENT)
-    public boolean hasEffect(ItemStack stack) {
+    public int getColorFromItemStack(ItemStack par1ItemStack, int par2)
-        return false;
+    {
+        return Integer.parseInt(Colours.PURE_RED, 16);
     }
 
     @Override

ee3_common/ee3/common/item/ItemPhilosopherStone.java

@@ -34,7 +34,7 @@ public class ItemPhilosopherStone extends ItemEE
     
     public ItemPhilosopherStone(int id) {
         super(id);
-        this.setIconCoord(3, 0);
+        this.setIconCoord(2, 0);
         this.setItemName(Strings.PHILOSOPHER_STONE_NAME);
         this.setCreativeTab(EquivalentExchange3.tabsEE3);
         this.maxChargeLevel = 4;

ee3_common/ee3/common/lib/Colours.java

@@ -14,6 +14,8 @@ public class Colours {
     public static final String PURE_RED = "ff0000";
 
     /* Text colour related constants */
-    public static final String VERSION_CHECK_PREFIX = "\u00a7e";
+    public static final String TEXT_COLOUR_PREFIX_YELLOW = "\u00a7e";
+
+    public static final String TEXT_COLOUR_PREFIX_WHITE = "\u00a7f";
     
 }

ee3_common/ee3/common/lib/CustomItemRarity.java

@@ -53,4 +53,4 @@ public class CustomItemRarity {
     public static final String DISPLAY_NAME_EPIC = "Epic";
     public static final String DISPLAY_NAME_LEGENDARY = "Legendary";
 
-}
+}

ee3_common/ee3/common/lib/Localizations.java

@@ -22,8 +22,11 @@ public class Localizations {
 		LANG_RESOURCE_LOCATION + "fr_FR.xml",
 		LANG_RESOURCE_LOCATION + "it_IT.xml",
 		LANG_RESOURCE_LOCATION + "ja_JP.xml",
+		LANG_RESOURCE_LOCATION + "la_IT.xml",
 		LANG_RESOURCE_LOCATION + "nl_NL.xml",
+		LANG_RESOURCE_LOCATION + "no_NO.xml",
 		LANG_RESOURCE_LOCATION + "pl_PL.xml",
+		LANG_RESOURCE_LOCATION + "pt_BR.xml",
 		LANG_RESOURCE_LOCATION + "pt_PT.xml",
 		LANG_RESOURCE_LOCATION + "ru_RU.xml",
 		LANG_RESOURCE_LOCATION + "sr_RS.xml",

ee3_common/ee3/common/lib/Reference.java

@@ -23,13 +23,13 @@ public class Reference {
     public static final int SHIFTED_ID_RANGE_CORRECTION = 256;
     public static final String SERVER_PROXY_CLASS = "ee3.common.core.CommonProxy";
     public static final String CLIENT_PROXY_CLASS = "ee3.client.core.ClientProxy";
-    
+
     /* Configuration related constants */
     public static final String ENABLE_VERSION_CHECK = "enable_version_check";
     public static final String ENABLE_SOUNDS = "enable_sounds";
     public static final String ENABLE_PARTICLE_FX = "enable_particle_fx";
     public static final String AUTO_RESOLVE_BLOCK_IDS = "auto_resolve_block_ids";
-    
+
     /* KeyBinding related constants */
     public static final String KEYBINDING_EXTRA = "key.extra";
     public static final int KEYBINDING_EXTRA_DEFAULT = 46;
@@ -47,12 +47,12 @@ public class Reference {
     public static final String ITEM_SPRITE_SHEET = "ee3_items.png";
     public static final String BLOCK_SPRITE_SHEET = "ee3_blocks.png";
     public static final String CALCINATOR_TEXTURE_SHEET = "calcinator.png";
-    
+
     /* General Tile Entity related constants */
     public static final String TE_GEN_OWNER_NBT_TAG_LABEL = "owner";
     public static final String TE_GEN_STATE_NBT_TAG_LABEL = "state";
     public static final String TE_GEN_DIRECTION_NBT_TAG_LABEL = "direction";
-    
+
     // TODO: Find a better spot for these
     public static final int BLOCK_RED_WATER_EFFECT_DURATION_BASE = 5;
     public static final int BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER = 2;

ee3_common/ee3/common/lib/Strings.java

@@ -3,8 +3,14 @@ package ee3.common.lib;
 public class Strings {
 	
 	/* General text keys */
-	public static final String TEXT_IMPURE = "text.impure";
+    
-	public static final String TEXT_PURE = "text.pure";
+    /* Version check related constants */
+    public static final String VERSION_CHECK_DISABLED = "version.check_disabled";
+    public static final String VERSION_CHECK_INIT_LOG_MESSAGE = "version.init_log_message";
+    public static final String UNINITIALIZED_MESSAGE = "version.uninitialized";
+    public static final String CURRENT_MESSAGE = "version.current";
+    public static final String OUTDATED_MESSAGE = "version.outdated";
+    public static final String GENERAL_ERROR_MESSAGE = "version.general_error";
 	
 	/* Gui related constants */
     public static final String GUI_CALCINATOR_NAME = "gui.calcinator.name";

resources/ee3/lang/cs_CZ.xml

@@ -20,7 +20,7 @@
 	<entry key="version.init_log_message">Provádím kontrolu verze, vzdálený soubor umístěn na </entry>
 	<entry key="version.uninitialized">Kontrola verze neproběhla úspěšně (nezdařila se inicializace)</entry>
 	<entry key="version.current">Používáte nejaktuálnější verzi, která je pro vaši verzi Minecraftu</entry>
-	<entry key="version.outdated">Používáte neaktuální verzi; zvažte aktualizaci - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Používáte neaktuální verzi; zvažte aktualizaci - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Chyba při připojování k servru poskytujícímu informace o verzi (je v pořádku vaše připojení k Internetu?)</entry>
 	<entry key="version.check_disabled">Kontrola verze deaktivována, přeskakuji</entry>
 </properties>

resources/ee3/lang/cy_GB.xml

@@ -17,7 +17,7 @@
 	<entry key="version.init_log_message">Ymgychwynnu gwiriad fersiwn yn erbyn y ffeil awdurdod fersiwn o bell, a leolir ar</entry>
 	<entry key="version.uninitialized">Ni gyflawnwyd y gwiriad fersiwn yn llwyddiannus (ni ymgychwynodd y gwiriad fersiwn yn briodol)</entry>
 	<entry key="version.current">Rydych yn defnyddio y fersiwn diweddaraf ar gyfer eich fersiwn o Minecraft</entry>
-	<entry key="version.outdated">Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Gwall wrth drio cysylltu gyda'r ffeil awdurdod fersiwn o bell (Gwiriwch eich cysylltiad rhwydwaith)</entry>
 	<entry key="version.check_disabled">Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid</entry>
 </properties>

resources/ee3/lang/de_DE.xml

@@ -18,7 +18,7 @@
 	<entry key="version.init_log_message">Initialisiere Versionsvergleich mit der Remotedatei, die sich auf folgendem Server befindet</entry>
 	<entry key="version.uninitialized">Die Versionsprüfung wurde nicht erfolgreich abgeschlossen (Versionsprüfung wurde nicht entsprechend initialisiert)</entry>
 	<entry key="version.current">Du benutzt gerade die aktuellste Version für deine Minecraft-Version</entry>
-	<entry key="version.outdated">Du benutzt gerade eine veraltete Version; bitte ziehe es in Betracht sie hier zu updaten - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Du benutzt gerade eine veraltete Version; bitte ziehe es in Betracht sie hier zu updaten - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Fehler bei der Verbindung zur Remotedatei(überprüfe bitte deine Internetverbindung)</entry>
 	<entry key="version.check_disabled">Versionsvergleich mit der Remotedatei deaktiviert, überspringe</entry>
 </properties>

resources/ee3/lang/en_US.xml

@@ -21,12 +21,10 @@
 	<entry key="tile.calcinator.name">Calcinator</entry>
 	<entry key="gui.calcinator.name">Calcinator</entry>
 	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
-	<entry key="text.impure">Impure</entry>
+	<entry key="version.init_log_message">Initializing remote version check against remote version authority, located at</entry>
-	<entry key="text.pure">Pure</entry>
+	<entry key="version.uninitialized">Remote version check failed to initialize properly</entry>
-	<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
+	<entry key="version.current">Currently using the most up to date version (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 for @MINECRAFT_VERSION@</entry>
-	<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
+	<entry key="version.outdated">A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. Get it here: @MOD_UPDATE_LOCATION@</entry>
-	<entry key="version.current">You are currently using the most up to date version for your version of Minecraft</entry>
+	<entry key="version.general_error">Error checking the remote version authority file</entry>
-	<entry key="version.outdated">You are currently using an out of date version; consider updating here - http://goo.gl/Ria2V</entry>
-	<entry key="version.connection_error">Error connecting to the remote version authority file (check your Internet connection?)</entry>
 	<entry key="version.check_disabled">Remote version check disabled, skipping</entry>
 </properties>

resources/ee3/lang/es_ES.xml

@@ -10,14 +10,21 @@
 	<entry key="item.inertStone.name">Piedra Inerte</entry>
 	<entry key="item.miniumStone.name">Piedra de Minio</entry>
 	<entry key="item.philStone.name">Piedra Filosofal</entry>
+	<entry key="item.alchemyDust.ash.name">Ceniza</entry>
+	<entry key="item.alchemyDust.minium.name">Polvo de Minio</entry>
+	<entry key="item.alchemyDust.verdant.name">Polvo verdante</entry>
+	<entry key="item.alchemyDust.azure.name">Polvo azur</entry>
+	<entry key="item.alchemyDust.amaranthine.name">Polvo purpúreo</entry>
+	<entry key="item.alchemyDust.iridescent.name">Polvo iridiscente</entry>
 	<entry key="tile.redWaterStill.name">Agua Roja (Quieta)</entry>
 	<entry key="tile.redWaterFlowing.name">Agua Roja (Fluyendo)</entry>
 	<entry key="tile.calcinator.name">Calcinador</entry>
 	<entry key="gui.calcinator.name">Calcinador</entry>
+	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
 	<entry key="version.init_log_message">Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en</entry>
 	<entry key="version.uninitialized">El chequeo de versiones no se completó exitosamente (el chequeo de versiones no se inicializó correctamente)</entry>
 	<entry key="version.current">Actualmente estás usando la versión más actualizada para tu versión de Minecraft</entry>
-	<entry key="version.outdated">Actualmente estás usando una versión desactualizada; considera actualizarla aquí - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Actualmente estás usando una versión desactualizada; considera actualizarla aquí - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?)</entry>
 	<entry key="version.check_disabled">Chequeo remoto de versiones desactivado, omitiendo</entry>
 </properties>

resources/ee3/lang/fr_FR.xml

@@ -15,7 +15,7 @@
 	<entry key="version.init_log_message">Lancement de la vérification de votre version par rapport à cette de reference : </entry>
 	<entry key="version.uninitialized">Le lancement de la vérification a échoué</entry>
 	<entry key="version.current">Vous utilisez la version la plus à jour pour votre version de Minecraft</entry>
-	<entry key="version.outdated">Vous utilisez une verison obsolète, pensez à effecuter une mise a jour ici - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Vous utilisez une verison obsolète, pensez à effecuter une mise a jour ici - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Erreur de connexion vers la version de référence (vérifiez votre connexion internet ?)</entry>
 	<entry key="version.check_disabled">Verification de version désactiée</entry>
 </properties>

resources/ee3/lang/ja_JP.xml

@@ -26,7 +26,7 @@
 	<entry key="version.init_log_message">オンラインバージョンチェックの初期化中。場所:</entry>
 	<entry key="version.uninitialized">バージョンチェックに失敗しました。 (初期化に失敗しました。)</entry>
 	<entry key="version.current">Minecraft本体に適合する最新バージョンです。</entry>
-	<entry key="version.outdated">古いバージョンが使用されています。 http://goo.gl/Ria2V からアップデートしてください。</entry>
+	<entry key="version.outdated">古いバージョンが使用されています。 @MOD_UPDATE_LOCATION@ からアップデートしてください。</entry>
 	<entry key="version.connection_error">リモートのバージョン情報ファイルへ接続中にエラーが発生しました。インターネット接続を確認してください。</entry>
 	<entry key="version.check_disabled">オンラインバージョンチェックは無効化されています。処理をスキップします。</entry>
 </properties>

resources/ee3/lang/la_IT.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties version="1.0">
+	<comment>Latina (Italia) Lingua Scapi</comment>
+	<entry key="key.extra">Extra</entry>
+	<entry key="key.release">Libere</entry>
+	<entry key="key.toggle">Mutare</entry>
+	<entry key="key.charge">Tradere</entry>
+	<entry key="item.miniumShard.name">Pars Rufi Plumbi</entry>
+	<entry key="item.inertStone.name">Ignavus Lapidus</entry>
+	<entry key="item.miniumStone.name">Pars Rufi Lapidus</entry>
+	<entry key="item.philStone.name">Lapis Philosophi</entry>
+	<entry key="item.alchemyDust.ash.name">Fraxinus</entry>
+	<entry key="item.alchemyDust.minium.name">Afa Rufi Plumbi</entry>
+	<entry key="item.alchemyDust.verdant.name">Viridis Afae</entry>
+	<entry key="item.alchemyDust.azure.name">Caeruleus Afae</entry>
+	<entry key="item.alchemyDust.amaranthine.name">Amarantus Afae</entry>
+	<entry key="item.alchemyDust.iridescent.name">Iris Afae</entry>
+	<entry key="tile.redWaterStill.name">Rufi Aqua (Residans)</entry>
+	<entry key="tile.redWaterFlowing.name">Rufi Aqua (Fluens)</entry>
+	<entry key="tile.calcinator.name">Auctor Calcus</entry>
+	<entry key="gui.calcinator.name">Auctor Calcus</entry>
+	<entry key="itemGroup.EE3">Aequipollens Conlubi Trium</entry>
+	<entry key="text.impure">Spurcus</entry>
+	<entry key="text.pure">Purum</entry>
+	<entry key="version.init_log_message">Incipiens senecti quaesitum contra procul senecti auctoritatis scapus, positus ad</entry>
+	<entry key="version.uninitialized">Senecti quaesitum non adimplet cum fortuna (Senecti quaestim non incipit recte)</entry>
+	<entry key="version.current">Iam abutas the most novellissimus senectus tuo senecto Meiarti(Minecraft) </entry>
+	<entry key="version.outdated">Iam abutas non tempore senectus; Consule hic afferte hodie - @MOD_UPDATE_LOCATION@</entry>
+	<entry key="version.connection_error">Erratum annectans ad procul senecto auctoritatis scapus (Scisa tuum retiacula ad invicem nexus?)</entry>
+	<entry key="version.check_disabled">Procul senectus debilitatus, neglectens</entry>
+</properties>

resources/ee3/lang/nl_NL.xml

@@ -7,16 +7,24 @@
 	<entry key="key.toggle">Wissel</entry>
 	<entry key="key.charge">Opladen</entry>
 	<entry key="item.miniumShard.name">Minium Scherf</entry>
+	<entry key="item.inertStone.name">Inerte Steen</entry>
 	<entry key="item.miniumStone.name">Minium Steen</entry>
 	<entry key="item.philStone.name">Steen der Wijzen</entry>
+	<entry key="item.alchemyDust.ash.name">As</entry>
+	<entry key="item.alchemyDust.minium.name">Minium Stof</entry>
+	<entry key="item.alchemyDust.verdant.name">Helgroen Stof</entry>
+	<entry key="item.alchemyDust.azure.name">Azuurblauw Stof</entry>
+	<entry key="item.alchemyDust.amaranthine.name">Amarant Stof</entry>
+	<entry key="item.alchemyDust.iridescent.name">Iriserend Stof</entry>
 	<entry key="tile.redWaterStill.name">Rood Water (Stilstaand)</entry>
 	<entry key="tile.redWaterFlowing.name">Rood Water (Vloeiend)</entry>
 	<entry key="tile.calcinator.name">Calcinator</entry>
 	<entry key="gui.calcinator.name">Calcinator</entry>
-	<entry key="version.init_log_message">Initialisatie versiecontrole tegen extern versie bestand, te vinden op</entry>
+	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
+	<entry key="version.init_log_message">Start versiecontrole tegen extern versiebestand, te vinden op</entry>
 	<entry key="version.uninitialized">De versiecontrole is niet geslaagd (versiecontrole niet correct gestart)</entry>
 	<entry key="version.current">Je gebruikt momenteel de meest recente versie voor jouw Minecraft versie</entry>
-	<entry key="version.outdated">Je gebruikt momenteel een verouderde versie; overweeg om up te daten - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Je gebruikt momenteel een verouderde versie; overweeg om up te daten - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Fout bij het verbinden met het extern versiecontrole bestand (controleer je internetverbinding)</entry>
 	<entry key="version.check_disabled">Externe versiecontrole uitgeschakeld, wordt overgeslagen</entry>
 </properties>

resources/ee3/lang/no_NO.xml

@@ -17,7 +17,7 @@
 	<entry key="version.init_log_message">Initaliserer versjonskontroll mot fjernversjonens autoritetsfil, plassert i</entry>
 	<entry key="version.uninitialized">Versjonkontrollen mislyktes (Versjonkontrollen initaliserte ikke korrekt)</entry>
 	<entry key="version.current">Du bruker den mest oppdaterte versjonen for din versjon av Minecraft</entry>
-	<entry key="version.outdated">Du bruker en utdatert versjon; Vurder å oppdatere her: - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Du bruker en utdatert versjon; Vurder å oppdatere her: - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Misslykkes med å koble til fjernversjonens autoritetsfil (Kontroller internetttilgangen din?)</entry>
 	<entry key="version.check_disabled">Fjernversjonens versjonsjekk koblet fra, hopper over </entry>
 </properties>

resources/ee3/lang/pl_PL.xml

@@ -18,7 +18,7 @@
 	<entry key="version.init_log_message">Inicjowanie sprawdzania wersji względem zdalnego pliku autoryzacji, umieszczonego na</entry>
 	<entry key="version.uninitialized">Sprawdzenie wersji nie zakończyło się sukcesem (Sprawdzanie wersji nie zostało poprawnie zainicjowane)</entry>
 	<entry key="version.current">Korzystasz aktualnie z najaktualniejszej wersji dla Twojej wersji Minecraft</entry>
-	<entry key="version.outdated">Korzystasz aktualnie ze starszej wersji moda; Pomyśl nad aktualizacją tutaj - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Korzystasz aktualnie ze starszej wersji moda; Pomyśl nad aktualizacją tutaj - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Wystąpił bład podczas łaczenia ze zdalnym plikiem wersji (sprawdź Twoje połączenie z Internetem?)</entry>
 	<entry key="version.check_disabled">Zdalne sprawdzanie wersji wyłączone, pomijanie</entry>
 </properties>

resources/ee3/lang/pt_BR.xml

@@ -0,0 +1,30 @@
+?<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties version="1.0">
+	<comment>Brazilian Portuguese(pt-BR) Localization File</comment>
+	<entry key="key.extra">Extra</entry>
+	<entry key="key.release">Liberar</entry>
+	<entry key="key.toggle">Alternar</entry>
+	<entry key="key.charge">Carregar</entry>
+	<entry key="item.miniumShard.name">Fragmento de Minium</entry>
+	<entry key="item.inertStone.name">Pedra Inerte</entry>
+	<entry key="item.miniumStone.name">Pedra de Minium</entry>
+	<entry key="item.philStone.name">Pedra Filosofal</entry>
+	<entry key="item.alchemyDust.ash.name">Cinzas</entry>
+	<entry key="item.alchemyDust.minium.name">Pó de Minium</entry>
+	<entry key="item.alchemyDust.verdant.name">Pó Verdejante</entry>
+	<entry key="item.alchemyDust.azure.name">Pó Índigo</entry>
+	<entry key="item.alchemyDust.amaranthine.name">Pó Amarantino</entry>
+	<entry key="item.alchemyDust.iridescent.name">Pó Iridescente</entry>
+	<entry key="tile.redWaterStill.name">Água Vermelha (Parada)</entry>
+	<entry key="tile.redWaterFlowing.name">Água Vermelha (Corrente)</entry>
+	<entry key="tile.calcinator.name">Calcinador</entry>
+	<entry key="gui.calcinator.name">Calcinador</entry>
+	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
+	<entry key="version.init_log_message">Inicializando checagem de versão remota contra a versão remota mestre, localizada em:</entry>
+	<entry key="version.uninitialized">Checagem de versão remota não conseguiu ser inicializada adequadamente</entry>
+	<entry key="version.current">Usando a versão mais recente(@REMOTE_MOD_VERSION@) de Equivalent Exchange 3 para @MINECRAFT_VERSION@</entry>
+	<entry key="version.outdated">Uma nova versão de @MOD_NAME@ existe (@REMOTE_MOD_VERSION@) para @MINECRAFT_VERSION@. Consiga-a aqui: @MOD_UPDATE_LOCATION@</entry>
+	<entry key="version.general_error">Erro checando a versão remota mestre</entry>
+	<entry key="version.check_disabled">Checagem remota desligada, pulando</entry>
+</properties>

resources/ee3/lang/pt_PT.xml

@@ -26,7 +26,7 @@
 	<entry key="version.init_log_message">A inicializar verificação da versão contra o ficheiro autoritário de versão remoto, localizado em</entry>
 	<entry key="version.uninitialized">A verificação da versão não concluiu com sucesso (a verificação da versão não inicializou correctamente)</entry>
 	<entry key="version.current">Estás actualmente a usar a versão mais actualizada para a tua versão do Minecraft</entry>
-	<entry key="version.outdated">Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Erro ao ligar ao ficheiro autoritário de versão remoto (verifica a tua ligação de Internet?)</entry>
 	<entry key="version.check_disabled">Verificação de versão remota desactivada, a ignorar</entry>
 </properties>

resources/ee3/lang/ru_RU.xml

@@ -10,14 +10,21 @@
 	<entry key="item.inertStone.name">Инертный Камень</entry>
 	<entry key="item.miniumStone.name">Сурик</entry>
 	<entry key="item.philStone.name">Философский Камень</entry>
+	<entry key="item.alchemyDust.ash.name">Пепел</entry>
+	<entry key="item.alchemyDust.minium.name">Пыль Сурика</entry>
+	<entry key="item.alchemyDust.verdant.name">Изумрудная Пыль</entry>
+	<entry key="item.alchemyDust.azure.name">Лазурная Пыль</entry>
+	<entry key="item.alchemyDust.amaranthine.name">Пурпурная Пыль</entry>
+	<entry key="item.alchemyDust.iridescent.name">Радужная Пыль</entry>
 	<entry key="tile.redWaterStill.name">Красная Вода (Стоящая)</entry>
 	<entry key="tile.redWaterFlowing.name">Красная Вода (Текущая)</entry>
 	<entry key="tile.calcinator.name">Кальцинатор</entry>
 	<entry key="gui.calcinator.name">Кальцинатор</entry>
+	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
 	<entry key="version.init_log_message">Инициализация проверки версии в удаленном файле, находящемся на</entry>
 	<entry key="version.uninitialized">Проверка версии не была завершена успешно (проверка версии не инициализирована правильно)</entry>
 	<entry key="version.current">Вы используете самую последнюю версию для вашей версии Minecraft</entry>
-	<entry key="version.outdated">Вы используете устаревшую версию, обновите здесь - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Вы используете устаревшую версию, обновите здесь - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Ошибка подключения к удаленному файлу (проверьте подключение к Интернету)</entry>
 	<entry key="version.check_disabled">Удаленная проверка версии отключена, пропуск</entry>
 </properties>

resources/ee3/lang/sr_RS.xml

@@ -18,7 +18,7 @@
     <entry key="version.init_log_message">Покретање верзије провера према Приступу удаљеним фајловима верзије ауторитета, који се налази у</entry>
     <entry key="version.uninitialized">Провера Верзије није успешно завршена (верзија провере није покренута правилно)</entry>
     <entry key="version.current">Ви тренутно користите најновију верзију за мајнкрафт</entry>
-    <entry key="version.outdated">Ви тренутно користите застарелу верзију; Размотрити надоградљу на - http://goo.gl/Ria2V</entry>
+    <entry key="version.outdated">Ви тренутно користите застарелу верзију; Размотрити надоградљу на - @MOD_UPDATE_LOCATION@</entry>
     <entry key="version.connection_error">Грешка у повезивању удаљене верзије ауторетета податка (Погледајте вашу конекцију?)</entry>
     <entry key="version.check_disabled">Провера верзије је искључено, Прескочено</entry>
 </properties>

resources/ee3/lang/sv_SE.xml

@@ -17,7 +17,7 @@
 	<entry key="version.init_log_message">Initierar versionskontroll mot fjärrversions auktoritetsfil, lokaliserad vid</entry>
 	<entry key="version.uninitialized">Versionskontrollen misslyckades (Versionskontrollen initierades inte korrekt)</entry>
 	<entry key="version.current">Du använder den mest uppdaterade versionen för din version av Minecraft</entry>
-	<entry key="version.outdated">Du använder en utdaterad version; överväg att uppdatera här - http://goo.gl/Ria2V</entry>
+	<entry key="version.outdated">Du använder en utdaterad version; överväg att uppdatera här - @MOD_UPDATE_LOCATION@</entry>
 	<entry key="version.connection_error">Misslyckades med att ansluta till fjärrversions auktoritetsfil (Kontrollera din internetanslutning?)</entry>
 	<entry key="version.check_disabled">Fjärrversions versionskontroll inaktiverad, hoppar över</entry>
 </properties>

resources/ee3/lang/zh_CN.xml

@@ -2,10 +2,6 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Chinese (Simplified) Localization File</comment>
-	<entry key="key.extra">Extra</entry>
-	<entry key="key.release">Release</entry>
-	<entry key="key.toggle">Toggle</entry>
-	<entry key="key.charge">Charge</entry>
 	<entry key="item.miniumShard.name">铅丹碎片</entry>
 	<entry key="item.inertStone.name">惰性石</entry>
 	<entry key="item.miniumStone.name">铅丹石</entry>
@@ -14,11 +10,4 @@
 	<entry key="tile.redWaterFlowing.name">红水 (流动)</entry>
 	<entry key="tile.calcinator.name">煅烧炉</entry>
 	<entry key="gui.calcinator.name">煅烧炉</entry>
-	<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
-	<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
-	<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
-	<entry key="version.current">You are currently using the most up to date version for your version of Minecraft</entry>
-	<entry key="version.outdated">You are currently using an out of date version; consider updating here - http://goo.gl/Ria2V</entry>
-	<entry key="version.connection_error">Error connecting to the remote version authority file (check your Internet connection?)</entry>
-	<entry key="version.check_disabled">Remote version check disabled, skipping</entry>
 </properties>

version.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties version="1.0">
+	<comment>Version lookup for Equivalent Exchange 3. Format is "Current Version Number|URL to update page"</comment>
+	<entry key="Minecraft 1.4.2">pre1a|http://goo.gl/Ria2V</entry>
+	<entry key="Minecraft 1.4.4">pre1b|http://goo.gl/Ria2V</entry>
+	<entry key="Minecraft 1.4.5">pre2|http://goo.gl/Ria2V</entry>
+</properties>