[SCL 3.21.5_01] Update from upstream

SolDev69 · Jun 18, 2024 · 84d0cb1 · 84d0cb1
2 parents 068376c + 856bace
commit 84d0cb1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -11,7 +11,7 @@ body:
       Give us some details into the problem, and how this affects it.
     placeholder: 'Example: You should add a version selector because of the text box being too small.'
   validations:
-    required: false
+    required: true
 
 - type: textarea
   attributes:
@@ -20,7 +20,7 @@ body:
       What do you want to see changed, added, or removed? Make sure to be specific.
       placeholder: 'Example: A scrollable version picker.'
   validations:
-    required: false
+    required: true
 
 - type: textarea
   attributes:

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -90,19 +90,20 @@ jobs:
         run: |
           rm -r app_pojavlauncher/src/main/assets/components/jre
           rm -r app_pojavlauncher/src/main/assets/components/jre-new
+          rm -r app_pojavlauncher/src/main/assets/components/jre-21
           gradle assembleDebug
           mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug-noruntime.apk
       - name: Gen md5sums
         run: |
           md5sum out/app-debug.apk > out/app-debug.md5
           md5sum out/app-debug-noruntime.apk > out/app-debug-noruntime.md5
-          
+
       - name: Upload APK
         uses: actions/upload-artifact@v3
         with:
           name: app-debug
           path: out/app-debug.*
-      
+
       - name: Upload AAB
         uses: actions/upload-artifact@v3
         with:

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java
@@ -97,7 +97,7 @@ public static boolean installNewJreIfNeeded(Activity activity, JMinecraftVersion
 
     private static void showRuntimeFail(Activity activity, JMinecraftVersionList.Version verInfo) {
         Tools.dialogOnUiThread(activity, activity.getString(R.string.global_error),
-                activity.getString(R.string.multirt_nocompatiblert, verInfo.javaVersion.majorVersion));
+        activity.getString(R.string.multirt_nocompatiblert, verInfo.javaVersion.majorVersion));
     }
 
     private enum InternalRuntime {
@@ -113,4 +113,8 @@ private enum InternalRuntime {
         }
     }
 
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> upstream/v3_openjdk