TheBusyBiscuit
|
320ee27b3d
|
Merge branch 'master' into feature/auto-crafters
|
2021-03-17 10:54:37 +01:00 |
|
TheBusyBiscuit
|
714df364a6
|
Merge pull request #2866 from Mooy1/master
Fix addon blockmenu loading with custom worlds
|
2021-03-17 10:54:03 +01:00 |
|
svr333
|
a8f53714b0
|
Switcheroo
|
2021-03-15 22:09:22 +01:00 |
|
TheBusyBiscuit
|
7ba3a0b7fa
|
[CI skip] Converted more blocks to the new BlockBreakHandler
|
2021-03-14 19:45:40 +01:00 |
|
TheBusyBiscuit
|
aa349ccd0f
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
|
2021-03-14 14:29:30 +01:00 |
|
TheBusyBiscuit
|
f91bd21da1
|
Delete AutoEnchanter.java
|
2021-03-14 14:28:33 +01:00 |
|
TheBusyBiscuit
|
8c8577ad92
|
Delete AutoDisenchanter.java
|
2021-03-14 14:28:25 +01:00 |
|
TheBusyBiscuit
|
da01091e26
|
[CI skip] Removed deprecated methods from item settings
|
2021-03-14 13:36:25 +01:00 |
|
TheBusyBiscuit
|
6e4a1ccf5f
|
[CI skip] Removed temporary redirects
|
2021-03-14 13:34:17 +01:00 |
|
TheBusyBiscuit
|
e39c2b661c
|
Fixes #2883
|
2021-03-14 11:02:47 +01:00 |
|
TheBusyBiscuit
|
fbd701bced
|
Fixed Mining Androids and improved itemsettings API
|
2021-03-13 21:56:54 +01:00 |
|
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 |
|
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 |
|