Paper 1.9.4 Update

scripts/importmcdev.sh

@@ -22,6 +22,8 @@ function import {
 		export MODLOG="$MODLOG  Imported $file from mc-dev\n";
 		echo "Copying $base to $target"
 		cp "$base" "$target"
+	else
+		echo "UN-NEEDED IMPORT: $file"
 	fi
 }
 
@@ -42,7 +44,6 @@ import BlockFluids
 import BlockFurnace
 import BlockIceFrost
 import BlockPosition
-import BlockStateList
 import ChunkCache
 import ChunkProviderFlat
 import ChunkProviderGenerate
@@ -57,6 +58,7 @@ import EntitySquid
 import EntityWaterAnimal
 import FileIOThread
 import ItemBlock
+import NavigationAbstract
 import NBTTagCompound
 import NBTTagList
 import PersistentScoreboard

scripts/rebuildPatches.sh

@@ -33,7 +33,20 @@ function savePatches {
     echo "Formatting patches for $what..."
 
     cd "$basedir/${what_name}-Patches/"
-    rm -rf *.patch
+    if [ -d "$basedir/$target/.git/rebase-apply" ]; then
+        # in middle of a rebase, be smarter
+        echo "REBASE DETECTED - PARTIAL SAVE"
+        last=$(cat "$basedir/$target/.git/rebase-apply/last")
+        next=$(cat "$basedir/$target/.git/rebase-apply/next")
+        for i in $(seq -w 1 1 $last)
+        do
+            if [ $i -lt $next ]; then
+                rm 0$i-*
+            fi
+        done
+    else
+        rm -rf *.patch
+    fi
 
     cd "$basedir/$target"