Merge branch 'master' into development

docs/Development.md

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