Merge branch 'master' into remove-feature-beat-flag

RetroAchievements · Nov 25, 2023 · 2d70451 · 2d70451
2 parents dab9a7f + 807eab4
commit 2d70451
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/Helpers/database/achievement.php b/app/Helpers/database/achievement.php
@@ -415,7 +415,7 @@ function updateAchievementFlag(int|string|array $achID, int $newFlag): void
 
     $achievements->update(['Flags' => $newFlag]);
 
-    $updatedAchievements = $achievements->get();
+    $updatedAchievements = Achievement::whereIn('ID', $achievementIDs)->get();
 
     foreach ($updatedAchievements as $achievement) {
         if ($newFlag === AchievementFlag::OfficialCore) {

diff --git a/resources/views/components/menu/main.blade.php b/resources/views/components/menu/main.blade.php
@@ -48,6 +48,10 @@
             ["systemName" => "PC-8000/8800", "listID" => 47],
             ["systemName" => "PC-FX", "listID" => 49],
         ],
+        "SNK" => [
+            ["systemName" => "Neo Geo CD", "listID" => 56],
+            ["systemName" => "Neo Geo Pocket", "listID" => 14],
+        ],
     ],
     [
         "Other" => [
@@ -65,8 +69,6 @@
             ["systemName" => "Magnavox Odyssey 2", "listID" => 23],
             ["systemName" => "Mega Duck", "listID" => 69],
             ["systemName" => "MSX", "listID" => 29],
-            ["systemName" => "Neo Geo CD", "listID" => 56],
-            ["systemName" => "Neo Geo Pocket", "listID" => 14],
             ["systemName" => "Uzebox", "listID" => 80],
             ["systemName" => "Vectrex", "listID" => 46],
             ["systemName" => "WASM-4", "listID" => 72],

diff --git a/resources/views/platform/components/game-list-item/index.blade.php b/resources/views/platform/components/game-list-item/index.blade.php
@@ -117,7 +117,7 @@ class="transition-all"
         >
             <hr class="mt-2 border-embed-highlight">
 
-            <div class="py-4 @if ($variant === 'user-recently-played') flex flex-wrap -mx-1 sm:mx-0 sm:px-4 @endif">
+            <div class="py-4 @if ($variant === 'user-recently-played') flex flex-wrap px-0.5 sm:px-4 @endif">
                 {{ $slot }}
             </div>
         </div>