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

3781 Commits

Author SHA1 Message Date
TheBusyBiscuit
51bfbbd653
Merge pull request #3119 from svr333/AddTridentCrafting
Add Trident recipe
2021-06-30 23:35:12 +02:00
TheBusyBiscuit
25dea3daf6 Fixed #2966
This fix was salvaged from PR #2968
2021-06-26 00:21:01 +02:00
TheBusyBiscuit
b9f64bdebc Deepslate ores can now be doubled using an Ore Crusher 2021-06-26 00:05:43 +02:00
TheBusyBiscuit
65142d1204 [CI skip] Some code cleanup 2021-06-26 00:02:43 +02:00
TheBusyBiscuit
f5b5fc2f4e
Merge pull request #3118 from svr333/AddDiamondGrinding
Add diamond -> coal conversion
2021-06-25 19:16:13 +02:00
TheBusyBiscuit
10764555d3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 2021-06-25 19:12:23 +02:00
svr333
037747983c
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java
Co-authored-by: Semisol <git@smileycreations15.com>
2021-06-23 10:26:29 +02:00
Senne
7ed4441849
Add subconversion 2021-06-21 20:03:45 +02:00
Senne
60b803c64c
Make trident recipe expensive 2021-06-21 19:54:05 +02:00
TheBusyBiscuit
57f7553f74
Merge pull request #3126 from Slimefun/chore/recommend-java-16
Encourage Java 16 on older versions
2021-06-21 14:30:10 +02:00
EpicPlayerA10
fe9cdb3a77
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-06-18 17:24:17 +02:00
EpicPlayerA10
e14c63ce76 Add a freeze effect on the icy bow 2021-06-18 17:14:36 +02:00
EpicPlayerA10
31d0589733 Add a freeze effect on the icy bow 2021-06-18 17:14:21 +02:00
EpicPlayerA10
55d8d9fdcd Add a freeze effect on the icy bow 2021-06-18 17:13:21 +02:00
BuildTools
1c4d2db8ec Add a freeze effect on the icy bow 2021-06-18 16:59:51 +02:00
TheBusyBiscuit
96574bed6f Fixes #3116 2021-06-18 15:09:03 +02:00
TheBusyBiscuit
805c2eafcc Added a new feature to the debug fish
SlimefunTag support
2021-06-18 15:08:24 +02:00
TheBusyBiscuit
069896ff66
Switch to WARNING 2021-06-17 11:21:28 +02:00
TheBusyBiscuit
7fcb605d4d Encourage Java 16 on older versions 2021-06-17 10:53:38 +02:00
Senne
919166cb80
Replace 1 water rune with nether star 2021-06-15 16:34:58 +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
TheBusyBiscuit
59a548ef66
[CI skip] Make javadocs happy 2021-06-12 15:59:10 +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
15da49392a Updated ore tags 2021-06-12 00:21:31 +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
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
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
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
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
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
TheBusyBiscuit
6071e1b952 [CI skip] Updated style preferences in contributing.md 2021-06-03 18:38:39 +02:00
Daniel Walsh
8de85ac315
Simplified 2021-06-03 15:24:14 +01:00