Merge branch 'master' into feat/ragemp

xCausxn · Jun 20, 2024 · 9d295f1 · 9d295f1
2 parents f4dac09 + ce29238
commit 9d295f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 ## 5.X.Y
 
-- Minetest - Added support for minetest utilizing official server list (By @xCausxn #573)
-- Soulmask - Added support (By @xCausxn #572)
-- Restore Minecraft's favicon (#575)
-- Grand Theft Auto V: Rage MP - Added support (By @xCausxn #576)
+* Minetest - Added support for minetest utilizing official server list (By @xCausxn #573)
+* Soulmask - Added support (By @xCausxn #572)
+* Restore Minecraft's favicon (#575)
+* Grand Theft Auto V: Rage MP - Added support (By @xCausxn #576)
+* Fix duplicate game entry for The Forest (2014), add old id for backwards compatibility (By @xCausxn #579)
 
 ## 5.0.0
 

diff --git a/GAMES_LIST.md b/GAMES_LIST.md
@@ -295,7 +295,6 @@
 | terrariatshock       | Terraria - TShock                                | [Notes](#terraria)                              |
 | tfc                  | Team Fortress Classic                            | [Valve Protocol](#valve)                        |
 | theforest            | The Forest                                       | [Valve Protocol](#valve)                        |
-| theforrest           | The Forrest                                      | [Valve Protocol](#valve)                        |
 | thefront             | The Front                                        | [Valve Protocol](#valve)                        |
 | thehidden            | The Hidden                                       | [Valve Protocol](#valve)                        |
 | theisle              | The Isle                                         | [Valve Protocol](#valve)                        |

diff --git a/lib/games.js b/lib/games.js
@@ -1278,18 +1278,6 @@ export const games = {
       protocol: 'ragemp'
     }
   },
-  theforrest: {
-    name: 'The Forrest',
-    release_year: 2014,
-    options: {
-      port: 27015,
-      port_query_offset: 1,
-      protocol: 'valve'
-    },
-    extra: {
-      old_id: 'forrest'
-    }
-  },
   garrysmod: {
     name: "Garry's Mod",
     release_year: 2004,
@@ -2910,6 +2898,9 @@ export const games = {
       port: 27015,
       port_query_offset: 1,
       protocol: 'valve'
+    },
+    extra: {
+      old_id: 'forrest'
     }
   },
   thefront: {