merged with pre-1.9p5 branch, for 1.0.0 release

This commit is contained in:
Space Toad committed 2011-11-30 19:00:43 +00:00
1 parent d2cf70f8d5
commit 96c05bbd25
83 files changed
+953 -1192

No files matched your search

+6 -2
View File
@@ -11,8 +11,12 @@ cmd /C decompile.bat
pushd src >nul
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch
..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch
..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch
rem ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/mlprop.patch ../forge/mlprop.patch
rem ..\runtime\bin\applydiff.exe -uf -p1 -i ../forge/mlprop.patch
del minecraft\net\minecraft\src\MLProp.java
copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
del minecraft_server\net\minecraft\src\MLProp.java
copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java
for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do (
pushd "%%a" 2>nul
+3 -1
View File
@@ -11,7 +11,9 @@ pushd .. > /dev/null
pushd src > /dev/null
find . -name *.java -exec sed -i 's/\r//g' \{\} \;
patch -p2 -i ../forge/modLoaderMP.patch
patch -p1 -i ../forge/mlprop.patch
#patch -p1 -i ../forge/mlprop.patch
cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java
cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java
for i in `find ../forge/patches/ -type f`
do
patch -p2 -i $i