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

7963 Commits

Author SHA1 Message Date
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
Jeffrey Kosse
096625a7d7 fixes ancient altar not working in caves 2022-11-12 21:14:36 +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
Andrew Tran
1580ec4e01
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/Juice.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2022-10-27 20:50:23 +11:00
Andrew Tran
8e35af2cd9 refactored code 2022-10-26 14:09:38 +11:00
Andrew Tran
77b68b1951 add extra statement to account for absorption effect 2022-10-25 00:45:44 +11: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
ybw0014
8d72b90add
Merged upstream 2022-10-19 19:36:21 -04:00
ybw0014
48d67d49c5
Merge remote-tracking branch 'upstream/master' into chore/drop-low-version 2022-10-19 19:34:38 -04:00
ybw0014
281d1e7632
Fix test 2022-10-18 13:33:49 -04:00
ybw0014
bbf39f6a69
Remove SlimefunUtils.isInventoryEmpty 2022-10-18 13:32:14 -04:00
ybw0014
f1ab7ecd4e
Remove WorldUtils 2022-10-18 13:29:24 -04:00
Jeffrey Kosse
63fc4397dc whoops 2022-10-18 18:34:40 +02: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
Jeffrey Kosse
3b7bdb059d suggested changes 2022-10-18 17:55:23 +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
Jeffrey Kosse
117a867071 tag naming consicentencies 2022-10-17 13:27:17 +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
Jeffrey Kosse
e7d766e229 suggested changes 2022-10-17 12:34:44 +02:00
Jeffrey Kosse
3e776a7fba changed to enhanced for loop 2022-10-17 07:53:49 +02:00
Jeffrey Kosse
7dcd574db1 smart to actually add the tag 2022-10-16 14:10:32 +02:00
Jeffrey Kosse
c40bf0d1d3 tags 2022-10-16 14:03:43 +02:00
renovate[bot]
475b27b48c
[CI skip] Update actions/checkout action to v3.1.0 2022-10-04 12:42:09 +02:00
svr333
c9118a0fd0
Add version check 2022-10-04 11:24:33 +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
svr333
6c96210ddb
Add Basalt->Blackstone recipe 2022-10-01 18:40:03 +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