1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

6372 Commits

Author SHA1 Message Date
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
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
TheBusyBiscuit
6e4a1ccf5f [CI skip] Removed temporary redirects 2021-03-14 13:34:17 +01:00
StarWishsama
ba96617b2d
chore: change text to adapt specify machine 2021-03-14 18:29:16 +08:00
TheBusyBiscuit
51d0435718
Trigger another build...
Previous one failed due to some maven repository issues. This is always fun.
2021-03-14 11:28:52 +01:00
StarWishsama
8762958f6d
refactor: finish review 2021-03-14 18:27:50 +08:00
TheBusyBiscuit
e39c2b661c Fixes #2883 2021-03-14 11:02:47 +01:00
TheBusyBiscuit
2c2ba73500 Fixed unit test 2021-03-13 22:00:17 +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
02ce83544f
[CI skip] Merge pull request #2881 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.181
2021-03-13 10:46:12 +01:00
TheBusyBiscuit
e6093981b8
[CI skip] Merge pull request #2882 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.4
2021-03-13 10:45:53 +01:00
Renovate Bot
4b536b9d6d
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.4 2021-03-13 08:55:43 +00:00
Renovate Bot
7476285cb5
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.181 2021-03-13 02:10:04 +00:00
TheBusyBiscuit
42146d8608 [CI skip] Fixed javadocs 2021-03-13 00:46:50 +01:00