TheBusyBiscuit
|
ced7b5a697
|
[CI skip] Added more documentation
|
2021-03-22 19:49:00 +01:00 |
|
TheBusyBiscuit
|
02f7135805
|
[CI skip] Removed an unused class
|
2021-03-22 19:44:37 +01:00 |
|
TheBusyBiscuit
|
e3171b37dc
|
Merge branch 'chore/cleanup-deprecated-crafter'
|
2021-03-22 19:20:18 +01:00 |
|
TheBusyBiscuit
|
ef5d5140ee
|
[CI skip] Code cleanup
|
2021-03-22 19:19:53 +01:00 |
|
TheBusyBiscuit
|
e277732608
|
Fixes #2899
|
2021-03-22 15:43:20 +01:00 |
|
TheBusyBiscuit
|
c47f56ce47
|
Merge branch 'master' into api/machine-operations
|
2021-03-22 15:16:48 +01:00 |
|
Seggan
|
c1090b0fc8
|
Do changes
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-03-22 09:46:35 -04:00 |
|
Seggan
|
44eb7e7ebe
|
Fixed message
|
2021-03-22 09:20:46 -04:00 |
|
Daniel Walsh
|
f6d4d20090
|
[CI Skip] Merge pull request #2898 from svr333/AutoCrafterFollowUp
|
2021-03-22 12:35:55 +00:00 |
|
svr333
|
01a0bb7be1
|
Remove unnecessary spaces
|
2021-03-22 11:00:04 +01:00 |
|
svr333
|
a83cfcd5cc
|
Recommended changes
|
2021-03-22 10:58:55 +01:00 |
|
TheBusyBiscuit
|
0e238497d9
|
Improved error handling
|
2021-03-22 10:28:35 +01:00 |
|
TheBusyBiscuit
|
328f9d3331
|
[CI skip] Automated Crafting Chambers will no longer work.
|
2021-03-22 10:23:54 +01:00 |
|
TheBusyBiscuit
|
13355c1afe
|
Fixes #2896
|
2021-03-22 10:04:57 +01:00 |
|
svr333
|
cda38b13ec
|
Remove Whiteline
|
2021-03-22 01:46:24 +01:00 |
|
svr333
|
4067969229
|
More specific error messages
|
2021-03-22 01:45:38 +01:00 |
|
svr333
|
92b7c6118a
|
Be a maid
|
2021-03-22 01:41:11 +01:00 |
|
TheBusyBiscuit
|
001e7654aa
|
Fixed #2895
|
2021-03-21 20:06:46 +01:00 |
|
TheBusyBiscuit
|
0803529176
|
Merge pull request #2807 from Slimefun/feature/auto-crafters
Added Vanilla Auto-Crafter and Enhanced Auto-Crafter
|
2021-03-21 18:44:42 +01:00 |
|
TheBusyBiscuit
|
9aa3acde02
|
Merge branch 'master' into api/machine-operations
|
2021-03-21 15:31:50 +01:00 |
|
TheBusyBiscuit
|
9194dba115
|
[CI skip] Merge pull request #2894 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.1
|
2021-03-21 15:29:28 +01:00 |
|
Renovate Bot
|
048125c9d3
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.1
|
2021-03-21 13:32:08 +00:00 |
|
TheBusyBiscuit
|
068c121dae
|
[CI skip] Little cleanup and fixed javadocs
|
2021-03-21 10:31:37 +01:00 |
|
Daniel Walsh
|
b9a9793134
|
Merge pull request #2756 from StarWishsama/enchant-level-limit
|
2021-03-21 03:45:24 +00:00 |
|
TheBusyBiscuit
|
07572eb848
|
Merge pull request #2888 from NCBPFluffyBear/blockbreakhandler-fix
Allow onBlockBreak to be cancelled by BlockBreakHandler
|
2021-03-19 16:17:17 +01:00 |
|
TheBusyBiscuit
|
fbdf7acc50
|
Update src/main/resources/languages/messages_en.yml
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-03-19 15:49:52 +01:00 |
|
TheBusyBiscuit
|
6620f85433
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
|
2021-03-19 15:27:48 +01:00 |
|
TheBusyBiscuit
|
9f0e8ba6ed
|
[CI skip] Fixed javadocs
|
2021-03-19 14:47:43 +01:00 |
|
TheBusyBiscuit
|
c12229b25f
|
Removed deprecated hologram class
|
2021-03-19 13:05:34 +01:00 |
|
TheBusyBiscuit
|
8161b9ee6d
|
Fixed Enhanced Furnace not dropping any items when broken
|
2021-03-19 00:39:41 +01:00 |
|
TheBusyBiscuit
|
44dbb34d9a
|
Fixed #2887
|
2021-03-19 00:39:24 +01:00 |
|
NCBPFluffyBear
|
6fef1c8e67
|
Allow onBlockBreak to be cancelled by BlockBreakHandler
|
2021-03-17 14:09:22 -05:00 |
|
TheBusyBiscuit
|
a4521a2dd1
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-03-17 11:02:16 +01:00 |
|
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 |
|
TheBusyBiscuit
|
4531d2d142
|
[CI skip] Updated changelog
|
2021-03-17 10:53:30 +01:00 |
|
TheBusyBiscuit
|
9d3ea8075f
|
[CI skip] Merge pull request #2885 from svr333/AncientRuneOrderFix
Switch the last two items in Magical Items
|
2021-03-17 10:52:39 +01:00 |
|
TheBusyBiscuit
|
d6b5cc486b
|
[CI skip] Merge pull request #2886 from Slimefun/renovate/hmarr-auto-approve-action-2.x
Update hmarr/auto-approve-action action to v2.1.0
|
2021-03-17 10:50:26 +01:00 |
|
Renovate Bot
|
440aa5db7d
|
Update hmarr/auto-approve-action action to v2.1.0
|
2021-03-16 23:10:04 +00:00 |
|
Name1ess
|
22f6503184
|
fix: grammar error
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
|
2021-03-16 09:16:09 +08:00 |
|
svr333
|
a8f53714b0
|
Switcheroo
|
2021-03-15 22:09:22 +01:00 |
|
TheBusyBiscuit
|
c2b3053574
|
[CI skip] Added warning message when registering Item Handlers twice.
|
2021-03-14 19:57:33 +01:00 |
|
TheBusyBiscuit
|
7ba3a0b7fa
|
[CI skip] Converted more blocks to the new BlockBreakHandler
|
2021-03-14 19:45:40 +01:00 |
|
StarWishsama
|
102e22c636
|
chore: resolve merge conflict
|
2021-03-14 21:40:14 +08:00 |
|
StarWishsama
|
322b55c9a4
|
Merge remote-tracking branch 'upstream/master' into enchant-level-limit
|
2021-03-14 21:34:51 +08:00 |
|
TheBusyBiscuit
|
79e40e1480
|
Pulled latest changes from 'master'
|
2021-03-14 14:30:19 +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 |
|