From bff4ca91c0e823ab5cff7a79724336a25ffee93b Mon Sep 17 00:00:00 2001 From: JasperChaseTOQ <103849596+JasperChaseTOQ@users.noreply.github.com> Date: Sat, 11 Jun 2022 20:52:28 -0400 Subject: [PATCH 1/3] Update SlimefunItems.java --- .../thebusybiscuit/slimefun4/implementation/SlimefunItems.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java index ea54169f16..bd33d51a9a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java @@ -496,7 +496,7 @@ private SlimefunItems() {} public static final SlimefunItemStack FERROSILICON = new SlimefunItemStack("FERROSILICON", Material.IRON_INGOT, "&bFerrosilicon"); /* Alloy (Iron + Gold) */ public static final SlimefunItemStack GILDED_IRON = new SlimefunItemStack("GILDED_IRON", Material.GOLD_INGOT, "&6&lGilded Iron"); - /* Alloy (Redston + Ferrosilicon) */ + /* Alloy (Redstone + Ferrosilicon) */ public static final SlimefunItemStack REDSTONE_ALLOY = new SlimefunItemStack("REDSTONE_ALLOY", Material.BRICK, "&cRedstone Alloy Ingot"); /* Alloy (Iron + Copper) */ public static final SlimefunItemStack NICKEL_INGOT = new SlimefunItemStack("NICKEL_INGOT", Material.IRON_INGOT, "&bNickel Ingot"); From 122b43c6686548f3a3d86357e637f25df196fb67 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 01:08:24 +0200 Subject: [PATCH 2/3] [CI skip] Update actions/setup-java action to v3.4.0 --- .github/workflows/discord-webhook.yml | 2 +- .github/workflows/maven-compiler.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/discord-webhook.yml b/.github/workflows/discord-webhook.yml index 6754ed9e88..44e97ca712 100644 --- a/.github/workflows/discord-webhook.yml +++ b/.github/workflows/discord-webhook.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v3.0.2 - 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 index 53f88a4437..17d9566f21 100644 --- 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/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 0851092c2b..57b52258cf 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -21,7 +21,7 @@ jobs: fetch-depth: 0 - 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' From 2968f2bb1684574eed9248fd001b1c3bfec828bc Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 26 Jun 2022 18:18:53 +0200 Subject: [PATCH 3/3] [CI SKIP] Time for another RC build --- CHANGELOG.md | 5 +++-- README.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce8874b2e2..4e3863c870 100644 --- 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 index b7b3c7acf1..103e3f7583 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Here is a full summary of the differences between the two different versions of | | development (latest) | "stable" | | ------------------ | -------- | -------- | -| **Minecraft version(s)** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.18.\*** | +| **Minecraft version(s)** | :video_game: **1.14.\* - 1.19.\*** | :video_game: **1.14.\* - 1.19.\*** | | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: | | **frequent updates** | :heavy_check_mark: | :x: | | **latest content** | :heavy_check_mark: | :x: |