Skip to content

Commit

Permalink
[CI Skip] Merge remote-tracking branch 'Slimefun/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
xMikux committed Nov 7, 2021
2 parents db421ec + 558bfb5 commit d852264
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/discord-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2.3.5
uses: actions/checkout@v2.4.0

- name: Set up Java JDK 11
uses: actions/[email protected]
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Table of contents
- [Release Candidate 29 (TBD)](#release-candidate-29-tbd)
- [Release Candidate 29 (07 Nov 2021)](#release-candidate-29-06-nov-2021)
- [Release Candidate 28 (06 Sep 2021)](#release-candidate-28-06-sep-2021)
- [Release Candidate 27 (03 Sep 2021)](#release-candidate-27-03-sep-2021)
- [Release Candidate 26 (20 Jul 2021)](#release-candidate-26-20-jul-2021)
Expand Down Expand Up @@ -29,7 +29,7 @@
- [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 29 (TBD)
## Release Candidate 29 (07 Nov 2021)

#### Additions
* Added support for deepslate ores and copper with the Hercules' Pickaxe
Expand All @@ -55,6 +55,7 @@
* Fixed #3264
* Fixed extreme knockback caused by the Explosive Bow
* Fixed #3313
* Fixed smithing table issue on 1.15 and lower

## Release Candidate 28 (06 Sep 2021)

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.13.2</version>
<version>3.13.3</version>
<scope>compile</scope>

<exclusions>
Expand Down Expand Up @@ -475,7 +475,7 @@
<dependency>
<groupId>com.github.LoneDev6</groupId>
<artifactId>itemsadder-api</artifactId>
<version>2.4.8</version>
<version>2.4.21</version>
<scope>provided</scope>

<exclusions>
Expand Down

0 comments on commit d852264

Please sign in to comment.