1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00

Merge branch 'fix-bug' of https://github.com/hwang-pku/Slimefun4 into fix-bug

fix a flaky test
This commit is contained in:
Hao Wang 2021-07-25 21:14:01 -07:00
commit 3c20a9fae6
3 changed files with 90 additions and 8 deletions

View File

@ -0,0 +1,78 @@
name: Create new Release Candidate
on:
workflow_dispatch:
inputs:
number:
description: 'RC number (e.g. 15)'
required: true
release_date:
description: 'Date of release (e.g. 12-apr-2021)'
required: true
jobs:
release:
name: Create new release
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
ref: 'stable'
- name: Merge latest commits into 'stable'
uses: devmasx/merge-branch@v1.3.1
with:
type: now
from_branch: 'master'
target_branch: 'stable'
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Get the latest commit sha
id: latest
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Create Release
id: create_release
uses: actions/create-release@v1.1.4
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
with:
tag_name: RC-${{ github.event.inputs.number }}
release_name: Release Candidate ${{ github.event.inputs.number }} (git ${{ steps.latest.outputs.sha_short }})
draft: false
prerelease: false
body: |
## 💾 Download link
This release candidate of Slimefun4 can be downloaded here:
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/Slimefun4-${{ github.event.inputs.number }}.jar
### ❓ How to install Slimefun
Simply drag & drop the Slimefun4 jar file into the `/plugins/` directory of your server.
If you need any help installing Slimefun, feel free to check out our wiki article on [How to install Slimefun](https://github.com/Slimefun/Slimefun4/wiki/Installing-Slimefun).
## 📝 Change log
You can find a short summary of all the changes that are included in this release right here:
https://github.com/Slimefun/Slimefun4/blob/master/CHANGELOG.md#release-candidate-${{ github.event.inputs.number }}-${{ github.event.inputs.release_date }}
## 📦 Maven dependency reference
If you want to develop an addon for Slimefun ([Developer Reference](https://github.com/Slimefun/Slimefun4/wiki/Developer-Guide)), then you can build your project against this specific version of Slimefun using the following `pom.xml` dependency:
```xml
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-${{ github.event.inputs.number }}</version>
</dependency>
</dependencies>
```

View File

@ -1,5 +1,6 @@
# Table of contents # Table of contents
- [Release Candidate 26 (TBD)](#release-candidate-26-tbd) - [Release Candidate 27 (TBD)](#release-candidate-27-tbd)
- [Release Candidate 26 (20 Jul 2021)](#release-candidate-26-20-jul-2021)
- [Release Candidate 25 (20 Jun 2021)](#release-candidate-25-20-jun-2021) - [Release Candidate 25 (20 Jun 2021)](#release-candidate-25-20-jun-2021)
- [Release Candidate 24 (03 Jun 2021)](#release-candidate-24-03-jun-2021) - [Release Candidate 24 (03 Jun 2021)](#release-candidate-24-03-jun-2021)
- [Release Candidate 23 (19 May 2021)](#release-candidate-23-19-may-2021) - [Release Candidate 23 (19 May 2021)](#release-candidate-23-19-may-2021)
@ -26,7 +27,16 @@
- [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019) - [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
- [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019) - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
## Release Candidate 26 (TBD) ## Release Candidate 27 (TBD)
#### Additions
#### Changes
#### Fixes
## Release Candidate 26 (20 Jul 2021)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#26
#### Additions #### Additions
* Diamonds can now be ground into Carbon using a Grind Stone * Diamonds can now be ground into Carbon using a Grind Stone

View File

@ -6,7 +6,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import org.bukkit.ChatColor;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -116,11 +115,6 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> {
stack.setItemMeta(im); stack.setItemMeta(im);
} else { } else {
ItemMeta im = stack.getItemMeta(); ItemMeta im = stack.getItemMeta();
if (!customName.startsWith(String.valueOf(ChatColor.COLOR_CHAR))) {
customName = ChatColor.WHITE + customName;
}
im.setDisplayName(customName); im.setDisplayName(customName);
stack.setItemMeta(im); stack.setItemMeta(im);
} }