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

7848 Commits

Author SHA1 Message Date
Daniel Walsh
fce192b45f
Merge pull request #3706 from ybw0014/fix/nested-itemgroup
Resolves https://github.com/Slimefun/Slimefun4/issues/3705
2023-01-05 19:59:39 +00:00
Daniel Walsh
5fe73fd3e5
[CI Skip] Merge pull request #3716 from Slimefun/renovate/actions-setup-java-3.x 2023-01-05 19:57:28 +00:00
renovate[bot]
c666f39630
[CI skip] Update thollander/actions-comment-pull-request action to v2 2023-01-05 20:56:58 +01:00
Daniel Walsh
4924d4d8df
[CI Skip] Merge pull request #3708 from Slimefun/renovate/com.konghq-unirest-java-3.x 2023-01-05 19:56:33 +00:00
Daniel Walsh
03ee9f18ed
[ci skip] Merge pull request #3734 from Slimefun/renovate/actions-checkout-3.x 2023-01-05 19:45:14 +00:00
renovate[bot]
a07d289fce
Update actions/checkout action to v3.3.0 2023-01-05 16:07:18 +00:00
Daniel Walsh
1272148191
Merge pull request #3725 from ybw0014/chores/cscorelib
Disable Slimefun when CS-CoreLib is installed
2023-01-05 02:34:17 +00:00
renovate[bot]
fbf3a20962
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.218 2023-01-05 03:33:10 +01:00
renovate[bot]
d1ac14c8d6
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.13 2023-01-05 03:32:43 +01:00
renovate[bot]
26e3329a82
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.13 2023-01-05 03:32:17 +01:00
renovate[bot]
ccc8806d90
[CI skip] Update actions/checkout action to v3.2.0 2023-01-05 03:31:50 +01:00
renovate[bot]
6906014017
[CI skip] Update dependency io.papermc:paperlib to v1.0.8 2023-01-05 03:30:33 +01:00
Daniel Walsh
83e8eff6cd
Merge pull request #3733 from justtos/patch-1
[Fix] BlockPlacer placing disabled items
2023-01-05 00:32:55 +00:00
justtos
7d5c31c285
Update to a better disabled check
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-01-04 23:11:39 +02:00
justtos
168484e4ea
[Fix] BlockPlacer placing disabled items 2023-01-03 17:58:43 +02:00
renovate[bot]
761659fd20
[CI skip] Update dependency org.mockito:mockito-core to v4.11.0 2022-12-28 17:04:51 +01:00
ybw0014
a0682fe49c
Change warning message 2022-12-14 14:40:59 -05:00
ybw0014
95b628d8c9
Change warning message 2022-12-14 14:39:55 -05:00
renovate[bot]
e5393582f3
Update actions/setup-java action to v3.9.0 2022-12-14 16:19:14 +00:00
ybw0014
fc9071500a
No more CS-CoreLib 2022-12-14 03:08:38 -05:00
renovate[bot]
e6a10f7ce9
Update dependency com.konghq:unirest-java to v3.14.1 2022-12-04 14:59:59 +00:00
renovate[bot]
6a5f979fd6
[CI skip] Update dependency org.mockito:mockito-core to v4.9.0 2022-11-26 23:05:45 +01:00
renovate[bot]
bf28bbb5a8
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.5 2022-11-03 10:42:15 +01:00
renovate[bot]
155c639c60
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 2022-11-03 10:41:56 +01:00
renovate[bot]
fe11aaadcf
[CI skip] Update dependency org.mockito:mockito-core to v4.8.1 2022-11-03 10:41:41 +01:00
renovate[bot]
9f5c94840a
[CI skip] Update hmarr/auto-approve-action action to v3.1.0 2022-11-03 10:41:23 +01:00
ybw0014
888e26d5ad
Extra empty line 2022-10-22 19:48:38 -04:00
ybw0014
893612144b
Reorganize import 2022-10-22 19:42:23 -04:00
ybw0014
32774bbd5c
Add document 2022-10-22 19:21:52 -04:00
ybw0014
e78d89ad14
Empty SubItemGroup should not be visible in NestedItemGroup 2022-10-22 19:18:12 -04:00
renovate[bot]
5887e2c90a
[CI skip] Update pascalgn/automerge-action action to v0.15.5 2022-10-18 18:14:45 +02:00
renovate[bot]
028c6c7f68
[CI skip] Update actions/setup-java action to v3.6.0 2022-10-18 18:13:53 +02:00
TheBusyBiscuit
0b7c656d86 Improved logging for issue #3699 2022-10-18 15:42:39 +02:00
TheBusyBiscuit
27847a6396 Fixed #3664 (again, I hope) 2022-10-18 15:24:58 +02:00
renovate[bot]
05d97c2afb
[CI skip] Update ibiqlik/action-yamllint action to v3.1.1 2022-10-17 13:20:04 +02:00
renovate[bot]
7c44e63e0b
[CI skip] Update hmarr/auto-approve-action action to v3 2022-10-17 13:19:51 +02:00
renovate[bot]
4b6dc01cd7
[CI skip] Update thollander/actions-comment-pull-request action to v1.5.0 2022-10-17 13:19:40 +02:00
renovate[bot]
475b27b48c
[CI skip] Update actions/checkout action to v3.1.0 2022-10-04 12:42:09 +02:00
TheBusyBiscuit
7b9d769bab
Merge pull request #3678 from J3fftw1/fix-3577
fixed 3677
2022-10-04 10:47:03 +02:00
TheBusyBiscuit
485d212a1e
[CI skip] Updated changelog 2022-10-04 10:46:51 +02:00
Jeffrey Kosse
61f549260f forgot to change json name 2022-10-01 19:10:27 +02:00
Jeffrey Kosse
64c8dd571a changed tag name 2022-10-01 19:04:09 +02:00
Jeffrey Kosse
b516e69e5c added mangrove tag 2022-09-30 21:58:40 +02:00
Jeffrey Kosse
501c7ba85a whoops 2022-09-30 20:56:13 +02:00
Jeffrey Kosse
317a92bd69 fix 3577 2022-09-30 20:54:33 +02:00
TheBusyBiscuit
5455fb08ec
Merge pull request #3594 from TheWireLord/master
Added Glow Berries Being Useful
2022-09-29 17:59:02 +02:00
TheBusyBiscuit
477a0552c0
[CI skip] Updated changelog 2022-09-29 17:58:46 +02:00
renovate[bot]
aa8d823632
[CI skip] Update dependency com.konghq:unirest-java to v3.13.11 2022-09-29 17:49:33 +02:00
TheWireLord
9f01ec03b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-09-29 08:02:51 -04:00
TheBusyBiscuit
fd00771222
Merge pull request #3363 from qwertyuioplkjhgfd/register-filled-flask
Register filled flask as a Slimefun Item
2022-09-29 13:50:54 +02:00