mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
7,603 Commits 1 Branch 0 Tags 64 MiB
d375766139
Commit Graph

7603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renovate Bot
a84b634db8
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.1 2021-06-27 12:10:21 +00:00
Martin Brom
fc197ac1d1 Make the uses left suffix a constant 2021-06-26 22:21:37 +02:00
Martin Brom
ca1222c239 Forgot to remove unused imports... 2021-06-26 22:00:24 +02:00
Martin Brom
4fc940198d Use endsWith instead of regex 2021-06-26 21:56:13 +02:00
TheBusyBiscuit
add34089bc Renamed main class 2021-06-26 19:10:45 +02:00
TheBusyBiscuit
b4b19d53de More refactoring 2021-06-26 19:09:18 +02:00
Martin Brom
c95f9aed0a Move uses left lore regex into PatternUtils 
Make NamespacedKeys in LimitedUseItem and StormStaff non-static
 2021-06-26 16:42:14 +02:00
TheBusyBiscuit
18a944d31b Relocated researches package 2021-06-26 16:36:32 +02:00
TheBusyBiscuit
88fd3333c5 Renamed getByID to getById 2021-06-26 16:34:12 +02:00
TheBusyBiscuit
8055595d75 Formatting 2021-06-26 16:22:56 +02:00
TheBusyBiscuit
fc18546b5c Relocate RecipeType.java 2021-06-26 16:01:50 +02:00
TheBusyBiscuit
7714c50ab9 Renamed categories to item groups 2021-06-26 15:59:24 +02:00
TheBusyBiscuit
f6890f4c49 Relocated SlimefunItem.java 2021-06-26 15:56:34 +02:00
TheBusyBiscuit
0dd1356630 Relocated ItemHandler.java 2021-06-26 15:54:34 +02:00
TheBusyBiscuit
986c152c17 Relocated SlimefunItemStack.java 2021-06-26 15:54:16 +02:00
EpicPlayerA10
05c11a633a Added support for multiple output chests 2021-06-26 11:16:34 +02:00
EpicPlayerA10
66dc68ac5e Cleanup 2021-06-26 10:29:28 +02:00
EpicPlayerA10
be4a4df832
Merge branch 'master' into master 2021-06-26 10:12:56 +02:00
TheBusyBiscuit
25dea3daf6 Fixed #2966 
This fix was salvaged from PR #2968
 2021-06-26 00:21:01 +02:00
TheBusyBiscuit
b9f64bdebc Deepslate ores can now be doubled using an Ore Crusher 2021-06-26 00:05:43 +02:00
TheBusyBiscuit
65142d1204 [CI skip] Some code cleanup 2021-06-26 00:02:43 +02:00
EpicPlayerA10
0d5870296b Fix disappearing items with output chest 2021-06-25 20:53:03 +02:00
TheBusyBiscuit
f5b5fc2f4e
Merge pull request #3118 from svr333/AddDiamondGrinding 
Add diamond -> coal conversion
 2021-06-25 19:16:13 +02:00
TheBusyBiscuit
86dd2bb41c
[CI skip] Updated changelog 2021-06-25 19:16:07 +02:00
TheBusyBiscuit
10764555d3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 2021-06-25 19:12:23 +02:00
TheBusyBiscuit
9caf71ad43
[CI skip] Merge pull request #3137 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x 
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.2
 2021-06-25 19:10:18 +02:00
TheBusyBiscuit
155b6014e2 Fixed unit test 2021-06-25 19:07:16 +02:00
Renovate Bot
139caf05d7
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.2 2021-06-24 19:58:14 +00:00
svr333
037747983c
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 
Co-authored-by: Semisol <git@smileycreations15.com>
 2021-06-23 10:26:29 +02:00
NgLoader
5aeb3e8c84 fix: fixed tab 
chore: renamed MultiBlockBreakEvent to PlayerBlockBreakEvent
feat: added AndroidBlockBreakEvent
 2021-06-22 02:24:21 +02:00
NgLoader
bd85eab39c feat: added MultiBlockBreakEvent 2021-06-21 23:33:48 +02:00
NgLoader
1308f0c5a9 chore: updated EventHandler arguements 2021-06-21 21:56:41 +02:00
NgLoader
0e6d7604d7 fix: fixed tabs 2021-06-21 21:40:56 +02:00
NgLoader
e88cffde8c chore: added method description 2021-06-21 21:29:49 +02:00
NgLoader
9919549c7e Merge branch 'master' of github.com:NgLoader/Slimefun4 2021-06-21 21:15:38 +02:00
NgLoader
282f9e0e43 feat: added orebfuscator integration 2021-06-21 21:13:49 +02:00
Senne
7ed4441849
Add subconversion 2021-06-21 20:03:45 +02:00
Senne
60b803c64c
Make trident recipe expensive 2021-06-21 19:54:05 +02:00
TheBusyBiscuit
816164ed0a
[CI skip] Merge pull request #3132 from Slimefun/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.11.2
 2021-06-21 17:58:32 +02:00
Renovate Bot
7703c80bd9
Update dependency org.mockito:mockito-core to v3.11.2 2021-06-21 15:55:11 +00:00
Martin Brom
93de94d036 Use Regex to find the correct "Uses left" line 
Make LimitedUseItem::setMaxUseCount return LimitedUseItem
 2021-06-21 15:34:36 +02:00
TheBusyBiscuit
57f7553f74
Merge pull request #3126 from Slimefun/chore/recommend-java-16 
Encourage Java 16 on older versions
 2021-06-21 14:30:10 +02:00
TheBusyBiscuit
334f311917 [CI skip] Reorganize test structure 2021-06-20 16:17:34 +02:00
TheBusyBiscuit
e9e7bb4597
[CI skip] Merge pull request #3128 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x 
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.0
 2021-06-20 15:51:36 +02:00
TheBusyBiscuit
37ec181fd5
[CI skip] Prepare changelog for next development cycle 2021-06-20 15:28:35 +02:00
TheBusyBiscuit
79ffcf652b
[Ci skip] Move new bug-reporting template out of its beta stage 2021-06-20 15:26:45 +02:00
TheBusyBiscuit
f3164785e3
[CI skip] Delete old bug-reporting template 2021-06-20 15:26:14 +02:00
Renovate Bot
d0426d517d
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.0 2021-06-19 21:31:51 +00:00
TheBusyBiscuit
5d34a25756
[CI skip] Update changelog 2021-06-19 10:45:01 +02:00
Daniel Walsh
68f8a36008
Merge pull request #3127 from EpicPlayerA10/master 2021-06-19 09:37:23 +01:00