Merge branch 'gamedig:master' into master

xCausxn · Jun 22, 2024 · 9c9ee54 · 9c9ee54
2 parents c7c33b6 + ce29238
commit 9c9ee54
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 
 ## To Be Released...
 ## 5.X.Y
-In progress?
+* Minetest - Added support for minetest utilizing official server list (By @xCausxn #573)
+* Soulmask - Added support (By @xCausxn #572)
+* Restore Minecraft's favicon (#575)
+* Fix duplicate game entry for The Forest (2014), add old id for backwards compatibility (By @xCausxn #579)
 
 ## 5.0.0
 * Added a new stabilized field `version` in the query response (By @podrivo #532)

diff --git a/GAMES_LIST.md b/GAMES_LIST.md
@@ -262,6 +262,7 @@
 | sof2                 | Soldier of Fortune 2                             |                                                 |
 | soldat               | Soldat                                           |                                                 |
 | sotf                 | Sons Of The Forest                               | [Valve Protocol](#valve)                        |
+| soulmask             | Soulmask                                         | [Valve Protocol](#valve)                        |
 | spaceengineers       | Space Engineers                                  | [Valve Protocol](#valve)                        |
 | squad                | Squad                                            | [Valve Protocol](#valve)                        |
 | stalker              | S.T.A.L.K.E.R.                                   |                                                 |
@@ -293,7 +294,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
@@ -1270,18 +1270,6 @@ export const games = {
       old_id: 'fivem'
     }
   },
-  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,
@@ -2637,6 +2625,15 @@ export const games = {
       old_id: 'sonsoftheforest'
     }
   },
+  soulmask: {
+    name: 'Soulmask',
+    release_year: 2024,
+    options: {
+      port: 8777,
+      port_query: 27015,
+      protocol: 'valve'
+    }
+  },
   stalker: {
     name: 'S.T.A.L.K.E.R.',
     release_year: 2007,
@@ -2893,6 +2890,9 @@ export const games = {
       port: 27015,
       port_query_offset: 1,
       protocol: 'valve'
+    },
+    extra: {
+      old_id: 'forrest'
     }
   },
   thefront: {

diff --git a/protocols/minecraftvanilla.js b/protocols/minecraftvanilla.js
@@ -45,7 +45,6 @@ export default class minecraftvanilla extends Core {
     this.logger.debug(str)
 
     const json = JSON.parse(str.substring(0, strLen))
-    delete json.favicon
 
     state.raw = json
     state.maxplayers = json.players.max