v1.1.0 beta 1 stuff (Move stuff around, part 2)

htv04 · Aug 15, 2021 · 7515a01 · 7515a01
1 parent 6414b9e
commit 7515a01
Show file tree

Hide file tree

Showing 45 changed files with 1,025 additions and 898 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,88 +5,88 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  
+
   workflow_dispatch:
 
 jobs:
   win64:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - name: Setup love-11.3-win64
         run: |
           curl -L --remote-name https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
           unzip love-11.3-win64.zip -d resources/win64
           mv resources/win64/love-11.3-win64 resources/win64/love
-      
+
       - name: Build
         run: |
           make win64
-      
+
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
           name: funkin-rewritten-win64
           path: build/win64
-  
+
   win32:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - name: Setup love-11.3-win32
         run: |
           curl -L --remote-name https://github.com/love2d/love/releases/download/11.3/love-11.3-win32.zip
           unzip love-11.3-win32.zip -d resources/win32
           mv resources/win32/love-11.3-win32 resources/win32/love
-      
+
       - name: Build
         run: |
           make win32
-      
+
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
           name: funkin-rewritten-win32
           path: build/win32
-  
+
   macos:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - name: Setup love-11.3-macos
         run: |
           unzip resources/macos/love.zip -d resources/macos
-      
+
       - name: Build
         run: |
           make macos
-      
+
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
           name: funkin-rewritten-macos
           path: build/macos
-  
+
   lovefile:
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - name: Build
         run: |
           make lovefile
-      
+
       - name: Upload
         uses: actions/upload-artifact@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@ build/*
 
 # Dependencies
 resources/macos/love.app/*
+resources/switch/LOVEPotion.elf
+resources/switch/romfs/*
 resources/win32/love/*
 resources/win64/love/*
 

diff --git a/src/love/classes.lua b/src/love/classes.lua
diff --git a/src/love/conf.lua b/src/love/conf.lua
@@ -21,7 +21,7 @@ function love.conf(t)
 	t.identity = "funkin-rewritten"
 	t.version = "11.3"
 	--t.console = true
-	
-	t.window.title = "Friday Night Funkin' Rewritten v1.0.1"
+
+	t.window.title = "Friday Night Funkin' Rewritten v1.1.0"
 	t.window.icon = "icon.png"
 end