mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
5,989 Commits 1 Branch 0 Tags 64 MiB
e47d0171cc
Commit Graph

1801 Commits

Author SHA1 Message Date
TheBusyBiscuit
e47d0171cc Fixes #2810 2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9e83b4af00 Fixes #2809 2021-02-06 20:23:32 +01:00
TheBusyBiscuit
7ddd0469eb Deprecated Automated Crafting Chamber (soon to be replaced) 2021-02-06 19:32:41 +01:00
TheBusyBiscuit
47743b632e Fixed an exception when disabled in an invalid environment. 2021-02-06 11:18:09 +01:00
TheBusyBiscuit
5edf61404b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-02-05 14:15:17 +01:00
TheBusyBiscuit
155b2fc637 Some small visual changes 2021-02-05 14:12:17 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java 2021-02-04 20:12:47 +01:00
Daniel Walsh
36639fd22c
Merge pull request #2791 from Slimefun/feature/componentify-versions-subcommand 2021-02-02 17:31:35 +00:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked 2021-02-02 17:30:45 +00:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar 
Allow Talismans to use the Actionbar
 2021-02-02 17:27:47 +00:00
Daniel Walsh
636d44cfb8
oops forgot 1 space 2021-02-02 12:25:43 +00:00
Daniel Walsh
498050dc81
Apply suggestions from code review 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-02-02 11:51:56 +00:00
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab Fixes #2794 2021-02-02 09:39:22 +01:00
Daniel Walsh
d41f276543
Lots more hover and click! 2021-02-01 17:14:21 +00:00
Daniel Walsh
e11929b587
Add java ver and hover to versions subcommand 2021-02-01 16:07:06 +00:00
TheBusyBiscuit
fe42f6fa9f Nether Wart Blocks can be turned into Nether Warts using a Grind Stone 2021-02-01 10:47:31 +01:00
TheBusyBiscuit
c78092bb85
[CI skip] Updated translators list 2021-01-31 00:27:14 +01:00
TheBusyBiscuit
b4d1894d8f
Merge pull request #2757 from StarWishsama/magician-talisman-fix 
Fixes #2679
 2021-01-29 16:34:53 +01:00
TheBusyBiscuit
a80269b7d9 [CI skip] Formatting 2021-01-29 12:19:40 +01:00
TheBusyBiscuit
24d0a87fe0
[CI skip] Updated translators list 2021-01-29 09:23:47 +01:00
Name1ess
d5d7bc705a
Merge branch 'master' into magician-talisman-fix 2021-01-29 12:14:39 +08:00
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
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
6df052e4cf Fixes #2771 2021-01-28 12:37:13 +01: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
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
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master 2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761 
Fixes #2761 probably
 2021-01-25 16:36:49 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list 2021-01-25 15:46:35 +01:00
Name1ess
f3fafabcff
Update TalismanListener.java 2021-01-25 20:10:35 +08:00
StarWishsama
a6bcab266f chore: remove register call when initialize 2021-01-25 12:18:24 +08:00
StarWishsama
decf9bd08c fix: grammar issue 2021-01-25 11:59:53 +08:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java 2021-01-24 20:23:30 +01:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00
StarWishsama
8302c0c932 fix: add missing judge in getRandomEnchantment 2021-01-24 11:01:42 +08:00
StarWishsama
9e49071161 feat: Add ItemSetting for magician talisman 
This setting can set whether books can be enchanted.
 2021-01-24 10:59:55 +08:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public 
Make RechargeableHelper public
 2021-01-23 16:11:29 +01:00