[CI Skip] Merge remote-tracking branch 'Slimefun/master'

xMikux · Jun 26, 2022 · 3da366a · 3da366a
2 parents 3bc6d14 + 2968f2b
commit 3da366a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml
@@ -21,7 +21,7 @@ jobs:
       uses: actions/[email protected]
 
     - name: Set up Java JDK 17
-      uses: actions/setup-java@v3.3.0
+      uses: actions/setup-java@v3.4.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/.github/workflows/maven-compiler.yml b/.github/workflows/maven-compiler.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3.3.0
+      uses: actions/setup-java@v3.4.0
       with:
         distribution: 'adopt'
         java-version: '17'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Table of contents
-- [Release Candidate 32 (TBD)](#release-candidate-32-tbd)
+- [Release Candidate 32 (26 Jun 2022)](#release-candidate-32-26-jun-2022)
 - [Release Candidate 31 (14 Mar 2022)](#release-candidate-31-14-mar-2022)
 - [Release Candidate 30 (31 Dec 2021)](#release-candidate-30-31-dec-2021)
 - [Release Candidate 29 (07 Nov 2021)](#release-candidate-29-07-nov-2021)
@@ -33,7 +33,8 @@
 - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
 
 
-## Release Candidate 32 (TBD)
+## Release Candidate 32 (26 Jun 2022)
+https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32
 
 #### Additions
 * Added Organic Food for Seagrass

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@
 
 | | 開發版 (最新) | "穩定版 (官方)" |
 | ------------------ | -------- | -------- |
-| **Minecraft 版本** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.18.\*** |
+| **Minecraft 版本** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.19.\*** |
 | **自動更新** | :heavy_check_mark: | :heavy_check_mark: |
 | **頻繁的更新** | :heavy_check_mark: | :x: |
 | **最新內容** | :heavy_check_mark: | :x: |

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
@@ -501,7 +501,7 @@ private SlimefunItems() {}
     public static final SlimefunItemStack FERROSILICON = new SlimefunItemStack("FERROSILICON", Material.IRON_INGOT, "&b矽鐵");
     /* Alloy (Iron + Gold) */
     public static final SlimefunItemStack GILDED_IRON = new SlimefunItemStack("GILDED_IRON", Material.GOLD_INGOT, "&6&l鍍金鐵錠");
-    /* Alloy (Redston + Ferrosilicon) */
+    /* Alloy (Redstone + Ferrosilicon) */
     public static final SlimefunItemStack REDSTONE_ALLOY = new SlimefunItemStack("REDSTONE_ALLOY", Material.BRICK, "&c紅石合金錠");
     /* Alloy (Iron + Copper) */
     public static final SlimefunItemStack NICKEL_INGOT = new SlimefunItemStack("NICKEL_INGOT", Material.IRON_INGOT, "&b鎳錠");