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

6947 Commits

Author SHA1 Message Date
LilBC
0b2c3dba83
Add files via upload 2021-07-01 18:46:59 -04:00
LilBC
a922e2e8cc
Add files via upload 2021-07-01 18:16:13 -04:00
LilBC
28eec7b101
Add files via upload 2021-07-01 18:15:42 -04:00
LilBC
5a7a151a17
Add files via upload 2021-07-01 16:12:22 -04:00
LilBC
2f74d01312
Add files via upload 2021-07-01 15:10:19 -04:00
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
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
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
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
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
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
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