Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
pahimar 2012-12-04 16:12:37 -05:00
commit d95ab7473a
3 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
README.md
View file

@ -1,5 +1,5 @@
## Welcome to Equivalent Exchange 3! ## 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). The Minecraft Forums page can be found [here] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3).
@ -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). IMPORTANT: This is not guaranteed to work as it has not been tested extensively (Linux and Windows tested).
____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________
#### Prerequisites (Tested for Windows 7 ONLY!) #### 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. * Go to `Control Panel\System and Security\System`, and click on `Advanced System Settings` on the left-hand side.
* Click on `Environment Variables`. * Click on `Environment Variables`.
* Under `System Variables`, click `New`. * Under `System Variables`, click `New`.
@ -23,10 +24,10 @@ ________________________________________________________________________________
* For `Variable Value`, input `C:\Ant\apache-ant-1.8.4` (or your Ant directory \apache-ant-1.8.4). * 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. * 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). * 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+). For Linux, I *guess* you could download it as a .zip/tarball and unzip it?
* Create an account. * 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.. * 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 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). * 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. 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! 5. You are now ready to setup MCP!
@ -36,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. 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. 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`. * To verify, check if a file named `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. 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. 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.) 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.
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.
#### Setup EE3 (Some tested for Linux, tested fully for Windows) #### Setup EE3 (Some tested for Linux, tested fully for Windows)
1. Inside `mcdev`, create a directory named `source`. 1. Inside `mcdev`, create a directory named `source`.
@ -63,33 +58,33 @@ ________________________________________________________________________________
\-jars \-jars
\-source \-source
\-Equivalent-Exchange-3 \-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`. 4. Inside `Equivalent-Exchange-3`, create a new file called `build.properties`.
* Open it up, and type into it the following: * Open it up, and type into it the following:
* `dir.development=../../` * `dir.development=../../`
* `dir.share=Shared` (or what you want it to be-optional) * `dir.share=Shared` (or what you want it to be-optional)
* `dir.release=Releases` (what you want it to be) * `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=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. 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`. 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. 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. * 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). 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-pre2.jar` (Again, might be different). * 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! 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. 1. Check to see if pahimar updated EE3 since you last compiled. If he/she did, follow these instructions.
2. Open Github. 2. Open Github.
3. Double-click on pahimar/Equivalent-Exchange-3. 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. 5. Click `Sync`, and wait for it to finish.

8
resources/ee3/lang/cs_CZ.xml
View file

@ -2,6 +2,10 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0"> <properties version="1.0">
<comment>Czech (CS) Localization File</comment> <comment>Czech (CS) Localization File</comment>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Vypustit</entry>
<entry key="key.toggle">Přepnout</entry>
<entry key="key.charge">Nabít</entry>
<entry key="item.miniumShard.name">Úlomek suříku</entry> <entry key="item.miniumShard.name">Úlomek suříku</entry>
<entry key="item.miniumStone.name">Kámen suříku</entry> <entry key="item.miniumStone.name">Kámen suříku</entry>
<entry key="item.philStone.name">Kámen mudrců</entry> <entry key="item.philStone.name">Kámen mudrců</entry>
@ -12,10 +16,6 @@
<entry key="version.current">Proud</entry> <entry key="version.current">Proud</entry>
<entry key="version.outdated">Zastaralé</entry> <entry key="version.outdated">Zastaralé</entry>
<entry key="version.connection_error">Chyba připojení</entry> <entry key="version.connection_error">Chyba připojení</entry>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Vypustit</entry>
<entry key="key.toggle">Přepnout</entry>
<entry key="key.charge">Nabít</entry>
<entry key="gui.calcinator.name">Kalcinátor</entry> <entry key="gui.calcinator.name">Kalcinátor</entry>
<entry key="version.init_log_message">Provádím kontrolu verze, vzdálený soubor umístěn na </entry> <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.uninitialized">Kontrola verze neproběhla úspěšně (nezdařila se inicializace)</entry>

