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

8372 Commits

Author SHA1 Message Date
JustAHuman-xD
e7372064d5 Requested Changes 2023-02-10 13:05:50 -06:00
JustAHuman-xD
424b889588 Add API Methods & Small Cleanup 2023-02-10 12:46:55 -06:00
svr333
91156fa0d7
Remove version check 2023-02-03 13:59:47 +01:00
renovate[bot]
b4083a480f
[CI skip] Update dependency org.mockito:mockito-core to v5.1.1 2023-01-31 19:49:27 +01:00
TheBusyBiscuit
4bfc4f06fb
Merge pull request #3695 from J3fftw1/chore/some-chores
Some cleanup
2023-01-30 18:00:25 +01:00
TheBusyBiscuit
434ee3b6f2
Merge pull request #3756 from J3fftw1/fix/3741
Fix smelting null items
2023-01-30 17:54:27 +01:00
TheBusyBiscuit
1d5d5fc680
[CI skip] Update changelog 2023-01-30 17:53:53 +01:00
renovate[bot]
d463f50e85
[CI skip] Update dependency org.mockito:mockito-core to v5.1.0 2023-01-30 17:49:39 +01:00
J3fftw1
c21e2f3076 Fix smelting null items 2023-01-30 16:33:09 +01:00
J3fftw1
fc5375cb49 fix sadle dupe 2023-01-30 16:08:25 +01:00
J3fftw1
234923e618 adjusted the value 2023-01-25 12:45:03 +01:00
J3fftw1
efab9186f9 Added bamboo as a fuel type for androids 2023-01-25 12:41:06 +01:00
Daniel Walsh
84aaaa8a25
Merge pull request #3746 from J3fftw1/feature/More-use-for-cobbled-deepslate
more use for cobbled deepslate
2023-01-24 19:47:38 +00:00
TheBusyBiscuit
741ebdf89b
[CI skip] Merge pull request #3751 from J3fftw1/master
remove 1.14 from comments and others
2023-01-24 14:22:26 +01:00
J3fftw
d662306058
Update CHANGELOG.md
Co-authored-by: Varian Anora <variananora@outlook.com>
2023-01-24 14:14:32 +01:00
renovate[bot]
5ec2842c91
[CI skip] Update dependency org.mockito:mockito-core to v5 2023-01-24 14:12:20 +01:00
J3fftw
243d0b8a76
Apply suggestions from code review
Co-authored-by: Varian Anora <variananora@outlook.com>
2023-01-24 14:05:27 +01:00
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