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
|
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
|
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
|
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
|
0f54140f64
|
Renamed to ProcessHolder
|
2021-03-13 17:43:43 +01:00 |
|
TheBusyBiscuit
|
79a73d8e26
|
Some documentation and refactoring
|
2021-03-13 17:40:09 +01:00 |
|
TheBusyBiscuit
|
44a6d15d18
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
api/machine-operations
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
|
2021-03-13 17:36:55 +01:00 |
|
TheBusyBiscuit
|
3aa02d5e04
|
Added an option to disable block-gen optimizations for androids
|
2021-03-13 11:22:59 +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 |
|
TheBusyBiscuit
|
4aec2ffbcf
|
Fixes #2878
|
2021-03-13 00:18:02 +01:00 |
|
Daniel Walsh
|
76cb7434dc
|
[ci skip] Merge pull request #2880 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
|
2021-03-12 00:47:00 +00:00 |
|
Renovate Bot
|
125d488f34
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.180
|
2021-03-12 00:36:44 +00:00 |
|
TheBusyBiscuit
|
75ffc0437f
|
[CI skip] Merge pull request #2879 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.2.1
|
2021-03-11 20:22:36 +01:00 |
|
Renovate Bot
|
5203424bd2
|
Update dependency com.github.LoneDev6:itemsadder-api to v2.2.1
|
2021-03-11 18:58:32 +00:00 |
|
TheBusyBiscuit
|
853f447337
|
Merge pull request #2859 from GallowsDove/master
Added ExplosiveToolBreakBlockEvent
|
2021-03-11 11:17:09 +01:00 |
|
TheBusyBiscuit
|
5d4412d3cd
|
[CI skip] Updated changelog
|
2021-03-11 11:15:23 +01:00 |
|
TheBusyBiscuit
|
f0b5e8463f
|
[CI skip] Updated changelog
|
2021-03-11 02:22:02 +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 |
|