Skip to content

Commit 5035f26

Browse files
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into stable
2 parents d2e503c + 45ed89c commit 5035f26

1,226 files changed

Lines changed: 7270 additions & 325068 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

renovate.json renamed to .github/renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": [
33
"config:base"
44
],
5-
"assignees": [],
5+
"assignees": [
6+
],
67
"labels": [
78
"Dependency Update"
89
]

.github/workflows/changelog.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: TOC Generator
16-
uses: technote-space/toc-generator@v2
16+
uses: technote-space/toc-generator@v2.4.0
1717
with:
1818
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
1919
TARGET_PATHS: 'CHANGELOG.md'
20-
TOC_TITLE: ''
20+
TOC_TITLE: '**Table of contents**'
2121
COMMIT_MESSAGE: '[CI skip] Updated Changelog'
2222
COMMIT_NAME: 'TheBusyBot'
23+
CREATE_PR: false
24+
MAX_HEADER_LEVEL: 2
25+
FOLDING: false

.github/workflows/closed_issues.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,39 @@ jobs:
1515
token: ${{ secrets.ACCESS_TOKEN }}
1616
max_commits: 20
1717
- name: Add label
18-
if: contains(toJson(steps.resolved.outputs.issues), github.event.issue.number)
18+
if: contains(steps.resolved.outputs.issues, github.event.issue.number)
1919
uses: maxkomarychev/octions/octions/issues/add-labels@master
2020
with:
2121
token: ${{ secrets.ACCESS_TOKEN }}
2222
issue_number: ${{ github.event.issue.number }}
2323
labels: 'Resolved'
2424
- uses: maxkomarychev/octions/octions/issues/create-comment@master
25-
if: contains(toJson(steps.resolved.outputs.issues), github.event.issue.number) == false
25+
id: comment
26+
if: contains(steps.resolved.outputs.issues, github.event.issue.number) == false
2627
with:
2728
token: ${{ secrets.ACCESS_TOKEN }}
2829
issue_number: ${{ github.event.issue.number }}
2930
body: |-
3031
Your issue was closed, it may fall under one or more of the following categories.
3132
**Please wait for an admin to tick off the points that apply.**
32-
Do not post your Issue again until an Admin has reviewed this message and you fixed the points that were ticked.
33-
This message can be deleted if your issue was resolved.
3433
3534
Please respond below, if you have any questions.
35+
Do **not** open a new Issue unless explicitly told otherwise, comment below or edit your post instead.
3636
37-
* [ ] You did not follow our template. Please follow the Issue template to help us identify your issue more quickly.
38-
* [ ] You did not provide any information about your versions (We absolutely need your exact versions, \"latest\" is not helpful)
39-
* [ ] You did not provide a proper description to the problem.
37+
* [ ] You did not follow our template. Please follow the Issue template to help us identify your issue more effectively.
38+
* [ ] You did not provide any information about your versions (We absolutely need the exact version numbers that are installed on your Server, \"latest\" is not helpful)
39+
* [ ] You did not provide a proper description to the problem. Try to write at least 4-6 sentences on how to reproduce this.
4040
* [ ] We were unable to reproduce issue, if you think your issue still persists then please comment down below and give a better description on how to reproduce it.
4141
* [ ] Your issue was posted in a foreign language, we only accept english issues on here.
4242
* [ ] Your issue is not a bug, it is either intended or something we cannot change.
43-
* [ ] Your issue is not a bug, please only use this issue tracker to report bugs. Any other kind of communication should happen on discord or elsewhere.
44-
* [ ] Your issue was already reported, it is a duplicate. Check the other open issues first before posting!
45-
* [ ] You posted an error without using pastebin. Please always post errors via pastebin.
46-
* [ ] You have posted multiple issues at once. Please post a seperate issue for each bug you encountered.
43+
* [ ] Your issue is not a bug, please only use this issue tracker to report bugs. Any other kind of communication should happen on discord.
44+
* [ ] Your issue was already reported, it is a duplicate. Check the other issues first before posting!
45+
* [ ] You posted an error without using pastebin. Please always post errors via pastebin otherwise they become nearly unreadable.
46+
* [ ] You seem to be reporting multiple bugs at once. Please make a seperate issue for each bug you encountered, so we can properly handle them individually.
4747
* [ ] Your issue has already been fixed in a later version of Slimefun or CS-CoreLib, you should update.
48-
* [ ] You are using an outdated version of Slimefun / CS-CoreLib, again, you should update.
49-
* [ ] You are using an unsupported version of Minecraft. We only provide support for the latest version of Minecraft, old versions are not supported anymore.
48+
* [ ] You are using an outdated and unsupported version of Slimefun / CS-CoreLib, again, you should update.
49+
* [ ] You are using an unofficially modified build of Slimefun. We only support official versions of Slimefun - for obvious reasons.
50+
* [ ] You are using an unsupported version of Minecraft. We only provide support for the Minecraft versions Slimefun was developed for, older versions are not supported anymore.
5051
* [ ] You are using a \"stable\" version of Slimefun (prefixed with \"RC - \"), your issue may have been fixed in a development build, so we only accept bug reports from those.
5152
* [ ] You are on the wrong issue tracker. We would like to remind you that this Issue Tracker is **only for Slimefun**. To report bugs on any addons, head to the corresponding issue tracker of that addon.
5253

.github/workflows/javadocs.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,80 @@
1-
<details>
2-
<summary>Table of contents</summary>
31
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
42
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
3+
**Table of contents**
54

6-
5+
- [Release Candidate 11 (25 Apr 2020)](#release-candidate-11-25-apr-2020)
76
- [Release Candidate 10 (28 Mar 2020)](#release-candidate-10-28-mar-2020)
8-
- [Additions](#additions)
9-
- [Changes](#changes)
10-
- [Fixes](#fixes)
117
- [Release Candidate 9 (07 Mar 2020)](#release-candidate-9-07-mar-2020)
12-
- [Fixes](#fixes-1)
138
- [Release Candidate 8 (06 Mar 2020)](#release-candidate-8-06-mar-2020)
14-
- [Fixes](#fixes-2)
159
- [Release Candidate 7 (06 Mar 2020)](#release-candidate-7-06-mar-2020)
16-
- [Additions](#additions-1)
17-
- [Changes](#changes-1)
18-
- [Fixes](#fixes-3)
1910
- [Release Candidate 6 (16 Feb 2020)](#release-candidate-6-16-feb-2020)
20-
- [Additions](#additions-2)
21-
- [Changes](#changes-2)
22-
- [Fixes](#fixes-4)
2311
- [Release Candidate 5 (09 Feb 2020)](#release-candidate-5-09-feb-2020)
24-
- [Additions](#additions-3)
25-
- [Changes](#changes-3)
26-
- [Fixes](#fixes-5)
2712
- [Release Candidate 4 (06 Jan 2020)](#release-candidate-4-06-jan-2020)
28-
- [Additions](#additions-4)
29-
- [Changes](#changes-4)
30-
- [Fixes](#fixes-6)
3113
- [Release Candidate 3 (21 Nov 2019)](#release-candidate-3-21-nov-2019)
32-
- [Additions](#additions-5)
33-
- [Changes](#changes-5)
34-
- [Fixes](#fixes-7)
3514
- [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
36-
- [Additions](#additions-6)
37-
- [Changes](#changes-6)
38-
- [Fixes](#fixes-8)
3915
- [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
4016

4117
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
42-
</details>
18+
19+
## Release Candidate 11 (25 Apr 2020)
20+
21+
#### Additions
22+
* Added GEOResourceGenerationEvent
23+
* Added AncientAltarCraftEvent
24+
* Added SlimefunGuide-Options API
25+
* Added ItemSettings API
26+
* Added 1.13 backwards compatibility
27+
* Added "Magma Cream to Magma Blocks" recipe to the Electric Press
28+
* Added "Magma Blocks to Sulfate" recipe
29+
* You can now search for items from within the book variant of the Guide
30+
* GEO Scans now support endlessly many different resources
31+
* Added Output Chest support to the Composter
32+
33+
#### Changes
34+
* Replaced GuideHandlers with FlexCategories
35+
* Removed support for old EmeraldEnchants versions
36+
* Updated the book variant of the guide to use the newer API
37+
* Removed internal /sf elevator command
38+
* Split whitelist.yml up into individual /world-settings/worldname.yml files
39+
* Performance improvements
40+
* Slimefun Guide runs much faster now and can better deal with many Categories and items
41+
* Lots of API improvements
42+
* Faulty addons are now identified more easily and will no longer break Slimefun's main content this quickly
43+
* You can no longer /sf give yourself a Multiblock
44+
* Addons have no longer access to Slimefuns default categories
45+
* Updated seasonal Categories to have better icons
46+
* Even more performance improvements
47+
* Changed Ignition Chamber Recipe
48+
* GEO Miner is now 2 seconds faster
49+
* All Generators will now stop consuming fuel if no energy is needed
50+
* /sf teleporter will now open your own Teleporter Menu if you specify no Player
51+
* Added counter-measures against Players who design Cargo networks in a way that intentionally lags out servers
52+
* API requests to Mojang are now spread across a longer time period to prevent rate-limits
53+
54+
#### Fixes
55+
* Fixed error message when clicking empty slots in the Slimefun Guide
56+
* Fixed #1779
57+
* Fixed localized messages not showing in the book guide
58+
* Fixed empty categories showing up when items inside were hidden
59+
* Fixed ghost pages showing up when too many categories were disabled
60+
* Fixed debug fish not showing the correct chunk timings
61+
* Fixed heads with missing permissions placing down
62+
* Fixed unpermitted items still showing up in the guide if researches are disabled
63+
* Fixed unpermitted items in the book guide triggering the search function
64+
* Fixed #1803
65+
* Fixed #1806
66+
* Fixed #1807
67+
* Fixed Coolers accepting non-Juice items
68+
* Fixed #1813
69+
* Fixed #1814
70+
* Fixed GEO Scanner being unable to deal with more than 28 different resources
71+
* Fixed #893
72+
* Fixed #1798
73+
* Fixed #1490
74+
* Fixed GPS Emergency Transmitters not working
4375

4476
## Release Candidate 10 (28 Mar 2020)
77+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#10
4578

4679
#### Additions
4780
* Added some new charts to bStats
@@ -88,16 +121,19 @@
88121
* Fixed #1768
89122

90123
## Release Candidate 9 (07 Mar 2020)
124+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#9
91125

92126
#### Fixes
93127
* Fixed Solar Generators not working
94128

95129
## Release Candidate 8 (06 Mar 2020)
130+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#8
96131

97132
#### Fixes
98133
* Fixed bStats Metrics not sending properly
99134

100135
## Release Candidate 7 (06 Mar 2020)
136+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#7
101137

102138
#### Additions
103139
* Added translations for Recipe Types
@@ -121,6 +157,7 @@
121157
* Fixed #1613
122158

123159
## Release Candidate 6 (16 Feb 2020)
160+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#6
124161

125162
#### Additions
126163
* Added a new language: Japanese
@@ -139,6 +176,7 @@
139176
* Fixed magician talisman not being able to enchant books
140177

141178
## Release Candidate 5 (09 Feb 2020)
179+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#5
142180

143181
#### Additions
144182
* Aded preset messages.yml files

README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Check out our [Addons](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Addons),
1515
* **[Discord Support Server](#discord)**
1616
* **[Bug Tracker](https://github.com/TheBusyBiscuit/Slimefun4/issues)**
1717
* **[Wiki](https://github.com/TheBusyBiscuit/Slimefun4/wiki)**
18+
* **[FAQ](https://github.com/TheBusyBiscuit/Slimefun4/wiki/FAQ)**
1819

1920
## Download Slimefun 4
2021
(See also: [How to install Slimefun](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Installing-Slimefun))<br>
@@ -24,7 +25,7 @@ Here is a full summary of the differences between these two versions of Slimefun
2425

2526
| | development builds | "stable" builds |
2627
| ------------------ | -------- | -------- |
27-
| **Supported Minecraft version(s)** | 1.14.X - 1.15.X | 1.14.X - 1.15.X |
28+
| **Supported Minecraft version(s)** | 1.13.X - 1.15.X | 1.14.X - 1.15.X |
2829
| **extensive testing before release** | :x: | :heavy_check_mark: |
2930
| **latest content** | :heavy_check_mark: | :x: |
3031
| **Discord support** | :heavy_check_mark: | :x: |
@@ -51,7 +52,7 @@ Development builds are uploaded automatically making the maintenance of a proper
5152
* [download "stable" builds](https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/)
5253

5354
## Discord
54-
You can find Slimefun's community on Discord and connect with **over 1250** users of this plugin from all over the world.<br>
55+
You can find Slimefun's community on Discord and connect with **over 1500** users of this plugin from all over the world.<br>
5556
Click the badge down below to join the server for suggestions/questions or other discussions about this plugin.<br>
5657
We are also hosting a community event every so often, join us to find out more.<br>
5758
**Important**: We do **not** accept bug reports on discord, please use our [Issue Tracker](https://github.com/TheBusyBiscuit/Slimefun4/issues) to submit bug reports!
@@ -75,10 +76,14 @@ https://github.com/TheBusyBiscuit/Slimefun4/wiki
7576
* [What is Slimefun?](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Slimefun-in-a-nutshell)
7677
* [How to install Slimefun](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Installing-Slimefun)
7778
* [Addons for Slimefun 4](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Addons)
79+
* [How to create an Addon for Slimefun 4](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Developer-Guide)
7880
* [Getting Started](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Getting-Started)
81+
* [Common issues](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Common-Issues)
82+
* [Frequently Asked Questions](https://github.com/TheBusyBiscuit/Slimefun4/wiki/FAQ)
7983
* [Help us expand the Wiki!](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Expanding-the-Wiki)
8084
* [Help us translate Slimefun!](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Translating-Slimefun)
81-
* [Common issues](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Common-Issues)
85+
86+
The wiki is entirely community-run, so if you find an article missing, feel free to write one and share it with others.
8287

8388
## Contributing to this project
8489
Slimefun 4 is an Open-Source project and licensed under

0 commit comments

Comments
 (0)