Merging Canvox's patch #105

Merged
StevenRS11 merged 31 commits from master into master 2013-12-17 01:52:53 +00:00
Showing only changes of commit 1e6a4a8b4a - Show all commits

View File

@@ -14,7 +14,7 @@
<property name="build.dir" value="build" /> <property name="build.dir" value="build" />
<property name="classes.dir" value="${build.dir}/packaging" /> <property name="classes.dir" value="${build.dir}/packaging" />
<property name="resourcePack.dir" value="${classes.dir}/assets/" /> <property name="resourcePack.dir" value="${classes.dir}" />
<property name="schematicPack.dir" value="${classes.dir}/schematics/" /> <property name="schematicPack.dir" value="${classes.dir}/schematics/" />
<property name="apiclasses.dir" value="${build.dir}/api-packaging" /> <property name="apiclasses.dir" value="${build.dir}/api-packaging" />
<property name="forge.version" value="${minecraft.version}-${forge.forgeversion}.${forge.buildnum}" /> <property name="forge.version" value="${minecraft.version}-${forge.forgeversion}.${forge.buildnum}" />
@@ -144,10 +144,6 @@
<fileset file="${resources.dir}/pack.mcmeta" /> <fileset file="${resources.dir}/pack.mcmeta" />
</copy> </copy>
<copy todir="${classes.dir}">
<fileset file="${resources.dir}/dimdoors_logo.png" />
</copy>
<delete file="${resourcePack.dir}/mcmod.info" /> <delete file="${resourcePack.dir}/mcmod.info" />
<delete file="${resourcePack.dir}/pack.mcmeta" /> <delete file="${resourcePack.dir}/pack.mcmeta" />