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

7688 Commits

Author SHA1 Message Date
TheBusyBiscuit
2813e76075 Fixed #3573 2022-07-10 10:59:23 +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
renovate[bot]
d4428c00f1
[CI skip] Update dependency me.clip:placeholderapi to v2.11.2 2022-07-08 13:29:30 +02: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
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
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
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
TheBusyBiscuit
f431aa6dca
Merge pull request #3427 from Slimefun/chore/yeet-chestterminal
Removed ChestTerminal support
2022-04-29 12:26:40 +02:00