Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git
This commit is contained in:
André Carvalho
commit
ad00195498
6 changed files with 14 additions and 33 deletions
25
README.md
25
README.md
|
|
@ -10,7 +10,7 @@ The Minecraft Forums page can be found [here] (http://www.minecraftforum.net/top
|
|||
### Compiling Equivalent Exchange 3
|
||||
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 ONLY!)
|
||||
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/jdk7-downloads-1880260.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.
|
||||
|
|
@ -33,26 +33,21 @@ ________________________________________________________________________________
|
|||
* 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!
|
||||
|
||||
|
||||
#### Setup MCP (Linux and Windows 7 tested)
|
||||
#### 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. mcp725.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.4.6 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/).
|
||||
3. Download the latest forge **source** for Minecraft 1.4.6 and unzip it into `mcp`. You need at least Forge 6.5.0.470, 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`.
|
||||
|
||||
2. Move/clone `Equivalent-Exchange-3` into `source`.
|
||||
|
||||
3. Right now, you should have a directory that looks something like:
|
||||
|
||||
***
|
||||
|
||||
mcdev
|
||||
|
|
@ -69,29 +64,22 @@ ________________________________________________________________________________
|
|||
* `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.6` (as of 12/20)
|
||||
* `release.mod.version=pre1d` (or whatever version # want it to be)
|
||||
* `release.minecraft.version=1.4.6` (as of 12/25)
|
||||
* `release.mod.version=pre1e` (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.6\pre1d` (This might be different according to what you put in build.properties).
|
||||
8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.6\pre1e` (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!
|
||||
|
||||
#### 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`/`Sync Branch` (Mac) (or `Refreshing...` if it's still checking).
|
||||
|
||||
5. Click `Sync`, and wait for it to finish.
|
||||
|
||||
6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.)
|
||||
|
||||
###Contributing
|
||||
|
|
@ -99,6 +87,7 @@ ________________________________________________________________________________
|
|||
#### Submitting a PR
|
||||
So you found a bug in pahimar's code? Think you can make it more efficient? Want to help in general? Great!
|
||||
|
||||
0. IMPORTANT: PAHIMAR DOES **NOT** WANT ANY `build.xml` CHANGES, UNLESS it fixes up something broken (See [Pull Request #90] (https://github.com/pahimar/Equivalent-Exchange-3/pull/90)).
|
||||
1. If you haven't already, create a Github account.
|
||||
2. Click `Fork` at the top-right of this page (below your username)
|
||||
3. Make the changes that you want to.
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@
|
|||
<entry key="tile.redWaterStill.name">Rudá voda (v klidu)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Rudá voda (tekoucí)</entry>
|
||||
<entry key="tile.calcinator.name">Kalcinátor</entry>
|
||||
<entry key="version.uninitialized">Neinicializováno</entry>
|
||||
<entry key="version.current">Proud</entry>
|
||||
<entry key="version.outdated">Zastaralé</entry>
|
||||
<entry key="version.connection_error">Chyba připojení</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.uninitialized">Kontrola verze neproběhla úspěšně (nezdařila se inicializace)</entry>
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@
|
|||
<entry key="tile.calcinator.name">煆焼器</entry>
|
||||
<entry key="gui.calcinator.name">煆焼器</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
<entry key="text.impure">不純</entry>
|
||||
<entry key="text.pure">純粋</entry>
|
||||
<entry key="version.init_log_message">オンラインバージョンチェックの初期化中。場所:</entry>
|
||||
<entry key="version.uninitialized">バージョンチェックに失敗しました。 (初期化に失敗しました。)</entry>
|
||||
<entry key="version.current">Minecraft本体に適合する最新バージョンです。</entry>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
<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="key.release">Libe</entry>
|
||||
<entry key="key.toggle">Muta</entry>
|
||||
<entry key="key.charge">Trade</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>
|
||||
|
|
@ -37,8 +37,6 @@
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
<entry key="item.alchemyBag.green.name">Saco Alquímico Verde</entry>
|
||||
<entry key="item.alchemyBag.red.name">Saco Alquímico Vermelho</entry>
|
||||
<entry key="item.alchemyBag.black.name">Saco Alquímico Preto</entry>
|
||||
<entry key="tile.redWaterStill.name">Água Vermelha Estagnada</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Água Vermelha a fluir</entry>
|
||||
<entry key="tile.redWaterStill.name">Água Vermelha (Estagnada)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Água Vermelha (a Fluir)</entry>
|
||||
<entry key="tile.calcinator.name">Calcinatório</entry>
|
||||
<entry key="gui.calcinator.name">Calcinatório</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
<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">pre1d|http://goo.gl/Ria2V</entry>
|
||||
<entry key="Minecraft 1.4.6">pre1d|http://goo.gl/Ria2V</entry>
|
||||
<entry key="Minecraft 1.4.6">pre1e|http://goo.gl/Ria2V</entry>
|
||||
</properties>
|
||||
Loading…
Reference in a new issue