Init fs25 branch

VertexDezign · Nov 9, 2024 · b64a09f · b64a09f
1 parent b52b806
commit b64a09f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 50 deletions.
diff --git 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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
 
 # Build system
 .fsbuild.yml
-FS22_Survival*
+FS25_*
 *.zip
 .env
 

diff --git 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
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<modDesc descVersion="80">
+<modDesc descVersion="92">
     <author>-tinte- / VertexDezign</author>
-    <version>2.0.1.1</version>
+    <version>1.0.0.0</version>
     <title>
         <en>Target Fill Level</en>
         <de>Ziel-Füllstand</de>
-        <ru>Уровень Заполнения ТС И Хранилищ</ru>
     </title>
     <description>
         <en><![CDATA[Target Fill Level
 
 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?
 
@@ -25,23 +24,12 @@ Why is this Awesome?
 Get ready to farm smarter, not harder. Download "Target Fill Level" and become the best farmer in the game!
 
 Have ideas to make the mod even better? Found a bug? Let us know on <a href="https://github.com/VertexDezign/TargetFillLevel/issues">Github</a> 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
 ]]></en>
 <de><![CDATA[Ziel-Füllstand
 
 Bereit, wie ein Profi zu laden?
 
-Stell dir vor, du fährst deinen großen Mähdrescher oder Feldhäcksler in Farming Simulator 22 und musst wissen, wie voll der Anhänger oder das Silo ist, in das du entlädst. Mit dem Ziel-Füllstand-Mod kannst du genau sehen, wie voll es ist—direkt auf deinem Bildschirm!
+Stell dir vor, du fährst deinen großen Mähdrescher oder Feldhäcksler in Farming Simulator 25 und musst wissen, wie voll der Anhänger oder das Silo ist, in das du entlädst. Mit dem Ziel-Füllstand-Mod kannst du genau sehen, wie voll es ist—direkt auf deinem Bildschirm!
 
 Warum ist das genial?
 
@@ -54,17 +42,6 @@ Warum ist das genial?
 Mach dich bereit, cleverer zu farmen, nicht härter. Lade "Ziel-Füllstand" herunter und werde der beste Bauer im Spiel!
 
 Hast du Ideen, um den Mod noch besser zu machen? Einen Fehler gefunden? Lass es uns auf GitHub wissen, damit wir den Mod gemeinsam verbessern können!
-
-Changelog 2.0.1.1
-- LUA-Problem beim Entladen von TMR mit Mischwagen behoben
-
-Changelog 2.0.1.0
-- Benachrichtigung anzeigen, wenn der Zielfüllstand bei 80% oder vollständig gefüllt ist
-- Unterstützung für Ablade Trigger, Schaufeln, ... hinzugefügt
-
-Changelog 2.0.0.0
-- Eigener Fülltyp für die Anzeige des Zielfahrzeugs
-- Anzeige jetzt für alle Fahrzeuge mit einem Überladerohr implementiert
 ]]></de>
     </description>
     <iconFilename>icon_targetFillLevel.dds</iconFilename>
@@ -79,17 +56,14 @@ Changelog 2.0.0.0
 	    <text name="fillType_targetVehicle">
 			<en>Target fill level</en>
 			<de>Ziel-Füllstand</de>
-			<ru>Заполнение</ru>
 		</text>
 	    <text name="tfl_messageErrorTargetIsNearlyFull">
 			<en>%s: Target %s is nearly full! (80%%)</en>
 			<de>%s: Zielobjekts %s ist fast voll! (80%%)</de>
-			<ru>%s: %s почти нет места! (80%%)</ru>
 		</text>
 	    <text name="tfl_messageErrorTargetIsFull">
 			<en>%s: Target %s is full!</en>
 			<de>%s: Zielobjekts %s ist voll!</de>
-			<ru>%s: Нет места!</ru>
 		</text>
 	</l10n>
 </modDesc>
diff --git 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
@@ -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
@@ -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
@@ -1,13 +1,13 @@
 --[[
-Target Fill Level Mod for Farming Simulator 22
+Target Fill Level Mod for Farming Simulator 25
 
 Author: André Buchman & VertexDezign
 Website: https://vertexdezign.net/
 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 = {}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     # Build system
     .fsbuild.yml
-    FS22_Survival*
+    FS25_*
     *.zip
     .env
@@ Expand Down @@