1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

1813 Commits

Author SHA1 Message Date
TheBusyBiscuit
dd9a04fe04 Restored old classes and added deprecation warnings 2021-02-06 01:02:31 +01:00
TheBusyBiscuit
83aa84ca3b Some bug fixes 2021-02-06 00:58:29 +01:00
TheBusyBiscuit
057fad1f08 Finished Auto-Crafters 2021-02-06 00:46:55 +01:00
TheBusyBiscuit
2d050a8e35 RecipeChoice task is now thread-safe 2021-02-06 00:29:57 +01:00
TheBusyBiscuit
a25b470272 Added sounds and two more messages 2021-02-06 00:14:44 +01:00
TheBusyBiscuit
3567dd87ba Show recipe after selecting 2021-02-05 20:03:06 +01:00
TheBusyBiscuit
53ac633927 Split up recipe classes 2021-02-05 19:53:48 +01:00
TheBusyBiscuit
7d50d0eb32 Fixes #1161 2021-02-05 18:40:41 +01:00
TheBusyBiscuit
7ff6d755e8 Implemented basic behaviour 2021-02-05 17:26:03 +01:00
TheBusyBiscuit
6b4fe8a7a9 Added Enhanced Auto Crafter 2021-02-05 15:14:09 +01:00
TheBusyBiscuit
a7e890829d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-02-05 14:16:47 +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
TheBusyBiscuit
581199271c Almost done with the vanilla auto crafter 2021-02-02 20:27:04 +01:00
TheBusyBiscuit
2c22983f0a Added package descriptions 2021-02-02 19:38:01 +01:00
TheBusyBiscuit
0bf27fca15 Refactoring 2021-02-02 19:36:00 +01:00
TheBusyBiscuit
0aa5a999d4 Created abstract auto crafter framework 2021-02-02 18:57:45 +01:00
TheBusyBiscuit
5a0a52baab Sweet deprecation warnings 2021-02-02 18:57:29 +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