mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
6,062 Commits 1 Branch 0 Tags 64 MiB
659f329349
Commit Graph

1857 Commits

Author SHA1 Message Date
TheBusyBiscuit
659f329349
Merge branch 'master' into feature/auto-crafters 2021-02-23 11:11:26 +01:00
TheBusyBiscuit
6533b5023c
Merge pull request #2830 from StarWishsama/fix/wood-cutter-duplication 
Fix duplicating woods when unable to replant
 2021-02-23 11:05:45 +01:00
TheBusyBiscuit
338fe0f84b
Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560 
Refactoring + Fixes to Block Handlers
 2021-02-22 18:34:19 +01:00
Name1ess
c854cb7788
fix: duplicating woods when unable to replant 2021-02-20 12:34:56 +08:00
TheBusyBiscuit
ce643ad87f
Update Translators.java 2021-02-12 18:35:44 +01:00
TheBusyBiscuit
2754703f9d
Merge branch 'master' into feature/auto-crafters 2021-02-10 18:34:34 +01:00
TheBusyBiscuit
854c3335e9 Fixes #2818 2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66 Fixes #2817 2021-02-09 17:08:49 +01:00
TheBusyBiscuit
b224123918 Fixes #2804 2021-02-07 18:26:08 +01:00
TheBusyBiscuit
d3f4ca4779 Proper error-handling for addon inventories 2021-02-07 16:06:06 +01:00
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
6e864ace99 Added researches and updated textures 2021-02-06 19:35:58 +01:00
TheBusyBiscuit
bbd631536d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-02-06 19:33:45 +01:00
TheBusyBiscuit
7ddd0469eb Deprecated Automated Crafting Chamber (soon to be replaced) 2021-02-06 19:32:41 +01:00
TheBusyBiscuit
e6494da8c9 Allow any RecipeType (in theory) 2021-02-06 14:00:56 +01:00
TheBusyBiscuit
a5a16621ee
Merge branch 'master' into feature/auto-crafters 2021-02-06 11:19:07 +01:00
TheBusyBiscuit
47743b632e Fixed an exception when disabled in an invalid environment. 2021-02-06 11:18:09 +01:00
TheBusyBiscuit
baa4f92ea1 Added documentation 2021-02-06 11:09:13 +01:00
TheBusyBiscuit
eeb89c3c3b Some very basic unit tests 2021-02-06 10:48:30 +01:00
TheBusyBiscuit
0adc1c3192 The Enhanced Auto Crafter now requires confirmation too 2021-02-06 01:55:54 +01:00
TheBusyBiscuit
e8a67cdd6a Many more fixes 2021-02-06 01:54:08 +01:00
TheBusyBiscuit
340005109b Even more fixes! 2021-02-06 01:14:23 +01:00
TheBusyBiscuit
1e9e8be82a More bug fixes 2021-02-06 01:06:11 +01:00
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