Merge remote-tracking branch 'upstream/master'
Conflicts: common/mekanism/common/BlockEnergyCube.java common/mekanism/common/TileEntityEnergyCube.java
This commit is contained in:
Ben Spiers
commit
0b786aa0b0
819 changed files with 2945 additions and 1658 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 248 B |
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<copy todir="${dir.mcp}/src/minecraft">
|
||||
|
||||
<fileset dir="${dir.development}src">
|
||||
<fileset dir="${dir.development}common">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<exclude name="**/mekanism/tools/**"/>
|
||||
</fileset>
|
||||
|
||||
<fileset dir="${dir.development}bin/minecraft"/>
|
||||
<fileset dir="${dir.development}resources"/>
|
||||
|
||||
<fileset dir="${dir.development}etc/core"/>
|
||||
</copy>
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
</copy>
|
||||
|
||||
<copy todir="mdkContents">
|
||||
<fileset dir="${dir.development}src/minecraft">
|
||||
<fileset dir="${dir.development}common">
|
||||
<include name = "**/mekanism/api/**"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue