diff --git a/.gitignore b/.gitignore index de81a7a..8725192 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,7 @@ eclipse/ gradle/ build/ debug/ -libs/ -/bin/ +bin/ config/ crash-reports/ logs/ diff --git a/.gitmodules b/.gitmodules index 5831d37..abf14e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "api/thaumcraft/api"] - path = api/thaumcraft/api +[submodule "src/main/java/api/thaumcraft/api"] + path = src/main/java/api/thaumcraft/api url = https://github.com/Azanor/thaumcraft-api diff --git a/build.gradle b/build.gradle index ee5a5ff..6248d5e 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,7 @@ sourceSets { dependencies { compile "net.sengir.forestry:forestry_${project.version_mc}:${project.version_forestry}:dev" compile files("/libs/BloodMagic-${project.version_mc}-${project.version_bloodmagic}.jar") + compile files("/libs/Botania ${project.version_botania}-deobf.jar") } processResources diff --git a/gradle.properties b/gradle.properties index 1c60d94..3a0c0ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ version_major=2 version_minor=2 -version_rev=1 +version_rev=3 version_forestry=3.4.0.7 version_bloodmagic=1.3.1-7 +version_botania=r1.6-180 version_mc=1.7.10 version_forge=10.13.2.1230 diff --git a/libs/BloodMagic-1.7.10-1.3.1-7.jar b/libs/BloodMagic-1.7.10-1.3.1-7.jar new file mode 100644 index 0000000..3330e3d Binary files /dev/null and b/libs/BloodMagic-1.7.10-1.3.1-7.jar differ diff --git a/libs/Botania r1.6-180-deobf.jar b/libs/Botania r1.6-180-deobf.jar new file mode 100644 index 0000000..ed71bcd Binary files /dev/null and b/libs/Botania r1.6-180-deobf.jar differ diff --git a/api/thaumcraft/api b/src/main/java/api/thaumcraft/api similarity index 100% rename from api/thaumcraft/api rename to src/main/java/api/thaumcraft/api