mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
6,242 Commits 1 Branch 0 Tags 64 MiB
50aaa08ccc
Commit Graph

4656 Commits

Author SHA1 Message Date
TheBusyBiscuit
3aa02d5e04 Added an option to disable block-gen optimizations for androids 2021-03-13 11:22:59 +01:00
TheBusyBiscuit
bc59731c38 Added a message when no chest was found 2021-03-13 11:03:57 +01:00
TheBusyBiscuit
a3ecde181e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-03-13 10:59:57 +01:00
TheBusyBiscuit
42146d8608 [CI skip] Fixed javadocs 2021-03-13 00:46:50 +01:00
TheBusyBiscuit
4aec2ffbcf Fixes #2878 2021-03-13 00:18:02 +01:00
TheBusyBiscuit
853f447337
Merge pull request #2859 from GallowsDove/master 
Added ExplosiveToolBreakBlockEvent
 2021-03-11 11:17:09 +01:00
Mooy1
048d4d6590 Update SlimefunStartupTask.java 2021-03-10 19:12:25 -06:00
Daniel Walsh
7a230d42c3
Merge pull request #2681 from Slimefun/features/multi-categories 2021-03-11 00:55:26 +00:00
Daniel Walsh
4b5ad219ec
Merge pull request #2328 from Slimefun/performance/cobblestone 
This totally wasn't sitting fully approved for 16 days 👀
 2021-03-11 00:52:41 +00:00
GallowsDove
305da7952d
did requested changes 2021-03-10 17:48:45 +01:00
TheBusyBiscuit
4678de1697 Fixes #2877 and added a new config option to crucibles 2021-03-10 14:04:33 +01:00
TheBusyBiscuit
86edb0df6a Fixes #2876 2021-03-10 13:36:28 +01:00
TheBusyBiscuit
5b99391a33 Better logging for exceptions in cargo network code 2021-03-10 12:15:37 +01:00
TheBusyBiscuit
0fa862314f Fixes #2856 2021-03-10 00:49:53 +01:00
TheBusyBiscuit
0be442bc07 Some refactoring 2021-03-10 00:44:20 +01:00
TheBusyBiscuit
bef0cfb413 Fixed #2861 2021-03-10 00:24:05 +01:00
TheBusyBiscuit
9cdab83db2
Merge branch 'master' into feature/auto-crafters 2021-03-09 17:00:21 +01:00
TheBusyBiscuit
0696991ab0 [CI skip] A lot of refactoring 2021-03-09 16:55:28 +01:00
TheBusyBiscuit
717e8c84a0 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
feature/auto-crafters

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
 2021-03-09 16:44:54 +01:00
Mooy1
f7be9289d9 Update SlimefunPlugin.java 2021-03-06 01:00:56 -06:00
Mooy1
4dcf8aabea fix addon inventories bug with non-default worlds 2021-03-06 00:55:12 -06:00
TheBusyBiscuit
d33dc965e0
Merge pull request #2827 from ProfElements/bookbinder-fixes 
Fix multiple Book Binder issues.
 2021-03-05 09:58:49 +01:00
GallowsDove
66db725ebc
forgot one thing, now it's ready. 2021-03-03 23:02:05 +01:00
GallowsDove
0518681887
Did requested changes 2021-03-03 19:56:14 +01:00
GallowsDove
3a7be26342
Added getExplosiveTool 2021-03-03 17:56:14 +01:00
GallowsDove
fe2492f006
Changed it into a single event instead of calling an event per block 2021-03-03 16:45:11 +01:00
GallowsDove
edf15fb40a
Added ExplosiveToolBreakBlockEvent triggered by an explosive tool breaking a block. 2021-03-03 16:23:14 +01:00
TheBusyBiscuit
8368194d94
[CI skip] Updated translators list 2021-03-03 14:21:19 +01:00
developer-pseudo
15fc388601 Translate categories_fi.yml via GitLocalize 2021-03-03 13:19:18 +00:00
Mooy1
c8fd79938b did walshys annotations 2021-03-02 00:04:37 -06:00
TheBusyBiscuit
49950cf64c Reduced technical debt 2021-03-01 14:07:20 +01:00
TheBusyBiscuit
15f4e838a8 Small improvements to logging 2021-03-01 13:55:57 +01:00
TheBusyBiscuit
8c1c67731b Fixes #2852 2021-03-01 09:31:59 +01:00
TheBusyBiscuit
51b56b1e0b Fixes #2851 2021-03-01 09:30:38 +01:00
ProfElements
9e01444b69 Make requested changes. Use Object.equals() instead of !=, make docs overall better 2021-02-27 18:23:35 -06:00
TheBusyBiscuit
84ad08be37 Fixes #2849 2021-02-27 10:19:19 +01:00
ProfElements
fb86415f31 Make requested changes. Fixed styling. 2021-02-26 15:07:47 -06:00
TheBusyBiscuit
c4be51f7bb Fixes #2839 2021-02-24 15:57:21 +01:00
TheBusyBiscuit
979bb4b5f4 Updated textures and names 2021-02-23 11:14:07 +01:00
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
ProfElements
c3349f8b4c Actually comment the file 2021-02-19 13:20:02 -06:00
ProfElements
0439a48a16 Make requested changes 2021-02-19 13:01:48 -06:00
CactusTheGuy
4096315e7d Translate categories_vi.yml via GitLocalize 2021-02-19 07:30:35 +00:00
ProfElements
c643a52b4e fix merge conflicts 2021-02-18 20:39:24 -06:00
ProfElements
92ed16473e Fix #2805, make sure the book binder doesnt kill overleveled enchantments 2021-02-18 20:26:41 -06:00
TheBusyBiscuit
c09773fcef
[CI skip] Manually sync czech translations 2021-02-13 13:10:45 +01:00
TheBusyBiscuit
c27eb2959a
[CI skip] Manually update dutch translations... 2021-02-12 20:09:19 +01:00
TheBusyBiscuit
ce643ad87f
Update Translators.java 2021-02-12 18:35:44 +01:00
peppower
40754d7da0 Translate categories_nl.yml via GitLocalize 2021-02-12 17:33:32 +00:00
Nikolay
eebaa069c9 Translate messages_bg.yml via GitLocalize 2021-02-12 16:08:55 +00: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
9a67c88ced Added Unit Tests for the actual crafting 2021-02-07 01:34:58 +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
dec868284d Updated dependencies 2021-02-06 11:11:58 +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
9f2d2ddd45
[CI skip] Re-enable MockBukkit-blocked test 2021-02-05 00:12:19 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java 2021-02-04 20:12:47 +01:00
LirCZE
a2c3e24a95 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:50 +00:00
100petr
e6a9511136 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:49 +00:00
jakmanda05
bbce73ce76 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:47 +00:00
100petr
c94add139b Translate categories_cs.yml via GitLocalize 2021-02-04 19:07:45 +00:00
Jan Vrska
405b553f0b Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:44 +00:00
frfole
08942610af Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:43 +00:00
100petr
4c16273097 Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:42 +00:00
Renzotom
4b4ef00ecb Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:41 +00:00
StarWishsama
b7fa8b621e fix: color text doesn't work 2021-02-03 12:45:55 +08:00
StarWishsama
bc3b61ed90 optimize: no need display enchant item 2021-02-03 12:43:20 +08:00
StarWishsama
f0d427a19c forget to return 2021-02-03 12:36:17 +08:00