1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

6243 Commits

Author SHA1 Message Date
TheBusyBiscuit
d33dc965e0
Merge pull request #2827 from ProfElements/bookbinder-fixes
Fix multiple Book Binder issues.
2021-03-05 09:58:49 +01:00
TheBusyBiscuit
3bef3b1e73 [CI skip] Updated changelog 2021-03-05 09:58:35 +01:00
TheBusyBiscuit
dc1be10b33 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-05 09:51:07 +01:00
TheBusyBiscuit
1315912081 [CI skip] Update mcMMO dependency and remove codemc repository 2021-03-05 09:51:03 +01:00
TheBusyBiscuit
7ff42c2568
[CI skip] Merge pull request #2863 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.31.0
2021-03-05 01:06:03 +01:00
Renovate Bot
16110b85cc
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.31.0 2021-03-04 23:48:55 +00: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
TheBusyBiscuit
6e09e6e4eb
[CI skip] Merge pull request #2858 from Slimefun/gitlocalize-15162
Updated finnish categories
2021-03-03 14:20:14 +01:00
developer-pseudo
15fc388601 Translate categories_fi.yml via GitLocalize 2021-03-03 13:19:18 +00:00
TheBusyBiscuit
e1ccdab16b
Merge pull request #2857 from Mooy1/features/multi-categories
Did walshys requested changes on multi category pr
2021-03-03 14:16:05 +01:00
TheBusyBiscuit
7d177cfcc7
[CI skip] Merge pull request #2854 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.28.0
2021-03-02 12:03:27 +01:00
Renovate Bot
6ac2c0e680
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.28.0 2021-03-02 09:56:32 +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
5b86755e99
[CI skip] Merge pull request #2853 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.27.0
2021-03-01 13:38:03 +01:00
Renovate Bot
3a21ea934f
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.27.0 2021-03-01 08:44:57 +00: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
TheBusyBiscuit
ed847826c7
[CI skip] Merge pull request #2848 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.175
2021-02-27 09:39:47 +01:00
TheBusyBiscuit
9d080495c3
[CI skip] Merge pull request #2847 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.25.0
2021-02-27 09:39:39 +01:00
Renovate Bot
38d5e7d0e5
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.175 2021-02-27 02:09:03 +00:00
Renovate Bot
37ed48e90d
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.25.0 2021-02-27 00:54:57 +00:00
ProfElements
fb86415f31 Make requested changes. Fixed styling. 2021-02-26 15:07:47 -06:00
TheBusyBiscuit
1f0e553c53
[CI skip] Merge pull request #2845 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.1
2021-02-26 21:26:37 +01:00
Renovate Bot
440872b70e
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.1 2021-02-26 20:11:21 +00:00
TheBusyBiscuit
90f5e9a0c9
[CI skip] 4k on discord. 2021-02-26 18:03:39 +01:00
TheBusyBiscuit
e139978755
[CI skip] Possibly fixed the pr labels workflow 2021-02-24 16:15:30 +01:00
TheBusyBiscuit
c4be51f7bb Fixes #2839 2021-02-24 15:57:21 +01:00
TheBusyBiscuit
af2b60cdf4
[CI skip] Updated dependencies again 2021-02-23 11:26:59 +01:00
TheBusyBiscuit
a19d9937ee
[CI skip] oops 👀 2021-02-23 11:25:52 +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
0d13e4bf54 [CI skip] Updated WorldEdit dependency 2021-02-23 11:10:09 +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
acde60a01b [CI skip] Updated changelog 2021-02-23 11:05:29 +01:00
TheBusyBiscuit
d73e96cff7 [CI skip] Updated changelog 2021-02-23 11:02:26 +01:00
Daniel Walsh
4ee8a0c752
[CI Skip] Merge pull request #2834 from Slimefun/renovate/org.mockito-mockito-core-3.x 2021-02-22 20:15:41 +00:00
Renovate Bot
65d426a21b
Update dependency org.mockito:mockito-core to v3.8.0 2021-02-22 20:12:15 +00: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
TheBusyBiscuit
fa11c9d54c
[CI skip] Merge pull request #2828 from Slimefun/gitlocalize-15006
Categories fix grammar
2021-02-22 13:07:02 +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