Merge branch 'master' into development

This commit is contained in:
Aidan C. Brady 2014-07-21 16:59:18 -04:00
commit b4be235f82

View file

@ -1,43 +1,41 @@
# Development # Development
Mekanism is developed for Minecraft 1.6.2 using Minecraft Forge. Mekanism is developed for Minecraft 1.7.10 using Minecraft Forge.
## Prerequisites ## Prerequisites
* Minecraft Forge for MC 1.6.2 <http://files.minecraftforge.net/> * Gradle - Version 1.12 is known to work, your mileage with other versions may vary
* Dev build of CodeChickenCore for MC 1.6.2 <http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php>
* Dev build of NEI for MC 1.6.2 <http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php>
## Directory Structure ## Directory Structure
* /common - Source code * /src - Source code
- / _other_ _mod_ _apis_ - /api/java/_other_mod_apis_
- /mekanism - /main - our code
- /{api,client,common} - Core Mekanism mod - /java/mekanism - Our code
- /generators - Generators Mod - /{api,client,common} - Core Mekanism mod
- /tools - Tools Mod - /generators - Generators Mod
- /tools - Tools Mod
- /resources/assets - Our textures and other non-code assets
* /docs - Documentation * /docs - Documentation
* /etc - logo and mcmod.info for each package * /etc - logo and mcmod.info for each package
* /resources - Non-code assets for the core mod
## Packaging structure ## Packaging structure
### Mekanism.jar ### Mekanism.jar
* /assets - From /resources/assets * /assets - From /src/main/resources/assets
* / _other_ _mod_ _apis_ - .class files from /common/ _other_ _mod_ _apis_ * /mekanism/{api,client,common} - .class files from /src/main/java/mekanism/{api,client,common}
* /mekanism/{api,client,common} - .class files from /common/mekanism/{api,client,common}
* logo.png - from /etc/core * logo.png - from /etc/core
* mcmod.info - from /etc/core * mcmod.info - from /etc/core
### MekanismGenerators.jar ### MekanismGenerators.jar
* /mekanism/generators - .class files from /common/mekanism/generators * /mekanism/generators - .class files from /src/main/java/mekanism/generators
* logo.png - from /etc/generators * logo.png - from /etc/generators
* mcmod.info - from /etc/generators * mcmod.info - from /etc/generators
### MekanismTools.jar ### MekanismTools.jar
* /mekanism/tools - .class files from /common/mekanism/tools * /mekanism/tools - .class files from /src/main/java/mekanism/tools
* logo.png - from /etc/tools * logo.png - from /etc/tools
* mcmod.info - from /etc/tools * mcmod.info - from /etc/tools