mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
7,124 Commits 1 Branch 0 Tags 64 MiB
aa9e7a49d9
Commit Graph

7124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LilBC
013907900d
Add files via upload 2021-07-01 15:09:40 -04:00
LilBC
65070dc42e
Add files via upload 2021-07-01 14:34:27 -04:00
LilBC
b01b90d0d0
Add files via upload 2021-07-01 12:45:54 -04:00
LilBC
cbae3b9d73
Add files via upload 2021-07-01 12:44:23 -04:00
TheBusyBiscuit
5ce317936a
[CI skip] Make our yaml-linter happy 2021-07-01 16:52:28 +02:00
TheBusyBiscuit
a9e1571a2b [CI skip] Fix sonarcloud workflow 
Sonar requires Java 11, I forgot
 2021-07-01 16:50:53 +02:00
TheBusyBiscuit
96730548ee [CI skip] Add sonarcloud workflow for pull requests 2021-07-01 16:47:30 +02:00
TheBusyBiscuit
a77add9248 [CI skip] Implement maven cache for github workflows 2021-07-01 16:47:12 +02:00
The Busy Bot
c31962565d
[CI skip] New locale updates from Crowdin 2021-07-01 12:55:05 +02:00
TheBusyBiscuit
51bfbbd653
Merge pull request #3119 from svr333/AddTridentCrafting 
Add Trident recipe
 2021-06-30 23:35:12 +02:00
TheBusyBiscuit
beb955a507
[CI skip] Update changelog 2021-06-30 23:35:02 +02:00
Martin Brom
45ee78a0eb Code style 2021-06-30 18:27:57 +02:00
svr333
7109873c16
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-28 17:00:32 +02:00
Martin Brom
3bdd32b26d Fix regex to only match "Use" and "Uses", not "Usess..." 2021-06-28 12:33:59 +02:00
Martin Brom
9cab256e2b Add back singular version of "uses left" lore line 
Update regex to match both the plural and singular version
 2021-06-28 12:26:47 +02:00
Martin Brom
55683b15b3
Remove newline 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-28 12:12:36 +02:00
Senne
369efa6be3
Resolve merge conflict 2021-06-28 10:59:09 +02:00
Senne
c16e444995
Split up if statements 2021-06-28 10:57:17 +02:00
EpicPlayerA10
1058c15abe
Merge branch 'Slimefun:master' into master 2021-06-27 19:35:41 +02:00
Pawel Lesiak
6a09b29764 Caching getInventory 2021-06-27 15:25:19 +02:00
Daniel Walsh
eec9427cd5
[CI Skip] Merge pull request #3140 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x 
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.1
 2021-06-27 13:24:01 +01:00
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