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

8155 Commits

Author SHA1 Message Date
J3fftw1
2dd94b93f9 stupid auto format 2023-01-24 13:50:29 +01:00
J3fftw1
666d005849 updated readme, bug report form, pull request form and other comments. 2023-01-24 13:48:39 +01:00
J3fftw1
50940b509d added to the AutoDisenchanter 2023-01-22 16:42:04 +01:00
J3fftw1
c204b8213c changed it to int range setting 2023-01-22 16:32:10 +01:00
J3fftw1
0edf0a41f3 requested changes 2023-01-22 16:28:58 +01:00
J3fftw1
1e5dd0af64 changed it to int range setting 2023-01-22 16:15:07 +01:00
J3fftw1
de318ce88c added to AbstractEnchantmentMachine 2023-01-22 16:06:55 +01:00
renovate[bot]
c154302d0b
[CI skip] Update thollander/actions-comment-pull-request action to v2.3.1 2023-01-22 15:30:57 +01:00
renovate[bot]
e6c9a5b8cd
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M8 2023-01-22 15:30:28 +01:00
renovate[bot]
4800ab8336
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.2 2023-01-22 15:29:40 +01:00
Daniel Walsh
ec3ce7315e
Merge pull request #3646 from ybw0014/chore/drop-low-version
Drop support for 1.14, 1.15
2023-01-22 11:28:17 +00:00
J3fftw1
1a6a2a07a8 added comma in comment 2023-01-21 23:16:13 +01:00
J3fftw1
0824768a14 added a way to set max enchants to go on an item 2023-01-21 23:15:03 +01:00
J3fftw1
02bf0e7b2b more use for cobbled deepslate 2023-01-19 09:11:55 +01:00
TheBusyBiscuit
77f2c91d05
[CI skip] Merge pull request #3739 from Slimefun/chore/update-changelog-for-rc-34
RC 34 is next up
2023-01-07 17:28:51 +01:00
Daniel Walsh
856aedb6c5
[CI Skip] RC 34 is next up 2023-01-07 15:40:06 +00:00
TheBusyBiscuit
b78c17b362
[CI skip] Schedule next RC for today 2023-01-07 15:20:34 +01:00
TheBusyBiscuit
3ae41d59f3
Merge pull request #3737 from Sefiraat/chore/update_changelog
Update changelog (Worse than Walshy's version)
2023-01-07 13:01:46 +01:00
Sefiraat
18eea27817 Update changelog 2023-01-06 13:05:27 +00:00
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
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