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,954 Commits 1 Branch 0 Tags 64 MiB
e261bbebe9
Commit Graph

7954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Apeiros-46B
214dc533a5 Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone 2021-07-06 02:49:22 -07:00
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
EpicPlayerA10
b6b83ca974 Changed doc 2021-07-04 12:30:17 +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
EpicPlayerA10
f56ef90dbf More cleanup 2021-07-03 22:02:00 +02:00
EpicPlayerA10
a2d38c3a05 Code Cleanup 2021-07-03 21:56:47 +02:00
EpicPlayerA10
26b897391a Change from Dispenser to Container 2021-07-03 21:54:16 +02:00
EpicPlayerA10
0128d57af0 Move code to superclass and call method in other machines 2021-07-03 21:36:15 +02:00
Martin Brom
c93dea06ed Allow IndustrialMiner to mine when minWorldHeight is lower than 0 2021-07-03 12:06:59 +02: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
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