feat: merge zip asset branch into main, Optiscaler 7 version now main standard

1 files changed, 21 insertions, 6 deletions

diff --git a/src/index.tsx b/src/index.tsx
index 74c43f1..47712dd 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -169,7 +169,7 @@ function FGModInstallerSection() {
       ) : null}
       <PanelSectionRow>
         <div>
-          Once installed, patch a games below to replace DLSS upscale and frame gen options with FSR 3 equivalents. * NON STEAM GAMES, GAMES WITH LAUNCHERS, AND DX11 OR BELOW NOT SUPPORTED.
+          Assign a back button to 'insert' keyboard key to use Optiscaler and enable FG in non FG games.
         </div>
       </PanelSectionRow>
     </PanelSection>
@@ -247,15 +247,23 @@ function InstalledGamesSection() {
           menuLabel="Installed Games"
         />
       </PanelSectionRow>
+
+      {result ? (
+        <PanelSectionRow>
+          <div style={{ 
+            padding: '12px',
+            marginTop: '16px',
+            backgroundColor: 'var(--decky-selected-ui-bg)',
+            borderRadius: '4px'
+          }}>
+            {result}
+          </div>
+        </PanelSectionRow>
+      ) : null}
       
       {selectedGame ? (
         <>
           <PanelSectionRow>
-            <div style={{ fontWeight: 'bold', fontSize: '1.1em' }}>
-              {selectedGame.name}
-            </div>
-          </PanelSectionRow>
-          <PanelSectionRow>
             <ButtonItem
               layout="below"
               onClick={handlePatchClick}
@@ -273,6 +281,7 @@ function InstalledGamesSection() {
           </PanelSectionRow>
         </>
       ) : null}
+<<<<<<< HEAD
 
       {result ? (
         <PanelSectionRow>
@@ -286,6 +295,8 @@ function InstalledGamesSection() {
           </div>
         </PanelSectionRow>
       ) : null}
+=======
+>>>>>>> zip-bundle-assets
     </PanelSection>
   );
 }
@@ -304,4 +315,8 @@ export default definePlugin(() => ({
   onDismount() {
     console.log("Framegen Plugin unmounted");
   },
+<<<<<<< HEAD
+}));
+=======
 }));
+>>>>>>> zip-bundle-assets