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

8185 Commits

Author SHA1 Message Date
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
renovate[bot]
2370163f99
[CI skip] Update dependency org.mockito:mockito-core to v4.6.1 2022-06-09 19:46:44 +02:00
renovate[bot]
2c233ebe14
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M7 2022-06-09 19:46:41 +02:00
renovate[bot]
719aaf5017
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.213 2022-06-09 19:46:37 +02:00
renovate[bot]
7542966eee
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.10 2022-06-09 19:46:34 +02:00
renovate[bot]
f7623ed448
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.10 2022-06-09 19:46:01 +02:00
J3fftw
182e6771df
Merge branch 'master' into feature/1-19 2022-06-09 12:25:58 +02:00
TheBusyBiscuit
8ecda680e9
[CI skip] Updated WorldEdit maven repository url 2022-06-09 12:12:27 +02:00
Jeffrey Kosse
90bd28a10e changed worldedit manen dependency 2022-06-09 08:05:07 +02:00
Jeffrey Kosse
f8b44cb63f removed illegal values 2022-06-07 22:17:55 +02:00
Jeffrey Kosse
eb8fa9c522 fixed tests 2022-06-07 22:07:52 +02:00
Jeffrey Kosse
fb5a20c603 updated to 1.19 2022-06-07 21:55:18 +02:00
renovate[bot]
87e9713ef4
[CI skip] Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v2 2022-05-22 16:13:57 +02:00
renovate[bot]
e9715cf505
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.5 2022-05-22 16:13:38 +02:00
renovate[bot]
3a16d4b090
[CI skip] Update pascalgn/automerge-action action to v0.15.3 2022-05-22 16:13:19 +02:00
qwertyuioplkjhgfd
6bf9738ddd
Add ensure compatibility in pull request template 2022-05-20 15:13:20 -07:00
renovate[bot]
56a51c7688
[CI skip] Update actions/setup-java action to v3.3.0 2022-05-12 19:12:07 +02:00
naveen
55c9251d5b chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-05-08 01:00:37 +00:00
TheBusyBiscuit
f431aa6dca
Merge pull request #3427 from Slimefun/chore/yeet-chestterminal
Removed ChestTerminal support
2022-04-29 12:26:40 +02:00
TheBusyBiscuit
949eb48fbc
[CI skip] Removed CT as a loadbefore 2022-04-29 12:26:20 +02:00
TheBusyBiscuit
ecb4196dc4
[CI skip] Updated changelog 2022-04-29 12:25:44 +02:00
renovate[bot]
1097b5582e
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.212 2022-04-29 12:23:46 +02:00
renovate[bot]
227e624022
[CI skip] Update actions/setup-java action to v3.2.0 2022-04-29 12:23:39 +02:00
TheBusyBiscuit
5cfc4f725e Fixed #3548 2022-04-25 18:12:02 +02:00
renovate[bot]
edead33c8f
[CI skip] Update thollander/actions-comment-pull-request action to v1.3.0 2022-04-25 18:02:03 +02:00
TheBusyBiscuit
7a2347a027
Merge pull request #3546 from craftish37/master
Added Seagrass recipe (suggestion #398 from Mr.Moules)
2022-04-24 19:26:23 +02:00
TheBusyBiscuit
ab6790aed0
[CI skip] Updated changelog 2022-04-24 19:26:09 +02:00
TheBusyBiscuit
2d5c62fc8e
Merge pull request #3541 from itslukemango/master
Fix Arithmetic Error
2022-04-23 13:20:38 +02:00
TheBusyBiscuit
dee40e48cf
[CI skip] Update changelog 2022-04-23 13:20:26 +02:00
renovate[bot]
63d70a52db
[CI skip] Update dependency org.mockito:mockito-core to v4.5.1 2022-04-23 13:14:37 +02:00
renovate[bot]
2e5962c87f
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.0 2022-04-23 13:14:23 +02:00
renovate[bot]
6d62d0e9a4
[CI skip] Update actions/checkout action to v3.0.2 2022-04-23 13:14:17 +02:00
craftish37
76444df8f5
Formatting
Co-authored-by: Varian Anora <variananora@outlook.com>
2022-04-22 16:31:27 +02:00
craftish37
1a5c3f024f Forgot to use my damn brain
(Also added Seagrass Fertilizer)
2022-04-22 16:02:21 +02:00
craftish37
3021a8efa9
Added Seagrass recipe (suggestion #398 from Mr.Moules) 2022-04-22 15:19:38 +02:00
itslukemango
7f70570260
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-04-22 12:11:27 +01:00
itslukemango
28445203f2
Merge branch 'Slimefun:master' into master 2022-04-20 23:14:21 +01:00
renovate[bot]
0a3508529c
[CI skip] Update dependency org.mockito:mockito-core to v4.5.0 2022-04-21 00:08:36 +02:00
=
ec79423123 Fix Arithmetic Error 2022-04-20 22:45:04 +01:00
TheBusyBiscuit
217196c137 Fixed #3534 2022-04-19 20:51:13 +02:00
renovate[bot]
5d093822de
[CI skip] Update dependency com.konghq:unirest-java to v3.13.8 2022-04-19 19:23:40 +02:00
renovate[bot]
b5e2b2160c
[CI skip] Update actions/checkout action to v3.0.1 2022-04-19 19:23:17 +02:00
renovate[bot]
c4317a23a0
[CI skip] Update actions/setup-java action to v3.1.1 2022-04-12 09:52:07 +02:00
TheBusyBiscuit
429ff50624 Fixed #3504 2022-04-08 18:02:45 +02:00