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

7768 Commits

Author SHA1 Message Date
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
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
Sefiraat
9f4cb828cb Java16 Sonar Changes - 5 2022-07-02 21:36:15 +01:00
Sefiraat
0f6b6b244c Java16 Sonar Changes - 4 2022-07-02 21:31:03 +01:00
Sefiraat
cd9920b181 Java16 Sonar Changes - 3 2022-07-02 21:13:50 +01:00
Sefiraat
f32dfa4d76 Java16 Sonar Changes - 2 2022-07-02 21:03:20 +01:00
Sefiraat
b4bd9d7acf Java16 Sonar Changes 2022-07-02 20:51:14 +01:00
renovate[bot]
b1802e05ef
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.1b 2022-07-02 21:47:06 +02:00
TheBusyBiscuit
bb9e2dfa4a Impelemented a few instanceof patterns, actually quite nice :) 2022-07-02 21:43:16 +02:00
TheBusyBiscuit
20c3564e8f Initial update to Java 16 2022-07-02 20:49:00 +02:00
TheBusyBiscuit
2968f2bb16 [CI SKIP] Time for another RC build 2022-06-26 18:18:53 +02:00
JasperChaseTOQ
ad3030c39c
Update src/main/resources/tags/dirt_variants.json
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-06-23 18:32:20 -04:00
JasperChaseTOQ
68739d87a1
Update dirt_variants.json 2022-06-22 22:33:51 -04:00
qwertyuioplkjhgfd
3c2305f344
1.19 2022-06-22 17:42:10 -07:00
renovate[bot]
122b43c668
[CI skip] Update actions/setup-java action to v3.4.0 2022-06-22 01:08:24 +02:00
TheBusyBiscuit
08b7d039ef
[CI skip] Merge pull request #3590 from JasperChaseTOQ/patch-1
fixed typo in SlimefunItems.java
2022-06-14 12:33:48 +02:00
JasperChaseTOQ
bff4ca91c0
Update SlimefunItems.java 2022-06-11 20:52:28 -04:00
TheBusyBiscuit
2c4f886fe4
Merge pull request #3585 from Slimefun/major/1.19
1.19 compatibility
2022-06-11 13:16:23 +02:00
TheBusyBiscuit
9a3a763f58 Updated changelog 2022-06-11 13:12:09 +02:00
TheBusyBiscuit
c05420565d Added test cases for 1.19 biome maps 2022-06-11 13:07:17 +02:00
TheBusyBiscuit
cea6980368 Fixed biome-map for 1.19 2022-06-11 13:07:07 +02:00
TheBusyBiscuit
8674e1f5de Revert to old MockBukkit version 2022-06-11 12:45:02 +02:00
TheBusyBiscuit
9226ccf1c9 Updated pom.xml 2022-06-11 12:25:32 +02:00
TheBusyBiscuit
29388bef37 Updated readme and issue template 2022-06-11 12:23:30 +02:00
TheBusyBiscuit
03accf652f
Merge pull request #3577 from J3fftw1/feature/1-19
updated to 1.19
2022-06-11 12:12:41 +02:00
renovate[bot]
264883cfab
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.214 2022-06-10 21:45:17 +02:00
renovate[bot]
385039cdb6
[CI skip] Update thollander/actions-comment-pull-request action to v1.4.1 2022-06-09 19:46:54 +02:00
renovate[bot]
bfbc24a1c6
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.6 2022-06-09 19:46:47 +02:00