Merge remote-tracking branch 'origin/main'

# Conflicts:
#	export_presets.cfg
#	scripts/build_playtest.sh
This commit is contained in:
Alexander Sellite 2026-08-12 11:22:50 -04:00
commit 9729c278dc
54 changed files with 1627 additions and 261 deletions

View file

@ -9,7 +9,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*"
export_path="builds/v0.6.5-alpha/windows-x86_64/NETfishing.exe"
export_path="builds/v0.6.7-alpha/windows-x86_64/NETfishing.exe"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
@ -35,11 +35,11 @@ application/modify_resources=true
application/icon="res://art/exported/system_icons/netfishing.ico"
application/console_wrapper_icon=""
application/icon_interpolation=4
application/file_version="0.6.5.0"
application/product_version="0.6.5.0"
application/file_version="0.6.7.0"
application/product_version="0.6.7.0"
application/company_name="Woofmeow"
application/product_name="NETfishing"
application/file_description="NETfishing v0.6.5-alpha"
application/file_description="NETfishing v0.6.7-alpha"
application/copyright="Copyright © 2026 Alexander Sellite and Rheannon Eisworth"
application/trademarks="NETfishing and Woofmeow branding is reserved; see TRADEMARKS.md"
application/export_angle=0
@ -62,7 +62,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*"
export_path="builds/v0.6.5-alpha/linux-arm64/NETfishing.arm64"
export_path="builds/v0.6.7-alpha/linux-arm64/NETfishing.arm64"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
@ -92,7 +92,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*"
export_path="builds/v0.6.5-alpha/macos/NETfishing.zip"
export_path="builds/v0.6.7-alpha/macos/NETfishing.zip"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
@ -108,8 +108,8 @@ custom_template/release=""
application/bundle_identifier="io.woofmeow.netfishing"
application/icon="res://art/exported/system_icons/netfishing_1024.png"
application/icon_interpolation=0
application/short_version="0.6.4"
application/version="0.6.4"
application/short_version="0.6.7"
application/version="0.6.7"
application/architecture="universal"
codesign/enable=false
notarization/enable=false
@ -125,7 +125,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*,tests/*"
export_path="builds/v0.6.5-alpha/server-linux-x86_64/NETfishingServer.x86_64"
export_path="builds/v0.6.7-alpha/server-linux-x86_64/NETfishingServer.x86_64"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
@ -155,7 +155,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*"
export_path="builds/v0.6.5-alpha/android/NETfishing.apk"
export_path="builds/v0.6.7-alpha/android/NETfishing.apk"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
@ -176,8 +176,8 @@ architectures/armeabi-v7a=false
architectures/arm64-v8a=true
architectures/x86=false
architectures/x86_64=false
version/code=60500
version/name="v0.6.5-alpha"
version/code=60700
version/name="v0.6.7-alpha"
package/unique_name="io.woofmeow.netfishing"
package/name="NETfishing"
package/signed=true
@ -214,7 +214,7 @@ custom_features=""
export_filter="all_resources"
include_filter="LICENSE,ASSET-LICENSE.md,TRADEMARKS.md,THIRD-PARTY-NOTICES.md,CREDITS.md,ui/fonts/*LICENSE.txt"
exclude_filter="builds/*,playtest/*,scripts/*"
export_path="builds/v0.6.5-alpha/linux-x86_64/NETfishing.x86_64"
export_path="builds/v0.6.7-alpha/linux-x86_64/NETfishing.x86_64"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""