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

3761 Commits

Author SHA1 Message Date
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
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
Daniel Walsh
cb22ab7eb7
Remove old compat change 2021-06-03 12:33:00 +01:00
Riley
8cda831ba1 Did changes 2021-06-02 11:07:06 -05:00
Seggan
09f0f07db4 Add charcoal -> carbon recipe 2021-06-01 11:42:18 -04:00
Daniel Walsh
11b20b2744
Disable backwards compat by default
While we do have code which sets this to true if there is no data-storage dir there are many cases where that dir is copied however the config is not meaning it gets enabled.
2021-05-31 18:50:51 +01:00
Daniel Walsh
b73063ef7b
Update config.yml 2021-05-31 18:49:14 +01:00
TheBusyBiscuit
0224f94edf
Merge pull request #3096 from martinbrom/fix/auto-brewer
AutoBrewer fixes
2021-05-31 15:05:57 +02:00
Martin Brom
33340d0dd0
Apply suggestions from code review
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-05-31 10:32:56 +02:00
TheBusyBiscuit
d39a5c1ba2 Fixed #3086 2021-05-31 10:26:42 +02:00
Martin Brom
bd6efaf632 Fix AutoBrewer stripping redstone/glowstone modifiers when fermenting a potion
Resolves #3095
2021-05-31 10:08:58 +02:00
Martin Brom
87b0812c2e Fix IllegalArgumentException when trying to brew invalid potions
Resolves #3093
2021-05-31 10:08:58 +02:00
Martin Brom
d23f1265b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-05-30 13:49:43 +02:00
Martin Brom
cda2228a7d Fix IllegalArgumentException when ChestTerminal is requesting items
Resolves #3091
2021-05-30 13:20:09 +02:00
TheBusyBiscuit
cf362f7c7a Fixed #3087 2021-05-29 10:35:41 +02:00
TheBusyBiscuit
ab2049d1d2 Fixed #3088 2021-05-29 10:31:38 +02:00
TheBusyBiscuit
477cad5487 Fixed #3085 2021-05-29 00:40:32 +02:00
TheBusyBiscuit
76dda9a439 Fixed #3084 2021-05-29 00:21:37 +02:00
Jeffrey Kosse
990cc48feb did requested changes 2021-05-28 19:38:22 +02:00
Jeffrey Kosse
1b2d3e683e removed redundant formatter 2021-05-28 18:30:35 +02:00
Jeffrey Kosse
ab534dc4f4 did requested changes 2021-05-28 18:28:49 +02:00
J3fftw
ba4767ae05
Update ErrorReport.java 2021-05-28 18:24:28 +02:00