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

7467 Commits

Author SHA1 Message Date
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
Senne
e40f7996bf
Clean up equalsItemMeta() 2021-06-09 12:36:48 +02: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
96ec2ba1f6 FlexCategories can now be made visible in CheatSheetSlimefunGuide 2021-06-06 20:31:24 +02: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
TheBusyBiscuit
5f8bd1b909 [Ci skip] Fixed typo from before 2021-06-03 18:42:53 +02:00
TheBusyBiscuit
6ae9f6a31e [CI skip] Updated contributing.md again 2021-06-03 18:42:31 +02:00
TheBusyBiscuit
6071e1b952 [CI skip] Updated style preferences in contributing.md 2021-06-03 18:38:39 +02:00
TheBusyBiscuit
67c0534bcb
[CI skip] Merge pull request #3101 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.11.0
2021-06-03 18:19:17 +02:00
Renovate Bot
8e18548ff7
Update dependency org.mockito:mockito-core to v3.11.0 2021-06-03 15:11:57 +00: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
TheBusyBiscuit
5a327be4ce
[CI skip] Updated changelog 2021-05-31 15:05:45 +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
Daniel Walsh
cccf6a1bb7
Merge pull request #3092 from martinbrom/fix/terminal-exception 2021-05-30 14:29:16 +01: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
TheBusyBiscuit
343f47bdb6
Merge pull request #3083 from J3fftw1/feature/added-time_date-to-error-report
added time and date to error report
2021-05-29 00:16:05 +02:00