From 21fe0e48df1fcb88c6f20f68b2ae7ecaf2dfe59e Mon Sep 17 00:00:00 2001 From: PizzAna Date: Thu, 9 May 2013 11:33:54 +0300 Subject: [PATCH 1/3] Update README.md with newest version of Ant and JDK --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index af7262fa..dbdb50b0 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * Click on `Environment Variables`. * Under `System Variables`, click `New`. * For `Variable Name`, input `JAVA_HOME`. - * For `Variable Value`, input something similar to `;C:\Program Files (x86)\Java\jdk1.7.0_15` exactly as shown to the end (or wherever your Java JDK installation is), and click `Ok`. + * For `Variable Value`, input something similar to `;C:\Program Files (x86)\Java\jdk1.7.0_21` exactly as shown to the end (or wherever your Java JDK installation is), and click `Ok`. * Scroll down to a variable named `Path`, and double-click on it. - * Append `;C:\Program Files (x86)\Java\jdk1.7.0_15\bin` (or your Java JDK installation directory\bin), and click `Ok`. + * Append `;C:\Program Files (x86)\Java\jdk1.7.0_21\bin` (or your Java JDK installation directory\bin), and click `Ok`. 3. Download Apache Ant [here] (http://ant.apache.org). * Unzip the files anywhere you want, eg `C:\Program Files (x86)\Ant`. * Again, go to `Environment Variables` just like you did for the Java JDK. @@ -27,7 +27,7 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * For `Variable Name`, input `ANT_HOME`. * For `Variable Value`, input `C:\Ant\apache-ant-1.9.0` (or your Ant directory\apache-ant-1.9.0). * Scroll down to `Path`, and double-click on it. - * Append `;C:\Ant\apache-ant-1.8.4\bin` exactly as shown to the end (or your Ant directory\apache-ant-1.9.0\bin). + * Append `;C:\Ant\apache-ant-1.9.0\bin` exactly as shown to the end (or your Ant directory\apache-ant-1.9.0\bin). 4. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). For Linux, you could download it as a .zip/tarball and unzip it. * Create an account. * Scroll to the top of this page, login at the top-right, and then click `Clone to Windows/Mac` near the top-left of the page. @@ -102,4 +102,4 @@ EE3 crashes every time? Have a suggestion? Found a bug? Create an issue now! 2. Go to [the issues page] (http://github.com/pahimar/Equivalent-Exchange-3/issues). 3. Click `New Issue` right below `Graphs`. 4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description ("Hey pahimar, could you add/change xxx?" or "Hey, found an exploit: stuff"). -5. Click `Submit new issue`, and you're done! \ No newline at end of file +5. Click `Submit new issue`, and you're done! From 9c0281a18e27e24a580a03614386d87f2e570b41 Mon Sep 17 00:00:00 2001 From: PizzAna Date: Thu, 9 May 2013 11:39:35 +0300 Subject: [PATCH 2/3] Update fi_FI.xml with small language and typo corrections --- resources/mods/ee3/lang/fi_FI.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/mods/ee3/lang/fi_FI.xml b/resources/mods/ee3/lang/fi_FI.xml index 34501af9..227c0a76 100644 --- a/resources/mods/ee3/lang/fi_FI.xml +++ b/resources/mods/ee3/lang/fi_FI.xml @@ -29,12 +29,12 @@ Alkeminen pussi Lasitiuku Equivalent Exchange 3 - Alustetaaan etäversion tarkistusta palvelimeen kohteessa + Aloitetaan etäversion tarkistusta kohteessa Etäversion tarkistusta ei pystytty alustamaan Käytät tällä hetkellä uusinta (@REMOTE_MOD_VERSION@) Equivalent Exchange 3 -versiota, joka on tarkoitettu Minecraft @MINECRAFT_VERSION@:lle Uusi @MOD_NAME@ versio on saatavilla (@REMOTE_MOD_VERSION@) Minecraftin versiolle @MINECRAFT_VERSION@. Lataa se täältä: @MOD_UPDATE_LOCATION@ - Virhe yhdistettäessä etäversiopalvelimeen; yritetään uudelleen - Version tarkistus pysäytetään kolmen epäonnistuneen yrityksen jälkeen + Virhe yhdistettäessä etäversion palvelimeen; yritetään uudelleen + Version tarkistus lopetettu kolmen epäonnistuneen yrityksen jälkeen @MOD_NAME@:a @MINECRAFT_VERSION@:lle ei löytynyt Kohdistetun transmutoinnin peitevalikko käytössä Kohdistetun transmutoinnin peitevalikko poissa käytössä @@ -51,4 +51,4 @@ Toistetaan kaikkien pelaajien Equivalent Exchange 3 äänet Toistetaan vain omat Equivalent Exchange 3 äänet Equivalent Exchange 3 äänet poistettu käytöstä - \ No newline at end of file + From fedceeae1b204dd3bf450212f1e9b696e873ebb4 Mon Sep 17 00:00:00 2001 From: PizzAna Date: Thu, 9 May 2013 17:00:46 +0300 Subject: [PATCH 3/3] Update README.md with 1.5.2 stuff --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dbdb50b0..e6d6a29a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## Welcome to Equivalent Exchange 3! -**LATEST OFFICIAL VERSION**: [EE3 pre1g for 1.5.1] (http://adf.ly/Mj3ZL) +**LATEST OFFICIAL VERSION**: [EE3 pre1g for 1.5.1/1.5.2] (http://adf.ly/Mj3ZL) [Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) @@ -36,10 +36,10 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively #### Setup MCP (Tested on Linux and Windows) -1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp744.zip. Install MCP dependencies as listed on the website if neccessary. +1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp751.zip. Install MCP dependencies as listed on the website if neccessary. 2. Inside `mcdev`, create a directory named `mcp` and unzip the MCP .zip file into it. * To verify, check if a file named `CHANGELOG` exists inside `mcp`. -3. Download the latest forge **source** for Minecraft 1.5.1 and unzip it into `mcp`. You need at least Forge 7.7.1.500, best way is to get it from [here] (http://files.minecraftforge.net/). +3. Download the latest forge **source** for Minecraft 1.5.2 and unzip it into `mcp`. You need at least Forge 7.7.1.500 (Forge 7.8.0.684 if using 1.5.2), best way is to get it from [here] (http://files.minecraftforge.net/). * To verify, check if a application named `install.sh` exists. 4. Execute `install.sh` (Linux and Mac) or `install.cmd` (Windows), both found in `mcdev\mcp\forge`. 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. @@ -64,13 +64,13 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * Open it up with any text editor, and type into it the following (fully customizable except for `dir.development`): * `dir.development=../../` * `dir.release=Releases` - * `release.minecraft.version=1.5.1` + * `release.minecraft.version=1.5.2` * `release.mod.version=pre2` 5. Open up your OS's command line (Command Prompt in Windows, Terminal in Linux and Mac). 6. Navigate to `mcdev\source\Equivalent-Exchange-3` by executing `cd mcdev's location\source\Equivalent-Exchange-3`. 7. Execute `ant release`. This will generally take around 5-15 minutes, depending on your computer. If you've done everything right, `BUILD SUCCESSFUL` is displayed after it finishes. * If you see `BUILD FAILED`, check the error output (it should be right around `BUILD FAILED`), fix everything, and try again. -8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.5\pre2`. +8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.5.2\pre2`. * You should see a .jar named `ee3-universal-pre2.jar`. 9. Copy the jar into your Minecraft mods folder, and play Minecraft!