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

6904 Commits

Author SHA1 Message Date
The Busy Bot
0fdd6edb00
[CI skip] New locale updates from Crowdin 2021-07-06 10:42:21 +02:00
TheBusyBiscuit
84262c5600
Merge pull request #3142 from LilBC/master
Fix Vanilla Auto Crafter Being Able to Craft Disabled Items
2021-07-05 15:15:41 +02:00
TheBusyBiscuit
9cd221a67a
[CI skip] Fixed typo 2021-07-05 15:14:18 +02:00
TheBusyBiscuit
e0179dbfc7
[CI skip] Updated changelog 2021-07-05 15:14:00 +02:00
LilBC
5ca97bcd09
Update src/main/resources/languages/en/messages.yml
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-05 08:52:24 -04:00
TheBusyBiscuit
c5f509a331
[CI skip] Run the maven-compiler workflow for pull requests targeting any branch 2021-07-05 13:00:04 +02:00
LilBC
55f777eb17
Merge branch 'Slimefun:master' into master 2021-07-04 21:40:23 -04:00
TheBusyBiscuit
1806b3399f [CI skip] Updated workflows 2021-07-04 13:18:47 +02:00
LilBC
564a1a0905
Update src/main/resources/languages/en/messages.yml
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-07-04 01:27:35 -04:00
LilBC
74fba2e1f5
Corrected Inverted Unlocked Recipe Check
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-04 00:35:19 -04:00
LilBC
ebfb7904b7
Reordered Codes 2021-07-02 09:24:10 -04:00
LilBC
7a40027937
Made Error Message More Informative 2021-07-02 09:14:59 -04:00
LilBC
36894894be
Changed Naming
Changed recipe-unavailable to recipe-unavailable.
2021-07-02 09:02:19 -04:00
LilBC
680511ee11
Fix hasUnlockedRecipe and Bad Imports 2021-07-02 08:58:53 -04:00
The Busy Bot
101139bb2f
[CI skip] New locale updates from Crowdin 2021-07-02 14:09:11 +02:00
TheBusyBiscuit
775505d759
Merge pull request #3144 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.200
2021-07-02 14:08:42 +02:00
TheBusyBiscuit
35ff56d12a
[CI skip] Updated discord-webhook workflow 2021-07-02 14:08:24 +02:00
Renovate Bot
d2befd0b16
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.200 2021-07-02 04:11:41 +00:00
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
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
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