From 6a977a7e32162fa89625cbde851492988cb0d95e Mon Sep 17 00:00:00 2001 From: Wliu Date: Sat, 1 Dec 2012 09:52:22 -0500 Subject: [PATCH 1/9] Update README.md Removed a comma. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36f7b004..0e5008f1 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ ________________________________________________________________________________ \-jars \-source \-Equivalent-Exchange-3 - \-EE3's files, (should have build.xml). + \-EE3's files (should have build.xml). *** 4. Inside `Equivalent-Exchange-3`, create a new file called `build.properties`. * Open it up, and type into it the following: From 0aca53fef5240d63b8d1cdec01eebf987877ac1f Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 14:35:46 -0500 Subject: [PATCH 2/9] Update README.md Added a nice descriptive warning, reverted back my previous Java JDK link change (felt like it required more work). --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e5008f1..3dab200c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ The Minecraft Forums page can be found [here] (http://www.minecraftforum.net/top IMPORTANT: This is not guaranteed to work as it has not been tested extensively (Linux and Windows tested). ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Prerequisites (Tested for Windows 7 ONLY!) -1. Download and install the Java JDK [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html). Click the one that says `Java Platform (JDK) #u#`, and follow instructions. +0. WARNING: Make sure you know EXACTLY what you're doing! It's not any of our faults if your OS crashes, becomes corrupted, etc. +1. Download and install the Java JDK [here](http://www.oracle.com/technetwork/java/javase/downloads/jdk7u9-downloads-1859576.html). Scroll down, accept the Oracle Binary Code License Agreement for Java SE, and download the one pertaining to your OS. * Go to `Control Panel\System and Security\System`, and click on `Advanced System Settings` on the left-hand side. * Click on `Environment Variables`. * Under `System Variables`, click `New`. From 27538a9604daec68c16013724410af9f92a6c6d8 Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 14:36:42 -0500 Subject: [PATCH 3/9] Update README.md Changed release.mod.version to pre1d. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3dab200c..8725ee94 100644 --- a/README.md +++ b/README.md @@ -72,15 +72,15 @@ ________________________________________________________________________________ * `dir.share=Shared` (or what you want it to be-optional) * `dir.release=Releases` (what you want it to be) * `release.minecraft.version=1.4.5` (as of 11/30) - * `release.mod.version=pre2` (or whatever version # want it to be) + * `release.mod.version=pre1d` (or whatever version # want it to be) 5. [FOR WINDOWS] Open up `cmd` by typing `cmd` in Run. 6. [FOR WINDOWS] 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.4.5\pre2` (This might be different according to what you put in build.properties). - * You should see a .jar named `ee3-universal-pre2.jar` (Again, might be different). +8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.5\pre1d` (This might be different according to what you put in build.properties). + * You should see a .jar named `ee3-universal-pre1d.jar` (Again, might be different). 9. Copy the jar into your Minecraft mods folder, and play Minecraft! ### To Update EE3 (For Windows/Mac?) From 76ab40448ce7b10ba79553a50547d71751a15fc4 Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 14:38:37 -0500 Subject: [PATCH 4/9] Update README.md Github supports Windows AND Mac 10.7+, so added the Mac download link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8725ee94..f728bcd7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ________________________________________________________________________________ * For `Variable Value`, input `C:\Ant\apache-ant-1.8.4` (or your Ant directory \apache-ant-1.8.4). * 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.8.4\bin). -3. Download and install Github [here] (http://windows.github.com/). +3. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). * Create an account. * Scroll to the top of this page, login at the top-right, and then click `Clone to Windows` near the top-left of the page.. * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). From c15099f31f00fe2ebe7041ece86644f5139afd29 Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 15:24:48 -0500 Subject: [PATCH 5/9] Update README.md Added an unsure Linux tip... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f728bcd7..57e9ebd9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ________________________________________________________________________________ * For `Variable Value`, input `C:\Ant\apache-ant-1.8.4` (or your Ant directory \apache-ant-1.8.4). * 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.8.4\bin). -3. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). +3. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). For Linux, I *guess* 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` near the top-left of the page.. * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). From 9104e4d432e655682780050a0ad47fa7363b10c8 Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 19:50:35 -0500 Subject: [PATCH 6/9] Update README.md Added Github for Mac changes everywhere, typo fixes, stuff. --- README.md | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 57e9ebd9..2d6a3d78 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ ________________________________________________________________________________ * Append `;C:\Ant\apache-ant-1.8.4\bin` exactly as shown to the end (or your Ant directory \apache-ant-1.8.4\bin). 3. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). For Linux, I *guess* 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` near the top-left of the page.. - * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). + * 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. + * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository on Windows defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). 4. Create an empty directory for EE3 development. This directory is refernced as `mcdev` from now on. It can be where you cloned EE3, but it'll be a little messy. 5. You are now ready to setup MCP! @@ -37,16 +37,10 @@ ________________________________________________________________________________ 1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp723.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 name `CHANGELOG` exists inside `mcp`. -3. Get an unmodded copy of minecraft's `bin` folder. Currently EE3 runs on 1.4.5 but that might have changed. - -4. From your `.minecraft` directory (on Windows, defaults to `%appdata%\.minecraft`), copy the `bin` and the `resources` (not sure if necessary) directory to the `jars` directory inside `mcp`. (Forge might do this for you, not confirmed.) - -5. Get an unmodded copy of `minecraft_server.jar` and also place it into `jars`. (Forge might do this for you) - -6. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp` so that `mcp\forge\install.sh` exists. You need at least Forge 6.4.0, best way is to get it from [here] (http://files.minecraftforge.net/). - -7. 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. + * To verify, check if a file named `CHANGELOG` exists inside `mcp`. +3. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp`. You need at least Forge 6.4.0, 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. #### Setup EE3 (Some tested for Linux, tested fully for Windows) 1. Inside `mcdev`, create a directory named `source`. @@ -71,7 +65,7 @@ ________________________________________________________________________________ * `dir.development=../../` * `dir.share=Shared` (or what you want it to be-optional) * `dir.release=Releases` (what you want it to be) - * `release.minecraft.version=1.4.5` (as of 11/30) + * `release.minecraft.version=1.4.5` (as of 12/02) * `release.mod.version=pre1d` (or whatever version # want it to be) 5. [FOR WINDOWS] Open up `cmd` by typing `cmd` in Run. @@ -83,14 +77,14 @@ ________________________________________________________________________________ * You should see a .jar named `ee3-universal-pre1d.jar` (Again, might be different). 9. Copy the jar into your Minecraft mods folder, and play Minecraft! -### To Update EE3 (For Windows/Mac?) +#### To Update EE3 (For Windows/Mac) 1. Check to see if pahimar updated EE3 since you last compiled. If he/she did, follow these instructions. 2. Open Github. 3. Double-click on pahimar/Equivalent-Exchange-3. -4. At the top, there is a button named `Sync` (or `Refreshing...` if its still checking). +4. At the top, there is a button named `Sync`/`Sync Branch` (Mac) (or `Refreshing...` if it's still checking). 5. Click `Sync`, and wait for it to finish. From b4d895a1b9f41dc1bbd1fd6d4a045a220ffb8ddc Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 2 Dec 2012 19:58:06 -0500 Subject: [PATCH 7/9] Update README.md Small changes. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d6a3d78..66187356 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## Welcome to Equivalent Exchange 3! -Setup MCP was done mostly by the people who update the wiki, I just changed it a bit. Some credit goes to BuildCraft's README.md, which I based this README off of. +Setup MCP was done mostly by the people who update How to Compile for Beginners on the wiki, I just updated/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] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3). @@ -77,7 +77,7 @@ ________________________________________________________________________________ * You should see a .jar named `ee3-universal-pre1d.jar` (Again, might be different). 9. Copy the jar into your Minecraft mods folder, and play Minecraft! -#### To Update EE3 (For Windows/Mac) +#### Update EE3 (For Windows/Mac) 1. Check to see if pahimar updated EE3 since you last compiled. If he/she did, follow these instructions. 2. Open Github. From 44f951b9244a38aa4011a2a6c781c28645aafd45 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 3 Dec 2012 18:42:32 -0500 Subject: [PATCH 8/9] Updated formatting for Czech localization file Reordered terms to match the rest of the files, for consistency's sake. --- resources/ee3/lang/cs_CZ.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/ee3/lang/cs_CZ.xml b/resources/ee3/lang/cs_CZ.xml index 0f4d5f02..ab1e846d 100644 --- a/resources/ee3/lang/cs_CZ.xml +++ b/resources/ee3/lang/cs_CZ.xml @@ -2,6 +2,10 @@ Czech (CS) Localization File + Extra + Vypustit + Přepnout + Nabít Úlomek suříku Kámen suříku Kámen mudrců @@ -12,10 +16,6 @@ Proud Zastaralé Chyba připojení - Extra - Vypustit - Přepnout - Nabít Kalcinátor Provádím kontrolu verze, vzdálený soubor umístěn na Kontrola verze neproběhla úspěšně (nezdařila se inicializace) From 9753091d2941027a4053cfbd350ff615597da1e2 Mon Sep 17 00:00:00 2001 From: Dion Williams Date: Tue, 4 Dec 2012 15:16:14 +0000 Subject: [PATCH 9/9] Updated Welsh localisation with alchemical bag names and revised version checker messages --- resources/ee3/lang/cy_GB.xml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/resources/ee3/lang/cy_GB.xml b/resources/ee3/lang/cy_GB.xml index cf0f471b..e0e2111a 100644 --- a/resources/ee3/lang/cy_GB.xml +++ b/resources/ee3/lang/cy_GB.xml @@ -10,14 +10,37 @@ Carreg Anadweithiol Carreg Miniwm Maen Athronwyr + Lludw + Llwch Miniwm + Llwch Werdd + Llwch Asur + Llwch Amorol + Llwch Symudliw + Bag Alcemaidd Gwyn + Bag Alcemaidd Oren + Bag Alcemaidd Magenta + Bag Alcemaidd Glas Golau + Bag Alcemaidd Melyn + Bag Alcemaidd Leim + Bag Alcemaidd Pinc + Bag Alcemaidd Llwyd + Bag Alcemaidd Llwyd Golau + Bag Alcemaidd Gwyrddlas + Bag Alcemaidd Porffor + Bag Alcemaidd Glas + Bag Alcemaidd Brown + Bag Alcemaidd Gwyrdd + Bag Alcemaidd Coch + Bag Alcemaidd Du Dŵr Coch (Llonydd) Dŵr Coch (Llifeiriol) Calchyniadwr Calchyniadwr + Equivalent Exchange 3 Ymgychwynnu gwiriad fersiwn yn erbyn y ffeil awdurdod fersiwn o bell, a leolir ar - Ni gyflawnwyd y gwiriad fersiwn yn llwyddiannus (ni ymgychwynodd y gwiriad fersiwn yn briodol) - Rydych yn defnyddio y fersiwn diweddaraf ar gyfer eich fersiwn o Minecraft - Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - @MOD_UPDATE_LOCATION@ + Ni ymgychwynodd y gwiriad fersiwn yn briodol + Rydych yn defnyddio y fersiwn diweddaraf (@REMOTE_MOD_VERSION@) o Equivalent Exchange 3 ar gyfer @MINECRAFT_VERSION@ + Mae yna fersiwn mwy diweddar o @MOD_NAME@ ar gael (@REMOTE_MOD_VERSION@) ar gyfer @MINECRAFT_VERSION@. Ffeindiwch o yma: @MOD_UPDATE_LOCATION@ Gwall wrth drio cysylltu gyda'r ffeil awdurdod fersiwn o bell (Gwiriwch eich cysylltiad rhwydwaith) Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid