get rid of current-paper; update options of format-patch

scripts/generateImports.sh

@@ -9,8 +9,6 @@ basedir=$1
 
 source "$basedir/scripts/functions.sh"
 
-paperVer=$(cat current-paper)
-
 paperworkdir="$basedir/Paper/work"
 minecraftversion=$(cat $paperworkdir/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompile="$paperworkdir/Minecraft/$minecraftversion/spigot"
@@ -43,6 +41,6 @@ done
 # push the dev project
 cd $basedir/mc-dev
 $gitcmd add . -A
-$gitcmd commit . -m "$paperVer"
-$gitcmd tag -a "$paperVer" -m "$paperVer" 2>/dev/null
+$gitcmd commit . -m "akarin-base"
+$gitcmd tag -a "akarin-base" -m "akarin-base" 2>/dev/null
 # gitpush . $MCDEV_REPO $paperVer

scripts/rebuildPatches.sh

@@ -35,7 +35,7 @@ function savePatches {
     fi
 
     cd "$basedir/$targetname"
-    $gitcmd format-patch --no-stat -N -o "$basedir/patches/$2" upstream/upstream >/dev/null
+    $gitcmd format-patch --no-signature --zero-commit --full-index --no-stat -N -o "$basedir/patches/$2" upstream/upstream >/dev/null
 	basedir
     $gitcmd add -A "$basedir/patches/$2"
 	echo "  $(bashcolor 1 32)($3/$4)$(bashcolorend) - Patches saved for $targetname to patches/$2"