Merge remote-tracking branch 'upstream/master'
This commit is contained in:
André Carvalho
commit
7acb6f617d
3 changed files with 99 additions and 61 deletions
28
README.md
28
README.md
|
|
@ -1,7 +1,7 @@
|
|||
## Welcome to Equivalent Exchange 3!
|
||||
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.
|
||||
**LATEST OFFICIAL VERSION**: EE3 pre1f for MC 1.4.7(pre).
|
||||
|
||||
The Minecraft Forums page can be found [here] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3).
|
||||
[Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3)
|
||||
|
||||
[Compiling EE3] (https://github.com/pahimar/Equivalent-Exchange-3#compiling-equivalent-exchange-3)
|
||||
|
||||
|
|
@ -9,10 +9,10 @@ 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 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.
|
||||
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.
|
||||
* Click on `Environment Variables`.
|
||||
* Under `System Variables`, click `New`.
|
||||
|
|
@ -37,17 +37,18 @@ ________________________________________________________________________________
|
|||
|
||||
|
||||
#### 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.
|
||||
1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp726.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.5.0.470, best way is to get it from [here] (http://files.minecraftforge.net/).
|
||||
3. Download the latest forge **source** for Minecraft 1.4.7 and unzip it into `mcp`. You need at least Forge 6.6.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.
|
||||
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
|
||||
|
|
@ -59,19 +60,20 @@ ________________________________________________________________________________
|
|||
\-Equivalent-Exchange-3
|
||||
\-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:
|
||||
* Open it up with any text editor, and type into it the following (fully customizable except for `dir.development`):
|
||||
* `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/25)
|
||||
* `release.mod.version=pre1e` (or whatever version # want it to be)
|
||||
* `release.minecraft.version=1.4.7` (as of 1/04)
|
||||
* `release.mod.version=your version number here`
|
||||
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\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).
|
||||
8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.7\[version number]` (This might be different according to what you put in build.properties).
|
||||
* You should see a .jar named `ee3-universal-[version number]jar`.
|
||||
9. Copy the jar into your Minecraft mods folder, and play Minecraft!
|
||||
|
||||
#### Update EE3 (For Windows/Mac)
|
||||
|
|
@ -83,7 +85,7 @@ ________________________________________________________________________________
|
|||
6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.)
|
||||
|
||||
###Contributing
|
||||
___________________________________________________________________________________________________________________________________________________
|
||||
***
|
||||
#### 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!
|
||||
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@
|
|||
<entry key="tile.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 yr awdurdod fersiwn pell, a leolir ar</entry>
|
||||
<entry key="version.uninitialized">Ni ymgychwynodd y gwiriad fersiwn yn briodol</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">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.check_disabled">Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid</entry>
|
||||
<entry key="version.general_error">Gwall wrth drio gwirio y ffeil awdurdod fersiwn pell</entry>
|
||||
<entry key="version.check_disabled">Gwiriad fersiwn pell wedi'i ddiffodd, esgusodid</entry>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -1,46 +1,82 @@
|
|||
<?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="item.alchemyBag.white.name">Bolsa Alquímica Branca</entry>
|
||||
<entry key="item.alchemyBag.orange.name">Bolsa Alquímica Laranja</entry>
|
||||
<entry key="item.alchemyBag.magenta.name">Bolsa Alquímica Magenta</entry>
|
||||
<entry key="item.alchemyBag.light_blue.name">Bolsa Alquímica Azul-Claro</entry>
|
||||
<entry key="item.alchemyBag.yellow.name">Bolsa Alquímica Amarela</entry>
|
||||
<entry key="item.alchemyBag.lime.name">Bolsa Alquímica Lima</entry>
|
||||
<entry key="item.alchemyBag.pink.name">Bolsa Alquímica Rosa</entry>
|
||||
<entry key="item.alchemyBag.gray.name">Bolsa Alquímica Cinza</entry>
|
||||
<entry key="item.alchemyBag.light_gray.name">Bolsa Alquímica Cinza-Claro</entry>
|
||||
<entry key="item.alchemyBag.cyan.name">Bolsa Alquímica Ciano</entry>
|
||||
<entry key="item.alchemyBag.purple.name">Bolsa Alquímica Roxa</entry>
|
||||
<entry key="item.alchemyBag.blue.name">Bolsa Alquímica Azul</entry>
|
||||
<entry key="item.alchemyBag.brown.name">Bolsa Alquímica Marrom</entry>
|
||||
<entry key="item.alchemyBag.green.name">Bolsa Alquímica Verde</entry>
|
||||
<entry key="item.alchemyBag.red.name">Bolsa Alquímica Vermelha</entry>
|
||||
<entry key="item.alchemyBag.black.name">Bolsa Alquímica Negra</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>
|
||||
<?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="item.alchemyBag.white.name">Bolsa Alquímica Branca</entry>
|
||||
<entry key="item.alchemyBag.orange.name">Bolsa Alquímica Laranja</entry>
|
||||
<entry key="item.alchemyBag.magenta.name">Bolsa Alquímica Magenta</entry>
|
||||
<entry key="item.alchemyBag.light_blue.name">Bolsa Alquímica Azul-Claro</entry>
|
||||
<entry key="item.alchemyBag.yellow.name">Bolsa Alquímica Amarela</entry>
|
||||
<entry key="item.alchemyBag.lime.name">Bolsa Alquímica Lima</entry>
|
||||
<entry key="item.alchemyBag.pink.name">Bolsa Alquímica Rosa</entry>
|
||||
<entry key="item.alchemyBag.gray.name">Bolsa Alquímica Cinza</entry>
|
||||
<entry key="item.alchemyBag.light_gray.name">Bolsa Alquímica Cinza-Claro</entry>
|
||||
<entry key="item.alchemyBag.cyan.name">Bolsa Alquímica Ciano</entry>
|
||||
<entry key="item.alchemyBag.purple.name">Bolsa Alquímica Roxa</entry>
|
||||
<entry key="item.alchemyBag.blue.name">Bolsa Alquímica Azul</entry>
|
||||
<entry key="item.alchemyBag.brown.name">Bolsa Alquímica Marrom</entry>
|
||||
<entry key="item.alchemyBag.green.name">Bolsa Alquímica Verde</entry>
|
||||
<entry key="item.alchemyBag.red.name">Bolsa Alquímica Vermelha</entry>
|
||||
<entry key="item.alchemyBag.black.name">Bolsa Alquímica Negra</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>
|
||||
<entry key="command.ee3.on">Ligado</entry>
|
||||
<entry key="command.ee3.off">Desligado</entry>
|
||||
<entry key="command.ee3.all">Tudo</entry>
|
||||
<entry key="command.ee3.self">Próprio</entry>
|
||||
<entry key="command.ee3.overlay">Sobreposição</entry>
|
||||
<entry key="command.ee3.position">Posição</entry>
|
||||
<entry key="command.ee3.opacity">Opacidade</entry>
|
||||
<entry key="command.ee3.scale">Escala</entry>
|
||||
<entry key="command.ee3.top">Topo</entry>
|
||||
<entry key="command.ee3.bottom">Base</entry>
|
||||
<entry key="command.ee3.left">Esquerda</entry>
|
||||
<entry key="command.ee3.right">Direita</entry>
|
||||
<entry key="command.ee3.particles">Partículas</entry>
|
||||
<entry key="command.ee3.sounds">Sons</entry>
|
||||
<entry key="command.ee3.version">Versão</entry>
|
||||
<entry key="command.ee3.usage">command.ee3.usage</entry>
|
||||
<entry key="command.ee3.overlay.usage"> </entry>
|
||||
<entry key="command.ee3.overlay.turned_on"> </entry>
|
||||
<entry key="command.ee3.overlay.turned_off"> </entry>
|
||||
<entry key="command.ee3.overlay.position.usage"> </entry>
|
||||
<entry key="command.ee3.overlay.position.top_left"> </entry>
|
||||
<entry key="command.ee3.overlay.position.top_right"> </entry>
|
||||
<entry key="command.ee3.overlay.position.bottom_left"> </entry>
|
||||
<entry key="command.ee3.overlay.position.bottom_right"> </entry>
|
||||
<entry key="command.ee3.overlay.opacity.usage"> </entry>
|
||||
<entry key="command.ee3.overlay.opacity.updated"> </entry>
|
||||
<entry key="command.ee3.overlay.scale.usage"> </entry>
|
||||
<entry key="command.ee3.overlay.scale.updated"> </entry>
|
||||
<entry key="command.ee3.particles.usage"> </entry>
|
||||
<entry key="command.ee3.particles.turned_on"> </entry>
|
||||
<entry key="command.ee3.particles.turned_off"> </entry>
|
||||
<entry key="command.ee3.sounds.usage"> </entry>
|
||||
<entry key="command.ee3.sounds.set_to_all"> </entry>
|
||||
<entry key="command.ee3.sounds.set_to_self"> </entry>
|
||||
<entry key="command.ee3.sounds.turned_off"> </entry>
|
||||
<entry key="command.ee3.version.usage"> </entry>
|
||||
</properties>
|
||||
Loading…
Reference in a new issue