Merge branch 'master' into pixote-map-update

NovaRain · Dec 10, 2024 · ab86a62 · ab86a62
2 parents 6402170 + e401d04
commit ab86a62
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,15 +64,6 @@ jobs:
           name: rpu.zip
           path: rpu*.zip
 
-      # Create torrents
-      - name: Create torrents
-        uses: devopsx/action-torrent@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          files: |
-            rpu*.exe
-            rpu*.zip
-
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
@@ -83,3 +74,11 @@ jobs:
             torrents/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Create torrents
+      - name: Release torrents
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: devopsx/action-torrent@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          local: false
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,10 +1,13 @@
 ## Changelog
 
-This file lists changes for RPU only (since RP 2.3.3).
+- This file lists changes for RPU only (since RP 2.3.3).
+- In addition to the below list, RPU releases contain all applicable fixes from the corresponding [UPU releases](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch/blob/master/docs/changelog.md).
+- Sometimes UPU or RPU may be updated independently, which is why you might see gaps in version numbers.
+- Versions `2.4.*` contain [updated maps](https://forums.bgforge.net/viewtopic.php?t=371) produced by Pixote, and relevant script changes. Otherwise, they follow the same patch level convention.
 
-In addition to the below list, RPU releases contain all applicable fixes from the corresponding [UPU releases](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch/blob/master/docs/changelog.md).
-Sometimes UPU or RPU may be updated independently, which is why you might see gaps in version numbers.
+---
 
+- [Version 32](#version-32)
 - [Version 30](#version-30)
 - [Version 29](#version-29)
 - [Version 28](#version-28)
@@ -37,10 +40,15 @@ Sometimes UPU or RPU may be updated independently, which is why you might see ga
   - [readme](rp-readme.txt)
   - [changelog](rp-changelog.txt)
 
-### Version 32 (WIP)
+### Version 32
 
-- General
-  - [Reordered](https://github.com/BGforgeNet/Fallout2_Restoration_Project/issues/322) the ending slides to keep tank vagrants as the last one.
+(AKA 2.3.32, 2.4.32)
+
+#### General
+
+[Reordered](https://github.com/BGforgeNet/Fallout2_Restoration_Project/issues/322) the ending slides to keep tank vagrants as the last one.
+
+#### Locations
 
 - Abbey
   - Edited map lighting handling for Abbey (and also Dr.Sheng's hideout) to be more natural.
@@ -79,10 +87,14 @@ Sometimes UPU or RPU may be updated independently, which is why you might see ga
 
 ### Version 29
 
+#### General
+
 - Enhanced worldmap: visible city ruins are now present on tiles set as the "city" terrain type, by Lexx.
 - Installer
   - More components are optional.
 
+#### Locations
+
 - Abbey
   - PC now always [notes](https://github.com/BGforgeNet/Fallout2_Restoration_Project/issues/266) Peterson's complaints about crops.
 - Den