diff --git a/buildapp/AppIcon.icns b/buildapp/AppIcon.icns index 8a7416da3..62140b99f 100644 Binary files a/buildapp/AppIcon.icns and b/buildapp/AppIcon.icns differ diff --git a/buildapp/appimagetool-aarch64.AppImage b/buildapp/appimagetool-aarch64.AppImage new file mode 100644 index 000000000..94621e5c3 Binary files /dev/null and b/buildapp/appimagetool-aarch64.AppImage differ diff --git a/buildapp/appimagetool-x86_64.AppImage b/buildapp/appimagetool-x86_64.AppImage old mode 100755 new mode 100644 index 25365df3f..8e613d065 Binary files a/buildapp/appimagetool-x86_64.AppImage and b/buildapp/appimagetool-x86_64.AppImage differ diff --git a/buildapp/build_app_linux_arm.sh b/buildapp/build_app_linux_arm.sh index 745456d80..0a67831da 100755 --- a/buildapp/build_app_linux_arm.sh +++ b/buildapp/build_app_linux_arm.sh @@ -2,7 +2,7 @@ if (( $EUID == 0 )); then echo "The build process is not meant to be run with root privilege, exiting now." >&2; exit 1; fi cd "${0%/*}" -APPIMAGETOOL="appimagetool-x86_64.AppImage" +APPIMAGETOOL="appimagetool-aarch64.AppImage" # Note to self: run this on Asahi SRCFILES="terrarumlinux_arm" DESTDIR="TerrarumLinux.arm" RUNTIME="runtime-linux-arm" @@ -35,7 +35,7 @@ mv $DESTDIR/assets_release $DESTDIR/assets cp "../out/$JARNAME" $DESTDIR/out/ # Pack everything to AppImage -ARCH=arm_aarch64 "./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; } +"./$APPIMAGETOOL" $DESTDIR "out/$DESTDIR.AppImage" || { echo 'Building AppImage failed' >&2; exit 1; } chmod +x "out/$DESTDIR.AppImage" rm -rf $DESTDIR || true echo "Build successful: $DESTDIR" diff --git a/buildapp/make_assets_release.sh b/buildapp/make_assets_release.sh index 8d4942515..2bc78ab0d 100755 --- a/buildapp/make_assets_release.sh +++ b/buildapp/make_assets_release.sh @@ -21,8 +21,10 @@ rm $DESTDIR/mods/basegame/blocks/*.txt rm $DESTDIR/mods/basegame/weathers/*.txt rm $DESTDIR/mods/basegame/weathers/*.md rm $DESTDIR/mods/basegame/weathers/*.kra -rm -r $DESTDIR/mods/basegame/sounds +rm -r $DESTDIR/mods/basegame/audio/music/ rm -r $DESTDIR/mods/dwarventech +rm -r $DESTDIR/mods/myawesomemod +rm -r $DESTDIR/mods/musicplayer for s in .directory .DS_Store Thumbs.db thumbs.db; do rm $DESTDIR/$s diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index 89126ac47..1b76cb49b 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -73,6 +73,7 @@ basegame // Commit counts up to the Release 0.3.3: 3020 val VERSION_SNAPSHOT = if (App.IS_DEVELOPMENT_BUILD) Snapshot(0) else null +// val VERSION_SNAPSHOT = ForcedSnapshot("24w04a") const val VERSION_TAG: String = ""