29
resources/ee3/lang/cy_GB.xml
View file

@ -10,14 +10,37 @@
<entry key="item.inertStone.name">Carreg Anadweithiol</entry> <entry key="item.inertStone.name">Carreg Anadweithiol</entry>
<entry key="item.miniumStone.name">Carreg Miniwm</entry> <entry key="item.miniumStone.name">Carreg Miniwm</entry>
<entry key="item.philStone.name">Maen Athronwyr</entry> <entry key="item.philStone.name">Maen Athronwyr</entry>
<entry key="item.alchemyDust.ash.name">Lludw</entry>
<entry key="item.alchemyDust.minium.name">Llwch Miniwm</entry>
<entry key="item.alchemyDust.verdant.name">Llwch Werdd</entry>
<entry key="item.alchemyDust.azure.name">Llwch Asur</entry>
<entry key="item.alchemyDust.amaranthine.name">Llwch Amorol</entry>
<entry key="item.alchemyDust.iridescent.name">Llwch Symudliw</entry>
<entry key="item.alchemyBag.white.name">Bag Alcemaidd Gwyn</entry>
<entry key="item.alchemyBag.orange.name">Bag Alcemaidd Oren</entry>
<entry key="item.alchemyBag.magenta.name">Bag Alcemaidd Magenta</entry>
<entry key="item.alchemyBag.light_blue.name">Bag Alcemaidd Glas Golau</entry>
<entry key="item.alchemyBag.yellow.name">Bag Alcemaidd Melyn</entry>
<entry key="item.alchemyBag.lime.name">Bag Alcemaidd Leim</entry>
<entry key="item.alchemyBag.pink.name">Bag Alcemaidd Pinc</entry>
<entry key="item.alchemyBag.gray.name">Bag Alcemaidd Llwyd</entry>
<entry key="item.alchemyBag.light_gray.name">Bag Alcemaidd Llwyd Golau</entry>
<entry key="item.alchemyBag.cyan.name">Bag Alcemaidd Gwyrddlas</entry>
<entry key="item.alchemyBag.purple.name">Bag Alcemaidd Porffor</entry>
<entry key="item.alchemyBag.blue.name">Bag Alcemaidd Glas</entry>
<entry key="item.alchemyBag.brown.name">Bag Alcemaidd Brown</entry>
<entry key="item.alchemyBag.green.name">Bag Alcemaidd Gwyrdd</entry>
<entry key="item.alchemyBag.red.name">Bag Alcemaidd Coch</entry>
<entry key="item.alchemyBag.black.name">Bag Alcemaidd Du</entry>
<entry key="tile.redWaterStill.name">Dŵr Coch (Llonydd)</entry> <entry key="tile.redWaterStill.name">Dŵr Coch (Llonydd)</entry>
<entry key="tile.redWaterFlowing.name">Dŵr Coch (Llifeiriol)</entry> <entry key="tile.redWaterFlowing.name">Dŵr Coch (Llifeiriol)</entry>
<entry key="tile.calcinator.name">Calchyniadwr</entry> <entry key="tile.calcinator.name">Calchyniadwr</entry>
<entry key="gui.calcinator.name">Calchyniadwr</entry> <entry key="gui.calcinator.name">Calchyniadwr</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Ymgychwynnu gwiriad fersiwn yn erbyn y ffeil awdurdod fersiwn o bell, a leolir ar</entry> <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.uninitialized">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.current">Rydych yn defnyddio y fersiwn diweddaraf (@REMOTE_MOD_VERSION@) o Equivalent Exchange 3 ar gyfer @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - @MOD_UPDATE_LOCATION@</entry> <entry key="version.outdated">Mae yna fersiwn mwy diweddar o @MOD_NAME@ ar gael (@REMOTE_MOD_VERSION@) ar gyfer @MINECRAFT_VERSION@. Ffeindiwch o 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.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> <entry key="version.check_disabled">Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid</entry>
</properties> </properties>