1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00

Merge branch 'master' into tags

This commit is contained in:
TheBusyBiscuit 2020-09-22 15:33:56 +02:00 committed by GitHub
commit 8365d1e6d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -27,6 +27,7 @@
#### Additions
* Added /sf charge
* Added Energized Energy Capacitor
* Added various new fuel types to the Coal Generator
* (API) Added custom tags for developers
#### Changes

View File

@ -77,9 +77,8 @@ Not following these rules can lead to a kick or even a ban from the server.
<p align="center">
<a href="https://discord.gg/fsD4Bkh">
<img src="https://img.shields.io/discord/565557184348422174?color=7289DA&label=Discord&style=for-the-badge" alt="Discord Invite"/>
</a><br>
(Click the badge to join)
<img src="https://discordapp.com/api/guilds/565557184348422174/widget.png?style=banner3" alt="Discord Invite"/>
</a>
</p>
## Wiki