Skip to content

Commit

Permalink
Merge remote-tracking branch 'Slimefun/master'
Browse files Browse the repository at this point in the history
DEV - 1014

Slimefun日誌:
- 移除 ChestTerminal (箱子終端) 的支持
  • Loading branch information
xMikux committed Apr 29, 2022
2 parents c6f027a + f431aa6 commit 2f8e1b0
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 505 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/discord-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Java JDK 17
uses: actions/setup-java@v3.1.1
uses: actions/setup-java@v3.2.0
with:
distribution: 'adopt'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-compiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3.1.1
uses: actions/setup-java@v3.2.0
with:
distribution: 'adopt'
java-version: '17'
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
* Added Organic Fertilizer for Seagrass

#### Changes
* Removed support for ChestTerminal

#### Fixes
* Fixed #3445
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
<dependency>
<groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId>
<version>2.1.211</version>
<version>2.1.212</version>
<scope>provided</scope>

<exclusions>
Expand Down
Loading

0 comments on commit 2f8e1b0

Please sign in to comment.