mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
6,221 Commits 1 Branch 0 Tags 64 MiB
328f9d3331
Commit Graph

6221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
StarWishsama
29b368f648 fix: shadow name 2021-01-29 12:13:24 +08:00
StarWishsama
8effed7139 Merge remote-tracking branch 'origin/magician-talisman-fix' into magician-talisman-fix 2021-01-29 12:10:02 +08:00
StarWishsama
a031585b5a fix: thank you idea 2021-01-29 12:09:24 +08:00
TheBusyBiscuit
ee7786b8e4 Allow Talismans to use the Actionbar 2021-01-29 03:02:50 +01:00
TheBusyBiscuit
3c0afeb943 Small fix 2021-01-29 02:47:20 +01:00
TheBusyBiscuit
a827df19a7
[CI skip] Small style change 2021-01-28 23:17:56 +01:00
TheBusyBiscuit
ff72e1165e
[CI skip] Merge pull request #2781 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x 
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.22.1
 2021-01-28 23:16:47 +01:00
TheBusyBiscuit
d75e693ceb
[CI skip] Merge pull request #2780 from Slimefun/gitlocalize-14890 
Translated the new string
 2021-01-28 23:16:28 +01:00
TheBusyBiscuit
968896ddf2
[CI skip] Merge pull request #2778 from Slimefun/gitlocalize-14889 
Update Japanese translation file.
 2021-01-28 23:16:04 +01:00
Renovate Bot
5aeffb3dd6
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.22.1 2021-01-28 21:39:41 +00:00
Nikolay
6505b1c624 Translate messages_bg.yml via GitLocalize 2021-01-28 21:28:58 +00:00
bito-blosh
1c404d7f66 Translate messages_ja.yml via GitLocalize 2021-01-28 17:55:10 +00:00
TheBusyBiscuit
835e8fa384 Translate messages_ja.yml via GitLocalize 2021-01-28 17:55:09 +00:00
TheBusyBiscuit
46de5a700a Little bit of refactoring 2021-01-28 18:43:20 +01:00
TheBusyBiscuit
8cf0f61f3e Added placeholder for unloaded profiles to PlaceholderAPI integration 2021-01-28 18:21:22 +01:00
TheBusyBiscuit
2d244420a9 [CI skip] Added a release date 2021-01-28 14:51:02 +01:00
TheBusyBiscuit
20d6656f35
[CI skip] Merge pull request #2777 from Slimefun/gitlocalize-14884 
add zh-TW wise talisman and enchantment book binding
 2021-01-28 14:28:30 +01:00
TheBusyBiscuit
e4fcbfb238
[CI skip] Merge pull request #2776 from Slimefun/gitlocalize-14883 
add zh-TW wise talisman messages
 2021-01-28 14:28:14 +01:00
HeroBrineKing
afb492fb3b Translate researches_zh-TW.yml via GitLocalize 2021-01-28 13:09:52 +00:00
HeroBrineKing
8399136bc1 Translate messages_zh-TW.yml via GitLocalize 2021-01-28 13:08:40 +00:00
TheBusyBiscuit
1d111772f2 Translate messages_zh-TW.yml via GitLocalize 2021-01-28 13:08:39 +00:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks 2021-01-28 13:41:27 +01:00
TheBusyBiscuit
6df052e4cf Fixes #2771 2021-01-28 12:37:13 +01:00
TheBusyBiscuit
20694c19bd
Merge pull request #2774 from Slimefun/api/access-raw-storage 
Add a way to retrieve the raw storage
 2021-01-28 12:36:33 +01:00
Daniel Walsh
23efc9b6f0
REEE Im not having a good day 2021-01-26 13:01:07 +00:00
Daniel Walsh
f923612388
oops 2021-01-26 12:58:14 +00:00
Daniel Walsh
03cce6265d
Make it return an immutable map 2021-01-26 12:55:03 +00:00
Daniel Walsh
5aa4361a92
Merge branch 'api/access-raw-storage' of github.com:Slimefun/Slimefun4 into api/access-raw-storage 2021-01-26 12:52:35 +00:00
TheBusyBiscuit
7ffc8aff24 Fixes #2760 2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a Fixes #2460 2021-01-26 10:07:12 +01:00
TheBusyBiscuit
ff83bb025e
[CI skip] Merge pull request #2481 from MoKe12g/master 
Explosive tools not working with silk touch
 2021-01-26 10:02:25 +01:00
TheBusyBiscuit
1a9262983a
[CI skip] Added API label. 2021-01-26 09:38:15 +01:00
TheBusyBiscuit
2efaed804f
[CI skip] Merge pull request #2773 from Slimefun/gitlocalize-14867 
Update Japanese translation file.
 2021-01-26 09:35:42 +01:00
TheBusyBiscuit
26249e16fd
[CI skip] Merge pull request #2772 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.173
 2021-01-26 09:35:02 +01:00
Daniel Walsh
986eb38e81
Whoops forgot to change this one 2021-01-26 07:47:41 +00:00
Daniel Walsh
d0e0aa3c65
getStorage -> getRawStorage 2021-01-26 07:44:04 +00:00
Daniel Walsh
fd40737682
Oops 2021-01-26 07:40:37 +00:00
Daniel Walsh
6c7b8fd9da
Add a way to retrieve the raw storage 2021-01-26 07:30:42 +00:00
bito-blosh
177c67d25c Translate researches_ja.yml via GitLocalize 2021-01-26 04:15:47 +00:00
Renovate Bot
4ed7a401b9
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.173 2021-01-26 02:26:13 +00:00
TheBusyBiscuit
c2da6c5f53 Changed recipe for Tier 3 electric ore grinder 2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder 
Add Tier 3 Electric Ore Grinder
 2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00
TheBusyBiscuit
d78e82cf05
[CI skip] Removed trailing spaces 2021-01-25 18:47:15 +01:00
TheBusyBiscuit
e150444c24
[CI skip] Fixed alignment 2021-01-25 18:44:52 +01:00
TheBusyBiscuit
904cebeccb
[CI skip] Exclude our other actions from this one 2021-01-25 18:44:21 +01:00
TheBusyBiscuit
3994111a77
[CI skip] Updated workflow 2021-01-25 18:34:18 +01:00
TheBusyBiscuit
dd251fe29a
[CI skip] Test out automatic responses 2021-01-25 18:30:47 +01:00
TheBusyBiscuit
ea8642d313
[CI skip] Merge pull request #2627 from WalshyDev/feature/pr-labels 
Added PR labels
 2021-01-25 18:18:56 +01:00
Daniel Walsh
423125a888
Updated pr-labels to 1.1 2021-01-25 16:20:19 +00:00