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

8321 Commits

Author SHA1 Message Date
renovate[bot]
01011cf0a1
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.220 2023-06-07 20:57:31 +02:00
renovate[bot]
85763d2692
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.1.0 2023-05-20 04:38:51 +02:00
test137e29b
2dd720839e Fix android move task 2023-05-09 21:21:57 +01:00
renovate[bot]
69ecb38c53
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.3 2023-04-29 17:14:57 +02:00
renovate[bot]
603c686433
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.10 2023-04-29 17:14:49 +02:00
renovate[bot]
b225a6b83a
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.3.3 2023-04-22 12:26:52 +02:00
renovate[bot]
11c46ec8ed
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.4.1-r4 2023-04-22 12:26:42 +02:00
renovate[bot]
d2ad2b181c
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.9 2023-04-22 12:26:32 +02:00
renovate[bot]
affa844dfa
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.219 2023-04-22 12:26:23 +02:00
renovate[bot]
beafe0e41f
[CI skip] Update actions/setup-java action to v3.11.0 2023-04-22 12:26:15 +02:00
renovate[bot]
f5f4e56ed5
[CI skip] Update actions/checkout action to v3.5.2 2023-04-22 12:26:05 +02:00
renovate[bot]
7841b5da8a
[CI skip] Update dependency org.mockito:mockito-core to v5.3.1 2023-04-22 12:25:40 +02:00
J3fftw1
d1d67aada9 requested changes 2023-04-14 13:14:17 +02:00
J3fftw1
258e38396c requested changes 2023-04-14 13:13:24 +02:00
J3fftw1
3209ca309c Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/fix-withers-creating-ghost-blocks 2023-04-14 13:04:53 +02:00
renovate[bot]
d860ee56b2
[CI skip] Update actions/checkout action to v3.5.0 2023-03-25 12:40:13 +01:00
renovate[bot]
cb7b14a430
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.14 2023-03-21 15:38:41 +01:00
renovate[bot]
5c2e5867f1
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.14 2023-03-21 15:38:22 +01:00
renovate[bot]
e835a96f56
[CI skip] Update dependency me.clip:placeholderapi to v2.11.3 2023-03-21 15:37:59 +01:00
renovate[bot]
643c59fefe
[CI skip] Update hmarr/auto-approve-action action to v3.2.1 2023-03-21 15:36:28 +01:00
renovate[bot]
8ca7ecd3b1
[CI skip] Update actions/checkout action to v3.4.0 2023-03-21 15:36:17 +01:00
renovate[bot]
9b72c3d842
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0 2023-03-21 15:35:52 +01:00
Daniel Walsh
22a7f42207
Merge pull request #3802 from J3fftw1/fix/error-on-startup 2023-03-19 12:56:24 +00:00
J3fftw1
4ebc1f0591 requested changes 2023-03-19 13:17:35 +01:00
J3fftw1
4ffd10531b fixed username not being found 2023-03-18 14:11:01 +01:00
TheBusyBiscuit
735e4cc38a
Merge pull request #3755 from J3fftw1/fix/saldedupe
fixes #3254
2023-03-13 15:13:57 +01:00
JustAHuman-xD
69c7223a70 Don't actually need that 2023-03-13 09:13:55 -05:00
TheBusyBiscuit
dc4eb8a859
[CI skip] Update CHANGELOG.md 2023-03-13 15:13:34 +01:00
renovate[bot]
c362653b0d
[CI skip] Update pascalgn/automerge-action action to v0.15.6 2023-03-13 15:10:50 +01:00
JustAHuman-xD
bc9cdf7aa6 Requested changes 2023-03-13 09:01:41 -05:00
JustAHuman-xD
9f2926c6ef Whoops- 2023-03-13 07:41:17 -05:00
JustAHuman-xD
1c46ecca25 Change loading system 2023-03-13 07:37:29 -05:00
Phoenix-Starlight
5d5d00f9fa Generalize the class 2023-03-12 13:15:56 -07:00
J3fftw1
ad78ebfbc8 Requested changes 2023-03-12 16:17:21 +01:00
J3fftw1
79af0a032c Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/fix-withers-creating-ghost-blocks 2023-03-12 16:08:04 +01:00
Phoenix-Starlight
f19485f24f Make Fire Staff not disenchantable by default 2023-03-11 13:42:08 -08:00
Daniel Walsh
f375f7befa
[CI Skip] Merge pull request #3793 from J3fftw1/fix/change-paper-repo
Change paper repo
2023-03-11 11:32:24 +00:00
J3fftw1
31aa80429c Change paper repo 2023-03-11 12:22:42 +01:00
renovate[bot]
27caae8647
[CI skip] Update dependency org.mockito:mockito-core to v5.2.0 2023-03-10 13:09:14 +01:00
renovate[bot]
90650ead8b
[CI skip] Update hmarr/auto-approve-action action to v3.2.0 2023-03-10 13:06:04 +01:00
TheBusyBiscuit
157fe4494c
Merge pull request #3786 from JustAHuman-xD/fix/soulbound-when-disabled
Fixes #3361
2023-03-07 22:57:46 +01:00
TheBusyBiscuit
a761ab9194
Merge pull request #3679 from svr333/AddBasaltToBlackstone
Add Basalt->Blackstone recipe
2023-03-07 22:57:28 +01:00
TheBusyBiscuit
5c81577e4d
[CI skip] Updated changelog 2023-03-07 22:57:10 +01:00
TheBusyBiscuit
840083301c
Merge pull request #3707 from tandrew468/fix/golden-apple-juice-#3701
Fixes #3701
2023-03-04 17:23:19 +01:00
TheBusyBiscuit
fb93b5d3f0
[CI skip] Updated changelog 2023-03-04 17:23:06 +01:00
JustAHuman-xD
2a0ff79c5d Suggested changes 2023-03-04 06:12:01 -06:00
JustAHuman-xD
7fff6e4d9b Fix Import Order 2023-03-04 06:06:15 -06:00
FN-FAL113
132ca66245
Merge branch 'fix/industrial-miner-bug' of https://github.com/FN-FAL113/Slimefun4 into fix/industrial-miner-bug 2023-03-04 18:52:36 +08:00
FN-FAL113
408416f414
another oopsie fixy 2023-03-04 18:52:15 +08:00
Jeff
65df4d5a9e
Merge branch 'master' into fix/industrial-miner-bug 2023-03-04 18:47:18 +08:00