Merge branch '1.21.0' of D:\Repos\Minecraft\SFM\repos\SuperFactoryMan…

…ager 1.21.0 into 1.21.1
TeamDman · Aug 26, 2024 · dabf21a · dabf21a
2 parents 77eec97 + 1cf123c
commit dabf21a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,10 @@ For each version:
         1.20.1   -> Forge+NeoForge
         1.20.2.. -> NeoForge
     }
-    Java=Java 17
+    Java=match mc version {
+        ..1.20.4 -> Java 17
+        1.21.. -> Java 21
+    }
     Minecraft=$version
     Changelog= <<
         ```

diff --git a/actions/Build.ps1 b/actions/Build.ps1
@@ -28,8 +28,16 @@ d----          2024-04-14  1:39 PM                SuperFactoryManager 1.20.2
 d----          2024-04-14  1:39 PM                SuperFactoryManager 1.20.3
     #>
 
+    $chosen = $repo_clones `
+    | ForEach-Object { $_.Name } `
+    | fzf `
+        --multi `
+        --bind "ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all" `
+        --header "Pick versions to build"
+    $chosen_objs = $repo_clones | Where-Object { $chosen -contains $_.Name }
+
     # Perform build
-    foreach ($repo in $repo_clones) {
+    foreach ($repo in $chosen) {
         try {
             Push-Location $repo
             Write-Host "Running build for $repo"

diff --git a/src/main/resources/assets/sfm/template_programs/changelog.sfml b/src/main/resources/assets/sfm/template_programs/changelog.sfml
@@ -15,6 +15,7 @@ END
 -- Fix tooltips for manager screen showing over the program edit screen... again
 -- Add `/sfm export_info` client command to dump item and recipe info
 -- Update SFM 1.21.1 build to fix broken Mekanism compatibility
+---- gas::, infusion::, etc are now aliases for chemical::
 
 ---- 4.18.0 ----
 -- Add 1.21.0 build with Mekanism support