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

6989 Commits

Author SHA1 Message Date
TheBusyBiscuit
7fcb605d4d Encourage Java 16 on older versions 2021-06-17 10:53:38 +02:00
TheBusyBiscuit
80608b1e08
[CI skip] Merge pull request #3124 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.199
2021-06-16 13:55:51 +02:00
Renovate Bot
4d7936969f
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.199 2021-06-15 22:26:09 +00:00
TheBusyBiscuit
1d80d8f860
[CI skip] Merge pull request #3121 from Slimefun/fix/bug-report-template
1.17 exists now
2021-06-15 18:17:35 +02:00
Daniel Walsh
e36d09cbb6
1.17 exists now 2021-06-15 16:23:50 +01:00
Senne
919166cb80
Replace 1 water rune with nether star 2021-06-15 16:34:58 +02:00
Martin Brom
04e99e7e64 Change LimitedUseItem count to use setters instead
Fix annotations
2021-06-15 12:06:59 +02:00
Senne
0e851f7be5
Add trident recipe 2021-06-14 14:56:48 +02:00
Senne
7865ad92fc
Add diamond -> 24 coal conversion 2021-06-14 14:29:58 +02:00
Martin Brom
0cde52331e Add LimitedUseItem - base class for items with limited uses
Update StormStaff to extend LimitedUseItem
Add 'usesLeft' function to LoreBuilder
2021-06-13 13:27:38 +02:00
TheBusyBiscuit
59a548ef66
[CI skip] Make javadocs happy 2021-06-12 15:59:10 +02:00
TheBusyBiscuit
aa5a22cb16
Merge pull request #3112 from Slimefun/major/mc-1-17
WIP - 1.17 support
2021-06-12 12:09:18 +02:00
TheBusyBiscuit
1d052bda9c Some formatting 2021-06-12 00:31:42 +02:00
TheBusyBiscuit
7008e36e68 Added new spawn eggs 2021-06-12 00:29:26 +02:00
TheBusyBiscuit
d49e38905f Updated changelog 2021-06-12 00:25:39 +02:00
TheBusyBiscuit
15da49392a Updated ore tags 2021-06-12 00:21:31 +02:00
TheBusyBiscuit
59f5cfed0a
[CI skip] Merge pull request #3115 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.198
2021-06-11 23:37:24 +02:00
Renovate Bot
94675d6e85
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.198 2021-06-11 21:30:47 +00:00
TheBusyBiscuit
f35155ad35
[CI skip] Merge pull request #3114 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.0
2021-06-11 19:13:44 +02:00
Daniel Walsh
6b6883ca4e
Variable for minHeight 2021-06-11 16:10:26 +01:00
Daniel Walsh
8912ca1ea0
Improve loop in SeismicAxe 2021-06-11 15:58:38 +01:00
Renovate Bot
ff6c5ed1aa
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.0 2021-06-11 14:53:22 +00:00
Daniel Walsh
ea98a3e5a3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-06-11 15:36:51 +01:00
Daniel Walsh
36727688cc
REEEE 2021-06-11 15:32:28 +01:00
Daniel Walsh
2513b71e6f
Final changes 2021-06-11 15:30:20 +01:00
Daniel Walsh
ede931cdcd
Create WorldUtils 2021-06-11 13:41:19 +01:00
Daniel Walsh
1e1889b66d
Goats can produce milk 2021-06-11 13:33:21 +01:00
TheBusyBiscuit
5cb0ee091d
[CI skip] Merge pull request #3113 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.11.1
2021-06-11 13:32:17 +02:00
Renovate Bot
94e1bbbf8d
Update dependency org.mockito:mockito-core to v3.11.1 2021-06-11 11:05:27 +00:00
Daniel Walsh
196c5d4e97
Fix tag for 1.17 (maybe??) 2021-06-11 11:44:48 +01:00
Daniel Walsh
408468ce6a
Add min y to elevator and seismic axe 2021-06-11 11:37:04 +01:00
Daniel Walsh
d065951b9f
1.17 recipes provided by martin 2021-06-11 11:24:09 +01:00
Daniel Walsh
eb4c6aa22b
1.17 support 2021-06-11 11:19:43 +01:00
TheBusyBiscuit
6fade87d8d
[CI skip] Updated changelog 2021-06-07 08:45:04 +02:00
TheBusyBiscuit
2df3a4eb40
[CI skip] Merge pull request #3108 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.197
2021-06-07 08:44:34 +02:00
Daniel Walsh
27556f02b8
Merge pull request #3106 from martinbrom/fix/search-hidden-items
Hidden items are now not shown in the SlimefunGuide when using search
2021-06-07 06:54:58 +01:00
Renovate Bot
4ce91bc794
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.197 2021-06-07 04:30:44 +00:00
Martin Brom
f34cc35646 Hidden items are now not shown in the SlimefunGuide
Resolves #3105
2021-06-06 18:24:05 +02:00
TheBusyBiscuit
cc23211504 Added a startup warning for when CS-CoreLib is still installed 2021-06-06 11:49:44 +02:00
The Busy Bot
23c79c293a
[CI skip] New locale updates from Crowdin 2021-06-06 11:11:15 +02:00
TheBusyBiscuit
326a431151
Merge pull request #3102 from Slimefun/api/add-collectAverageTimings-for-timings
Add collectAverageTimings to SlimefunProfiler
2021-06-04 00:56:12 +02:00
Daniel Walsh
9696f8a22f
Requested changes 2021-06-03 22:35:18 +01:00
TheBusyBiscuit
448794fd74
Merge pull request #3077 from Mooy1/entity-hit-handler
Added WeaponUseHandler
2021-06-03 23:21:42 +02:00
TheBusyBiscuit
bc6ad46d5a
[CI skip] Updated changelog 2021-06-03 23:21:04 +02:00
Daniel Walsh
699be3584b
Correct message 2021-06-03 21:54:52 +01:00
Daniel Walsh
d6bcf17208
Add collectAverageTimings to SlimefunProfiler; 2021-06-03 21:26:39 +01:00
TheBusyBiscuit
5a1405014f [CI skip] Removed deprecated events and methods 2021-06-03 19:19:14 +02:00
TheBusyBiscuit
ce32681d1b
Merge pull request #3098 from Seggan/dev
Add charcoal -> coal recipe
2021-06-03 19:13:41 +02:00
TheBusyBiscuit
ee14c513ba
Merge pull request #3097 from Slimefun/chore/config-cleanup
Change config for consistency and improvement
2021-06-03 19:00:19 +02:00
TheBusyBiscuit
b7c6a431a5 [CI skip] Lock in RC-24 release date 2021-06-03 18:57:07 +02:00