1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

8155 Commits

Author SHA1 Message Date
The Busy Bot
4172138bb0
[CI skip] New locale updates from Crowdin 2022-07-16 20:06:58 +02:00
TheBusyBiscuit
6d141373fb
Merge branch 'master' into java16 2022-07-14 14:04:57 +02:00
TheBusyBiscuit
6da39afab7 Made the Tree Growth Accelerator 200% better 2022-07-14 13:09:49 +02:00
TheBusyBiscuit
f0730237e2 [CI skip] Configured remaining workflow permissions
Hopefully I did this right? 👀
2022-07-12 15:05:15 +02:00
TheBusyBiscuit
8dff6dbb86
[CI skip] Merge pull request #3555 from turrisxyz/setup-permissions
chore: Set permissions for GitHub actions
2022-07-12 14:57:13 +02:00
The Busy Bot
616f6a8cf1
[CI skip] New locale updates from Crowdin 2022-07-12 12:15:54 +02:00
renovate[bot]
229482ad44
[CI skip] Update actions/setup-java action to v3.4.1 2022-07-12 12:14:30 +02:00
The Busy Bot
126d5ba69d
[CI skip] New locale updates from Crowdin 2022-07-11 01:13:21 +02:00
renovate[bot]
b6e513eead
[CI skip] Update dependency com.konghq:unirest-java to v3.13.10 2022-07-10 18:51:26 +02:00
TheBusyBiscuit
5dbe617205
Merge pull request #3277 from KyleEstein/legacy-gold-pan
Allow admins to control the behavior of the Electric Gold Pan via the…
2022-07-10 14:56:21 +02:00
TheBusyBiscuit
14c915006c
[CI skip] Updated changelog 2022-07-10 14:56:07 +02:00
TheBusyBiscuit
d191599391
Merge pull request #3608 from Sefiraat/feature/itemgroup_sharing
Allow addons to disable warning
2022-07-10 13:22:05 +02:00
TheBusyBiscuit
3abe1c73cf
[CI skip] Updated changelog 2022-07-10 13:21:58 +02:00
TheBusyBiscuit
42aed25059
Merge pull request #3473 from qwertyuioplkjhgfd/better-round-robin
Improve Round-Robin Accuracy
2022-07-10 13:20:00 +02:00
TheBusyBiscuit
14ea9bf04e
[CI skip] Updated changelog 2022-07-10 13:19:50 +02:00
TheBusyBiscuit
43bc65c94c
[CI skip] Mark persian as a "right-to-left" lang 2022-07-10 12:53:31 +02:00
The Busy Bot
e3c6a7ecc0
[CI skip] New locale updates from Crowdin 2022-07-10 12:49:24 +02:00
TheBusyBiscuit
7274436ca1 Deprecated the "Hercules Pickaxe" 2022-07-10 11:11:15 +02:00
TheBusyBiscuit
2813e76075 Fixed #3573 2022-07-10 10:59:23 +02:00
TheBusyBiscuit
5200823b4e
Merge branch 'master' into java16 2022-07-09 21:07:18 +02:00
TheBusyBiscuit
1948858ccd
Merge pull request #3503 from J3fftw1/fix/bee-wings
Fix bee wings erroring on startup
2022-07-09 21:00:53 +02:00
TheBusyBiscuit
d34fff02e4
[CI skip] Updated changelog 2022-07-09 21:00:44 +02:00
TheBusyBiscuit
bcc606cb9d
Merge pull request #3607 from J3fftw1/feature/wool_carpets_tag
added wool tag
2022-07-09 20:44:39 +02:00
TheBusyBiscuit
1851332222
Merge pull request #3492 from J3fftw1/feature/new-glass
added tinted glass
2022-07-09 20:44:30 +02:00
TheBusyBiscuit
915ab9871a
[CI skip] Updated changelog 2022-07-09 20:44:11 +02:00
TheBusyBiscuit
273d358f62
Merge pull request #3598 from JasperChaseTOQ/master
Fixes mud not working with explosive shovel
2022-07-09 20:35:20 +02:00
TheBusyBiscuit
dd84a11ab0
[CI skip] Merge pull request #3564 from qwertyuioplkjhgfd/patch-1
Add ensure compatibility in pull request template
2022-07-09 20:35:12 +02:00
TheBusyBiscuit
223dbecfd9
[CI skip] Updated changelog 2022-07-09 20:34:55 +02:00
Sefiraat
6be38d68ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-07-09 20:19:28 +02:00
Sefiraat
eaa806d079 Feedback 2022-07-08 22:06:02 +01:00
renovate[bot]
d4428c00f1
[CI skip] Update dependency me.clip:placeholderapi to v2.11.2 2022-07-08 13:29:30 +02:00
Sefiraat
be7e4edff3 Docs 2022-07-06 12:24:59 +01:00
Sefiraat
1d74866863 Allow addons to disable warning 2022-07-06 12:16:33 +01:00
Jeffrey Kosse
2f2f031b8e forget the # 2022-07-06 11:55:25 +02:00
Jeffrey Kosse
5ab92f4111 moved the tag to be with other slimefun tags 2022-07-06 11:43:51 +02:00
Jeffrey Kosse
f516144ab6 added wool tag 2022-07-06 11:40:08 +02:00
JasperChaseTOQ
b6412a89f2
Merge branch 'Slimefun:master' into master 2022-07-06 00:11:12 -04:00
J3fftw
5414c284fa
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2022-07-03 23:04:37 +02:00
TheBusyBiscuit
06bd9873d9 Cleaned up some more code smells 2022-07-03 12:21:49 +02:00
TheBusyBiscuit
261bc443e9
Merge pull request #3603 from Sefiraat/java16
Java16 Sonar Changes
2022-07-03 12:02:28 +02:00
Sefiraat
82e141cf09 Cookie is making me work for my lunch 2022-07-03 10:36:12 +01:00
Sefiraat
affa3af06c Merge remote-tracking branch 'origin/java16' into java16 2022-07-02 23:46:09 +01:00
Sefiraat
5f525fbf74 Java16 Sonar Changes - 8 (done again) 2022-07-02 23:44:39 +01:00
Sefiraat
809530fccd Apply suggestions from code review - 2 2022-07-02 23:39:53 +01:00
Sefiraat
d15e02afbc Merge remote-tracking branch 'upstream/java16' into java16
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
2022-07-02 23:39:38 +01:00
Sefiraat
58fde5cbdf
Apply suggestions from code review - 1
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-07-02 23:39:05 +01:00
TheBusyBiscuit
e80f137a79
Merge branch 'java16' into java16 2022-07-03 00:00:07 +02:00
Sefiraat
30e9c879e0 Java16 Sonar Changes - 7 (done) 2022-07-02 22:09:05 +01:00
Sefiraat
dbf55be230 Java16 Sonar Changes - 6 2022-07-02 21:51:08 +01:00
Sefiraat
75375cef45 Remove CT from classifyLocation() 2022-07-02 21:37:15 +01:00