diff --git a/.env.example b/.env.example index ea5bcdf..213ea06 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ -gamePath="c:\Path\To\Farming Simulator 22\\" -gameProfile="c:\Douments\My Games\FarmingSimulator2022\\" +gamePath="c:\Path\To\Farming Simulator 2025\\" +gameProfile="c:\Douments\My Games\FarmingSimulator2025\\" gameExe="c:\Program Files (x86)\Steam\steam.exe" -applaunch 1248130 savegameId=1 testRunner="c:\Path\To\TestRunner_public.exe" testTempFolder="c:\Path\To\CleanCopy\For\Testing\\" -remoteGameProfile=\\REMOTE-PC\FarmingSimulator2022\ +remoteGameProfile=\\REMOTE-PC\FarmingSimulator2025\ diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 1a1f843..10b75c1 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -4,7 +4,7 @@ name: "pre-release" on: push: branches: - - "main" + - "fs25" tags-ignore: - "*" @@ -23,8 +23,8 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" + automatic_release_tag: "fs25-latest" prerelease: true - title: "Development Build" + title: "fs25-dev-latest" files: | - FS22_TargetFillLevel.zip + FS25_TargetFillLevel.zip diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index fff0acf..b06867d 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -4,7 +4,7 @@ name: "tagged-release" on: push: tags: - - "v*" + - "fs25-v*" jobs: tagged-release: @@ -25,4 +25,4 @@ jobs: automatic_release_tag: "${{ github.ref_name }}" prerelease: false files: | - FS22_TargetFillLevel.zip + FS25_TargetFillLevel.zip diff --git a/.gitignore b/.gitignore index d6af3b0..9bfc212 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # Build system .fsbuild.yml -FS22_Survival* +FS25_* *.zip .env diff --git a/README.md b/README.md index c2d2c1e..f2193b6 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ # Target Fill Level -[![Farming Simulator 22](https://img.shields.io/badge/farming%20simulator-22-10BEFF?style=flat-square)](https://www.farming-simulator.com/buy-now.php?platform=pcdigital&code=VERTEXDEZIGN) +[![Farming Simulator 25](https://img.shields.io/badge/farming%20simulator-25-A0C213?style=flat-square)](https://www.farming-simulator.com/buy-now.php?platform=pcdigital&code=VERTEXDEZIGN) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/VertexDezign/TargetFillLevel?style=flat-square)](https://github.com/VertexDezign/TargetFillLevel/releases) [![GitHub issues](https://img.shields.io/github/issues/VertexDezign/TargetFillLevel?style=flat-square)](https://github.com/VertexDezign/TargetFillLevel/issues) [![License: CC BY-NC-ND 4.0](https://img.shields.io/badge/License-CC_BY--NC--ND_4.0-lightgrey.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-nd/4.0/) -This is a Mod for Farming Simulator 22. +This is a Mod for Farming Simulator 25. -**[Download latest development version here](https://github.com/VertexDezign/TargetFillLevel/releases/download/latest/FS22_TargetFillLevel.zip)** +**[Download latest development version here](https://github.com/VertexDezign/TargetFillLevel/releases/download/fs25-latest/FS25_TargetFillLevel.zip)** ## 🚜 Ready to Load Like a Pro? 🚜 -Imagine you're driving your big combine or forage harvester in Farming Simulator 22, and you need to know when the trailer or silo you're unloading into is almost full. With the Target Fill Level mod, you can see exactly how full it is—right on your screen! +Imagine you're driving your big combine or forage harvester in Farming Simulator 25, and you need to know when the trailer or silo you're unloading into is almost full. With the Target Fill Level mod, you can see exactly how full it is—right on your screen! ### Why is this Awesome? @@ -27,4 +27,4 @@ Get ready to farm smarter, not harder. Download **Target Fill Level** and become Have ideas to make the mod even better? Found a bug? Let us know on [Github](https://github.com/VertexDezign/TargetFillLevel/issues) so we can keep improving the mod together! -[FS22_TargetFillLevel](https://github.com/VertexDezign/TargetFillLevel/) by [André Buchmann](https://github.com/schliesser/) & [VertexDezign](https://vertexdezign.net/) is licensed under [CC BY NC ND 4.0](http://creativecommons.org/licenses/by-nc-nd/4.0/) +[FS25_TargetFillLevel](https://github.com/VertexDezign/TargetFillLevel/) by [André Buchmann](https://github.com/schliesser/) & [VertexDezign](https://vertexdezign.net/) is licensed under [CC BY NC ND 4.0](http://creativecommons.org/licenses/by-nc-nd/4.0/) diff --git a/modDesc.xml b/modDesc.xml index 1605508..6f51778 100644 --- a/modDesc.xml +++ b/modDesc.xml @@ -1,18 +1,17 @@ - + -tinte- / VertexDezign - 2.0.1.1 + 1.0.0.0 <en>Target Fill Level</en> <de>Ziel-Füllstand</de> - <ru>Уровень Заполнения ТС И Хранилищ</ru> Github so we can keep improving the mod together! - -Changelog 2.0.1.1 -- Fixed LUA issue with unloading TMR with mixer wagon - -Changelog 2.0.1.0 -- Show notification when target fill level is at 80% or completely full -- Add support for discharge to objects (unloading triggers, shovels) ... - -Changelog 2.0.0.0 -- Use custom fill type for target vehicle -- Display now implemented for all vehicles with a pipe ]]> icon_targetFillLevel.dds @@ -79,17 +56,14 @@ Changelog 2.0.0.0 Target fill level Ziel-Füllstand - Заполнение %s: Target %s is nearly full! (80%%) %s: Zielobjekts %s ist fast voll! (80%%) - %s: %s почти нет места! (80%%) %s: Target %s is full! %s: Zielobjekts %s ist voll! - %s: Нет места! diff --git a/pack.cmd b/pack.cmd index 9145803..328b905 100644 --- a/pack.cmd +++ b/pack.cmd @@ -1,6 +1,6 @@ @ECHO off -SET modName=FS22_TargetFillLevel +SET modName=FS25_TargetFillLevel SET filename=%modName%.zip IF EXIST %filename% ( diff --git a/run.cmd b/run.cmd index 6f56ffd..8e276a1 100644 --- a/run.cmd +++ b/run.cmd @@ -17,7 +17,7 @@ ECHO Starting game with savegame %savegameId% ... ECHO Happy Testing: %modName% -@REM Available FS22 start params +@REM Available FS25 start params @REM -cheats (enables cheats in the console) @REM -autoStartSavegameId 3 (loads the savegame automatically | *Replace "3" with the savegame ID of your choice) @REM -restart (prevents intro videos from playing | will also keep logging the game to the logfile) diff --git a/runMP.cmd b/runMP.cmd index a79d5a1..d9d854e 100644 --- a/runMP.cmd +++ b/runMP.cmd @@ -15,7 +15,7 @@ COPY %filename% %remoteGameProfile%mods\ ECHO Happy Testing: %modName% -@REM Available FS22 start params +@REM Available FS25 start params @REM -cheats (enables cheats in the console) @REM -autoStartSavegameId 3 (loads the savegame automatically | *Replace "3" with the savegame ID of your choice) @REM -restart (prevents intro videos from playing | will also keep logging the game to the logfile) diff --git a/scripts/main.lua b/scripts/main.lua index 44bbb1c..0e1859b 100644 --- a/scripts/main.lua +++ b/scripts/main.lua @@ -1,5 +1,5 @@ --[[ -Target Fill Level Mod for Farming Simulator 22 +Target Fill Level Mod for Farming Simulator 25 Author: André Buchman & VertexDezign Website: https://vertexdezign.net/ @@ -7,7 +7,7 @@ Issues: https://github.com/VertexDezign/TargetFillLevel/issues Feel free to open a pull reuests for enhancements or bugfixes. -FS22_TargetFillLevel © 2023 by André Buchmann & VertexDezign is licensed under CC BY-NC-ND 4.0. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ +FS25_TargetFillLevel © 2023 by André Buchmann & VertexDezign is licensed under CC BY-NC-ND 4.0. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/ ]] TargetFillLevel = {}