From e7fca5a4c70a24537668354af5cb726cebf6928b Mon Sep 17 00:00:00 2001 From: Terromur <79866197+Terromur@users.noreply.github.com> Date: Sun, 25 Jan 2026 13:52:00 +0500 Subject: [PATCH 1/5] Add correct auto-detect version and commit If a person uses PKGBUILD, it will automatically determine the latest version and commit. --- PKGBUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 1f6c73e..4f54d16 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Fazri Gading pkgname=Hytale-F2P-git _pkgname=Hytale-F2P -pkgver=2.0.11.r120.gb05aeef +pkgver=2.0.12.r150.gb62ffc1 pkgrel=1 pkgdesc="Hytale-F2P - unofficial Hytale Launcher for free to play with multiplayer support" arch=('x86_64') @@ -14,7 +14,10 @@ sha256sums=('SKIP' '46488fada4775d9976d7b7b62f8d1f1f8d9a9a9d8f8aa9af4f2e2153019f pkgver() { cd "$_pkgname" - printf "2.0.11.r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + version=$(git describe --abbrev=0 --tags --match "v[0-9]*") + commits=$(git rev-list --count HEAD) + hash=$(git rev-parse --short HEAD) + printf "%s.r%s.g%s" "${version#v}" "$commits" "$hash" } build() { From 4086612e9df571976a1a4f777315fa62267d2b20 Mon Sep 17 00:00:00 2001 From: Terromur <79866197+Terromur@users.noreply.github.com> Date: Sun, 25 Jan 2026 14:12:20 +0500 Subject: [PATCH 2/5] Remove maintainer and change to npm ci --- PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 4f54d16..4f05e42 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,4 @@ # Maintainer: Terromur -# Maintainer: Fazri Gading pkgname=Hytale-F2P-git _pkgname=Hytale-F2P pkgver=2.0.12.r150.gb62ffc1 @@ -22,7 +21,7 @@ pkgver() { build() { cd "$_pkgname" - npm install + npm ci npm run build:linux } From 084347db033d257a1e377e29d54992ad31d75390 Mon Sep 17 00:00:00 2001 From: Fazri Gading Date: Sun, 25 Jan 2026 18:35:45 +0800 Subject: [PATCH 3/5] prepare release for v2.1.0 (#164) * fix: update tar to 7.5.6 * test: release on main branch using tag * chore: remove previous release branch part * fix: add deps for bsdtar * fix: fix build tar.zst for arch * fix: missing npm ci on release yml * fix: remove pacman package json * fix: revert tar version * fix: revert tar in package-lock.json * Update release.yml --- .github/workflows/release.yml | 17 ++++++------- package-lock.json | 48 +++++++++++++++++++---------------- package.json | 3 +-- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9678519..65bbe02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Build and Release on: push: branches: - - release + - main tags: - 'v*' workflow_dispatch: @@ -13,11 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # Not needed anymore due to the removal of Pacman builds - # - name: Install build dependencies - # run: | - # sudo apt-get update - # sudo apt-get install -y libarchive-tools + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y libarchive-tools - uses: actions/setup-node@v4 with: @@ -113,12 +112,12 @@ jobs: # If it's a tag, use the tag. tag_name: ${{ github.ref_type == 'tag' && github.ref_name || format('v{0}.r{1}', steps.pkg_version.outputs.VERSION, github.run_number) }} # If it's the 'release' branch, use 'v2.0.2-beta.r42' - name: ${{ github.ref_type == 'tag' && github.ref_name || format('v{0}-beta.r{1}', steps.pkg_version.outputs.VERSION, github.run_number) }} + # name: ${{ github.ref_type == 'tag' && github.ref_name || format('v{0}-beta.r{1}', steps.pkg_version.outputs.VERSION, github.run_number) }} files: | artifacts/linux-builds/**/* artifacts/windows-builds/**/* artifacts/macos-builds/**/* generate_release_notes: true draft: true - # DYNAMIC FLAGS: Mark as pre-release ONLY IF it's NOT a tag (meaning it's a branch push) - prerelease: ${{ github.ref_type != 'tag' }} + prerelease: false + diff --git a/package-lock.json b/package-lock.json index f7ad214..2da2ede 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { "name": "hytale-f2p-launcher", - "version": "2.0.11", + "version": "2.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hytale-f2p-launcher", - "version": "2.0.11", + "version": "2.1.0", "license": "MIT", "dependencies": { "adm-zip": "^0.5.10", "axios": "^1.6.0", "discord-rpc": "^4.0.1", - "dotenv": "^17.2.3", "electron-updater": "^6.7.3", "fs-extra": "^11.3.3", "tar": "^6.2.1", @@ -384,6 +383,7 @@ "dev": true, "license": "BSD-2-Clause", "optional": true, + "peer": true, "dependencies": { "cross-dirname": "^0.1.0", "debug": "^4.3.4", @@ -849,7 +849,6 @@ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1613,7 +1612,8 @@ "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", "dev": true, "license": "MIT", - "optional": true + "optional": true, + "peer": true }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -1830,7 +1830,6 @@ "integrity": "sha512-ce4Ogns4VMeisIuCSK0C62umG0lFy012jd8LMZ6w/veHUeX4fqfDrGe+HTWALAEwK6JwKP+dhPvizhArSOsFbg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "app-builder-lib": "26.4.0", "builder-util": "26.3.4", @@ -1907,18 +1906,6 @@ "node": ">=8" } }, - "node_modules/dotenv": { - "version": "17.2.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", - "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, "node_modules/dotenv-expand": { "version": "11.0.7", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", @@ -2206,6 +2193,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "dependencies": { "@electron/asar": "^3.2.1", "debug": "^4.1.1", @@ -2226,6 +2214,7 @@ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -2242,6 +2231,16 @@ "dev": true, "license": "MIT" }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", @@ -3180,9 +3179,9 @@ "license": "MIT" }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", + "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", "dev": true, "license": "MIT" }, @@ -3503,6 +3502,7 @@ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "minimist": "^1.2.6" }, @@ -3855,7 +3855,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -3885,6 +3884,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "commander": "^9.4.0" }, @@ -3902,6 +3902,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "engines": { "node": "^12.20.0 || >=14" } @@ -4098,6 +4099,7 @@ "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "glob": "^7.1.3" }, @@ -4469,6 +4471,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me", "license": "ISC", "dependencies": { "chownr": "^2.0.0", @@ -4558,6 +4561,7 @@ "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "mkdirp": "^0.5.1", "rimraf": "~2.6.2" diff --git a/package.json b/package.json index 25ffa20..e097c84 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "adm-zip": "^0.5.10", "axios": "^1.6.0", "discord-rpc": "^4.0.1", - "dotenv": "^17.2.3", "electron-updater": "^6.7.3", "fs-extra": "^11.3.3", "tar": "^6.2.1", @@ -81,7 +80,7 @@ ] } ], - "icon": "icon.ico" + "icon": "build/icon.ico" }, "linux": { "target": [ From 131580d3bab5d0f22bafe74025e36cd6c70ceb59 Mon Sep 17 00:00:00 2001 From: Fazri Gading Date: Sun, 25 Jan 2026 18:36:40 +0800 Subject: [PATCH 4/5] merge last two commits to develop (#165) * Add correct auto-detect version and commit If a person uses PKGBUILD, it will automatically determine the latest version and commit. * Remove maintainer and change to npm ci --------- Co-authored-by: Terromur <79866197+Terromur@users.noreply.github.com> --- PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 1f6c73e..4f05e42 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Terromur -# Maintainer: Fazri Gading pkgname=Hytale-F2P-git _pkgname=Hytale-F2P -pkgver=2.0.11.r120.gb05aeef +pkgver=2.0.12.r150.gb62ffc1 pkgrel=1 pkgdesc="Hytale-F2P - unofficial Hytale Launcher for free to play with multiplayer support" arch=('x86_64') @@ -14,12 +13,15 @@ sha256sums=('SKIP' '46488fada4775d9976d7b7b62f8d1f1f8d9a9a9d8f8aa9af4f2e2153019f pkgver() { cd "$_pkgname" - printf "2.0.11.r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + version=$(git describe --abbrev=0 --tags --match "v[0-9]*") + commits=$(git rev-list --count HEAD) + hash=$(git rev-parse --short HEAD) + printf "%s.r%s.g%s" "${version#v}" "$commits" "$hash" } build() { cd "$_pkgname" - npm install + npm ci npm run build:linux } From 0ca8b4e02f946c4d1d35c946c145a1765c7d39c7 Mon Sep 17 00:00:00 2001 From: Terromur <79866197+Terromur@users.noreply.github.com> Date: Sun, 25 Jan 2026 17:17:36 +0500 Subject: [PATCH 5/5] Deleting garbage envs --- backend/utils/platformUtils.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/utils/platformUtils.js b/backend/utils/platformUtils.js index de2d47a..28f0dc3 100644 --- a/backend/utils/platformUtils.js +++ b/backend/utils/platformUtils.js @@ -53,11 +53,7 @@ function setupWaylandEnvironment() { console.log('Detected Wayland session, configuring environment...'); const envVars = { - SDL_VIDEODRIVER: 'wayland', - GDK_BACKEND: 'wayland', - QT_QPA_PLATFORM: 'wayland', - MOZ_ENABLE_WAYLAND: '1', - _JAVA_AWT_WM_NONREPARENTING: '1' + SDL_VIDEODRIVER: 'wayland' }; envVars.ELECTRON_OZONE_PLATFORM_HINT = 'wayland';