Skip to content

Commit 6f83f7a

Browse files
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into stable
2 parents da707a9 + 6c017b8 commit 6f83f7a

283 files changed

Lines changed: 8011 additions & 4204 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.

.github/workflows/auto-approve.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Auto approve
2+
3+
on:
4+
pull_request
5+
6+
jobs:
7+
auto-approve:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: hmarr/auto-approve-action@v2.0.0
11+
if: github.actor == 'gitlocalize-app[bot]' || github.actor == 'renovate-bot'
12+
with:
13+
github-token: "${{ secrets.ACCESS_TOKEN }}"
File renamed without changes.
File renamed without changes.

CHANGELOG.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
33
**Table of contents**
44

5+
- [Release Candidate 13 (16 Jun 2020)](#release-candidate-13-16-jun-2020)
56
- [Release Candidate 12 (27 May 2020)](#release-candidate-12-27-may-2020)
67
- [Release Candidate 11 (25 Apr 2020)](#release-candidate-11-25-apr-2020)
78
- [Release Candidate 10 (28 Mar 2020)](#release-candidate-10-28-mar-2020)
@@ -17,7 +18,59 @@
1718

1819
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
1920

21+
## Release Candidate 13 (16 Jun 2020)
22+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13
23+
24+
#### Additions
25+
* Added Dried Kelp Blocks recipe to the Electric Press
26+
* Added Bone Blocks recipe to the Electric Press
27+
* Added thai translations
28+
* Added Industrial Miner
29+
* Added Advanced Industrial Miner
30+
* Added Cocoa Organic Food
31+
* Added Cocoa Fertilizer
32+
* Added a configurable limit to the Pickaxe of Vein Mining
33+
* Added Gold Ingot to Dust recipe to the Electric Ingot Pulverizer
34+
* Added Saddles to possible fishing loot for the Fishing Android
35+
* Added Name tags to possible fishing loot for the Fishing Android
36+
* Added Nautilus Shell to possible fishing loot for the Fishing Android
37+
* Added Bamboo to possible fishing loot for the Fishing Android
38+
39+
#### Changes
40+
* Removed Digital Miner
41+
* Removed Advanced Digital Miner
42+
* Dried Kelp Blocks can now be used in the Coal Generator
43+
* Crafting Organic Food/Fertilizer yields more output now
44+
* Organic Food (Melon) now uses Melon Slices instead of Melon blocks
45+
* The Seismic Axe now skips the first two blocks to clear your field of view
46+
* Auto Disenchanting is now a tiny bit faster
47+
* Small performance improvements
48+
* Dried Kelp Blocks can now be used as fuel for Tier 1 Androids
49+
* Androids now have a seperate category in the Slimefun Guide
50+
* Android Interface recipes now require steel ingots
51+
* Changed and unified a couple of tooltips
52+
* Changed tooltip on jetpacks and jet boots to say "Crouch" instead of "Hold Shift"
53+
54+
#### Fixes
55+
* Fixed Ore Washer recipes showing up twice
56+
* Fixed #1942
57+
* Fixed a few memory leaks
58+
* Fixed #1943
59+
* Fixed Nuclear Reactors accepting Lava as coolant
60+
* Fixed #1971
61+
* Fixed #1976
62+
* Fixed #1988
63+
* Fixed #1985
64+
* Fixed a missing texture in the Android Script Editor
65+
* Fixed #1992
66+
* Possibly fixed #1951
67+
* Fixed tab completion for /sf give showing players instead of amounts
68+
* Fixed #1993
69+
* Fixed #1907
70+
* Fixed research fireworks still dealing damage sometimes
71+
2072
## Release Candidate 12 (27 May 2020)
73+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12
2174

2275
#### Additions
2376
* Added Ukrainian translations
@@ -62,6 +115,7 @@
62115
* Fixed #1935
63116

64117
## Release Candidate 11 (25 Apr 2020)
118+
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#11
65119

66120
#### Additions
67121
* Added GEOResourceGenerationEvent

README.md

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Slimefun 4
2+
Looking for the download link? [**Click here**](https://github.com/TheBusyBiscuit/Slimefun4/blob/master/README.md#download-slimefun-4)
3+
24
Slimefun is a plugin which aims to turn your Bukkit/Spigot Server into a modpack without ever installing a single mod. It offers everything you could possibly imagine. From Backpacks to Jetpacks! Slimefun lets every player decide on their own how much they want to dive into Magic or Tech.<br>
35
We got everything from magical wands to nuclear reactors.<br>
46
We feature a magical altar, an electric power grid and even item transport systems.
@@ -18,38 +20,40 @@ Check out our [Addons](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Addons),
1820
* **[FAQ](https://github.com/TheBusyBiscuit/Slimefun4/wiki/FAQ)**
1921

2022
## Download Slimefun 4
21-
(See also: [How to install Slimefun](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Installing-Slimefun))<br>
23+
(See also: [How to install Slimefun](https://github.com/TheBusyBiscuit/Slimefun4/wiki/Installing-Slimefun))
24+
2225
Slimefun 4 can be downloaded **for free** on our builds page.<br>
23-
We currently provide two versions of Slimefun, development builds and "stable" builds.<br>
24-
Here is a full summary of the differences between different versions of Slimefun.
26+
We currently provide two distinct versions of Slimefun, development builds and "stable" builds.<br>
27+
Here is a full summary of the differences between the two different versions of Slimefun.
2528

2629
| | development (latest) | "stable" |
2730
| ------------------ | -------- | -------- |
2831
| **Minecraft version(s)** | :video_game: 1.13.X - 1.15.X | :video_game: 1.13.X - 1.15.X |
29-
| **testing before release** | :x: | :heavy_check_mark: |
32+
| **automatic updates** | :heavy_check_mark: | :heavy_check_mark: |
33+
| **frequent updates** | :heavy_check_mark: | :x: |
3034
| **latest content** | :heavy_check_mark: | :x: |
3135
| **Discord support** | :heavy_check_mark: | :x: |
3236
| **Bug Reports** | :heavy_check_mark: | :x: |
33-
| **frequent updates** | :heavy_check_mark: | :x: |
37+
| **testing before release** | :x: | :heavy_check_mark: |
3438
| **change logs** | :x: | :memo: **[change log](https://github.com/TheBusyBiscuit/Slimefun4/blob/master/CHANGELOG.md)** |
3539
| **Download link** | :package: **[download latest](https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/master/)** | :package: **[download "stable"](https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/)** |
3640

37-
**! We wholeheartedly recommend you to use development builds !**
41+
**:exclamation: We wholeheartedly recommend you to use _development builds_, they are the most recent version of Slimefun and also receive the most frequent updates!**
42+
<details>
43+
<summary>Here's why...</summary>
44+
45+
"Stable" builds do not receive frequent updates or fast patches. As time goes on, bugs are fixed but it will take some time until these fixes make it into a "stable" build. We will also not accept or review any bug reports from "stable" builds. They are in fact just old development builds that seemed to run fine without any __major__ issues.
3846

39-
"Stable" builds do not receive frequent updates or fast patches. As time goes on, bugs are fixed but it will take some time until these fixes make it into a "stable" build. We will also not accept or review any bug reports from "stable" builds. They are in fact just old development builds that seemed to run fine without any __major__ issues.<br>
40-
**Why use a "stable" build then?** While "stable" builds most definitely contain more bugs than development builds due to their very slow update schedule. you can be sure that they will not include __game-breaking__ issues, but rest assured that development builds almost never contain such issues either. If your server or buesiness however heavily depends on a version of Slimefun that does not change/update a lot, you are forgiven if you choose the "stable" branch. But development builds will hold the best experience in terms of features and bug fixes.<br>
41-
**What exactly are these "stable" builds then and why do you put them in quotes?** "Stable" builds are literally just outdated development builds that seemed to run fine without any major issues. But they are not exactly bug-free hence why actually calling them stable would be hypocritical. However these builds can only really stay "stable" if there are enough people using development builds to report bugs. Otherwise potential issues may go unnoticed and slip into "stable" builds. Again, we really recommend you to choose the development builds. But since many people really wanted "stable" builds, they are now an option too.
47+
**Why use a "stable" build then?**<br>
48+
While "stable" builds most definitely contain more bugs than development builds due to their very slow update schedule. you can be sure that they will not include __game-breaking__ issues, but rest assured that development builds almost never contain such issues either. If your server or business however heavily depends on a version of Slimefun that does not change/update a lot, you are forgiven if you choose the "stable" branch. But development builds will bring you the best experience, both in terms of features and bug fixes.
4249

43-
Whatever version of Slimefun you choose, we also recommend you to keep `auto-updates` enabled to receive automatic patches and fixes for Slimefun!
50+
**What exactly are these "stable" builds then and why do you put them in quotes?**<br>
51+
"Stable" builds are literally just outdated development builds that seemed to run fine without any __major__ issues. But they are far from bug-free hence why actually calling them stable would be hypocritical. However these builds can only really stay "stable" if there are enough people using development builds and report any bugs they come across. Otherwise potential issues may go unnoticed and slip into a "stable" build. Again, we really recommend you to choose the development builds. But since a few people really wanted "stable" builds, they are now an option too.
4452

45-
<p align="center">
46-
<a href="https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/master/">
47-
<img src="https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/master/badge.svg" alt="Build Server"/>
48-
</a>
49-
</p>
53+
</details>
5054

5155
## Discord
52-
You can find Slimefun's community on Discord and connect with **over 1800** users of this plugin from all over the world.<br>
56+
You can find Slimefun's community on Discord and connect with **over 2000** users of this plugin from all over the world.<br>
5357
Click the badge down below to join the server for suggestions/questions or other discussions about this plugin.<br>
5458
We are also hosting a community event every so often, join us to find out more.<br>
5559
**Important**: We do **not** accept bug reports on discord, please use our [Issue Tracker](https://github.com/TheBusyBiscuit/Slimefun4/issues) to submit bug reports!
@@ -113,33 +117,40 @@ _Please contact us on [Discord](#discord) before working on any code smells. Som
113117
Technical Debt is basically an estimate for how long it would take to fix all issues and code smells.
114118

115119
##### Test Coverage
116-
Slimefun now also uses Automated Tests to determine whether an update could break something. The coverage shows how much these tests cover. Higher coverage means less breaking changes and in turn better and more reliable builds.
117-
Due to this being a very huge project though, getting to `100% coverage` is probably impossible. But increasing that number even slightly still helps. So feel free to write Unit Tests for Slimefun and place them in the [/src/test/java/](https://github.com/TheBusyBiscuit/Slimefun4/tree/master/src/test/java) folder.
118-
120+
Slimefun now also uses Automated Tests to determine whether an update could break something. The coverage shows how much these tests cover. Higher coverage means less breaking changes and as a result also better and more reliable builds.
121+
Due to this being a very huge project though, getting to `100% coverage` is probably close to impossible. But increasing that number even slightly still helps. So feel free to write Unit Tests for Slimefun and place them in the [/src/test/java/](https://github.com/TheBusyBiscuit/Slimefun4/tree/master/src/test/java) folder.
119122

120123
## Disclaimers
121124
Slimefun4 uses various systems that collect usage information or download automatic updates as well as the latest information about the project.
122-
We do not collect any personal information from you but there are some services that may gather or download some data.
125+
We do not collect any personal information from you but there are some services that may gather or download some form of data.
123126

124127
You can opt-out of the Auto-Updater and stats collection at any time.
125128

126-
#### Auto-Updates
129+
<details>
130+
<summary>Automatic updates</summary>
131+
127132
Slimefun4 uses an Auto-Updater which connects to https://thebusybiscuit.github.io/builds/ to check for and download updates.<br>
128133
This behaviour is enabled by default but can be turned off under `/plugins/Slimefun/config.yml`.<br>
129134
We highly recommend you to keep this on at any time though, as you could be missing out on important patches.
135+
</details>
130136

131-
#### Metrics and Statistics
137+
<details>
138+
<summary>Metrics and Statistics</summary>
139+
132140
Slimefun4 uses [bStats](https://bstats.org/plugin/bukkit/Slimefun/4574) to collect anonymous information about the usage of this plugin.<br>
133141
This is solely for statistical purposes, as we are interested in how Servers/Players use this plugin.<br>
134142
All available data is anonymous and aggregated, at no point can we see individual server or player information.<br>
135143
All of the collected data is publicly accessible: https://bstats.org/plugin/bukkit/Slimefun/4574
136144

137145
You can also disable this behaviour under `/plugins/bStats/config.yml`.<br>
138146
For more info see [bStats' Privacy Policy](https://bstats.org/privacy-policy)
147+
</details>
139148

140-
#### GitHub Integration
149+
<details>
150+
<summary>GitHub Integration</summary>
151+
141152
Lastly, Slimefun4 connects to https://api.github.com/ to gather information about this open-source project.<br>
142-
No information about your Minecraft Server is sent to GitHub.
153+
No information about you or your Minecraft Server is sent to GitHub.
143154

144155
This information includes (but is not limited to)
145156
* list of contributors, their username and profile link (from the repositories `TheBusyBiscuit/Slimefun4`, `Slimefun/Slimefun-Wiki` and `Slimefun/Resourcepack`)
@@ -149,6 +160,7 @@ This information includes (but is not limited to)
149160
* amount of forks of this repository
150161
* amount of code-bytes in this repository
151162
* date of the last commit to this repository
163+
</details>
152164

153165
Additionally the plugin connects to https://mojang.com/ to retrieve the Minecraft skins of our contributors (if possible).<br>
154-
Note that this project is not associated with Mojang AB.
166+
Note that Slimefun is not associated with `Mojang Studios` or Minecraft.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<plugin>
152152
<groupId>org.apache.maven.plugins</groupId>
153153
<artifactId>maven-shade-plugin</artifactId>
154-
<version>3.2.3</version>
154+
<version>3.2.4</version>
155155

156156
<configuration>
157157

@@ -274,7 +274,7 @@
274274
<dependency>
275275
<groupId>com.github.TheBusyBiscuit</groupId>
276276
<artifactId>CS-CoreLib</artifactId>
277-
<version>8081bb4fe4</version>
277+
<version>4a7fce5202</version>
278278
<scope>provided</scope>
279279
</dependency>
280280

@@ -288,7 +288,7 @@
288288
<dependency>
289289
<groupId>com.github.seeseemelk</groupId>
290290
<artifactId>MockBukkit</artifactId>
291-
<version>v1.15-c79a603b7c-1</version>
291+
<version>v1.15-d952559324-1</version>
292292
<scope>test</scope>
293293
</dependency>
294294
<dependency>
@@ -302,7 +302,7 @@
302302
<dependency>
303303
<groupId>com.github.thebusybiscuit</groupId>
304304
<artifactId>CS-CoreLib2</artifactId>
305-
<version>0.20.4</version>
305+
<version>0.21</version>
306306
<scope>compile</scope>
307307
</dependency>
308308
<dependency>

0 commit comments

Comments
 (0)