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

7562 Commits

Author SHA1 Message Date
StarWishsama
ae18ec1114
chore(guide): don't display item that its itemGroup not be unlocked 2022-01-28 18:39:14 +08:00
TheBusyBiscuit
a34c4696fd
[CI skip] Merge pull request #3442 from Slimefun/renovate/mockito-monorepo
Update dependency org.mockito:mockito-core to v4.3.1
2022-01-27 11:00:31 +01:00
Renovate Bot
d7d794e0b5
Update dependency org.mockito:mockito-core to v4.3.1 2022-01-26 09:40:00 +00:00
TheBusyBiscuit
1d67056568
[CI skip] Merge pull request #3440 from Slimefun/renovate/mockito-monorepo
Update dependency org.mockito:mockito-core to v4.3.0
2022-01-25 19:07:30 +01:00
Renovate Bot
272f7b311c
Update dependency org.mockito:mockito-core to v4.3.0 2022-01-24 15:36:21 +00:00
TheBusyBiscuit
928e1f4340
[CI skip] Merge pull request #3435 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.5
2022-01-21 13:48:01 +01:00
Renovate Bot
b0faaf4895
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.5 2022-01-21 08:07:27 +00:00
The Busy Bot
d38dd0d992
[CI skip] New locale updates from Crowdin 2022-01-20 19:29:28 +01:00
Senne
e02e089b7f
Add ParamsAreNonNullByDefault 2022-01-19 17:37:48 +01:00
Senne
0a8aff0695
Merge branch 'master' into AddMiddleClickSupport 2022-01-18 22:01:23 +01:00
TheBusyBiscuit
dd16b7c84c [CI skip] Fixed javadocs 2022-01-18 20:03:52 +01:00
TheBusyBiscuit
e02eedd940
Merge pull request #3275 from Sfiguz7/fix/itemsadder_cargo_stacking
Fixes #3133
2022-01-18 17:52:08 +01:00
TheBusyBiscuit
0eb239d5b9
[CI skip] Updated changelog 2022-01-18 17:49:51 +01:00
Daniel Walsh
3ac8cadbc1
Fix multi-line comment 2022-01-18 14:02:50 +00:00
The Busy Bot
0a1724b63e
[CI skip] New locale updates from Crowdin 2022-01-18 13:31:11 +01:00
TheBusyBiscuit
4b68892d7e
Merge pull request #3431 from Slimefun/chore/update-dough
Update dough
2022-01-18 12:08:02 +01:00
Daniel Walsh
ee019cda44
Fixed changelog 2022-01-17 11:46:03 +00:00
Daniel Walsh
220cfc9058
Update dough 2022-01-16 16:54:19 +00:00
TheBusyBiscuit
0a94854629
[CI skip] Merge pull request #3415 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5
2022-01-16 15:13:00 +01:00
TheBusyBiscuit
eff4bf133d Fixed unit tests 2022-01-16 15:05:01 +01:00
TheBusyBiscuit
014f832347 Fixed #3429 2022-01-16 15:02:05 +01:00
TheBusyBiscuit
e8f2a5fc49 [CI skip] Uninitialized ItemSettings will now cause test failures 2022-01-16 14:57:27 +01:00
Renovate Bot
e545817f5c
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5 2022-01-16 13:25:23 +00:00
TheBusyBiscuit
c1074faeb2 Added PlayerProfile#hasUnlockedEverything()
and also updated all workflows to JDK 17
2022-01-16 14:17:50 +01:00
TheBusyBiscuit
6ec11e17ef
Merge pull request #3428 from J3fftw1/feature/VanillaTransformationIceInFreezer
Added vanilla ratios to the freezer
2022-01-15 22:49:24 +01:00
TheBusyBiscuit
5a1f765626
[CI skip] Updated changelog 2022-01-15 22:48:59 +01:00
J3fftw
4f2900045a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2022-01-15 22:29:22 +01:00
J3fftw
5af5fbf973
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-01-15 18:48:22 +01:00
Jeffrey Kosse
fb3f76e9eb did requested changes 2022-01-15 18:40:39 +01:00
Jeffrey Kosse
155feede96 you are a dog 2022-01-15 18:10:56 +01:00
Jeffrey Kosse
2e94b101ae formatting where? 2022-01-15 18:09:05 +01:00
Jeffrey Kosse
e38a6bf80b formatting where? 2022-01-15 18:08:22 +01:00
Jeffrey Kosse
0d80b295ff fixed imports 2022-01-15 17:57:26 +01:00
Jeffrey Kosse
4aaa6db05f added vanilla transformation to ice 2022-01-15 17:56:18 +01:00
TheBusyBiscuit
d1df35dafa
[CI skip] Updated changelog 2022-01-15 17:38:01 +01:00
Daniel Walsh
7054b50e43
[CI Skip] Merge pull request #3425 from poma123/api/biome-map-parser 2022-01-15 16:36:33 +00:00
poma123
2bc0313b2a Added a new fromJson method with isLenient parameter 2022-01-15 17:19:50 +01:00
TheBusyBiscuit
a82e362dd8
[CI skip] Merge pull request #3424 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.209
2022-01-15 12:23:34 +01:00
Renovate Bot
b402d841bd
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.209 2022-01-15 09:12:54 +00:00
TheBusyBiscuit
1f1232716a
[CI skip] Merge pull request #3423 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.4
2022-01-14 13:06:45 +01:00
poma123
ecdf4f939c Made BiomeMapParser public 2022-01-14 12:13:21 +01:00
Renovate Bot
40d02676e3
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.4 2022-01-14 09:19:00 +00:00
Senne
fc8ffabbcf
Switch to sfItem.isItem() 2022-01-12 22:23:19 +01:00
TheBusyBiscuit
e6786b4023
[CI skip] Merge pull request #3419 from Slimefun/renovate/org.apache.maven.plugins-maven-compiler-plugin-3.x
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.9.0
2022-01-12 17:00:40 +01:00
Renovate Bot
ff94add4c6
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.9.0 2022-01-12 15:59:37 +00:00
TheBusyBiscuit
fdf27bb207
[CI skip] Merge pull request #3416 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.208
2022-01-11 12:48:01 +01:00
Renovate Bot
96cd2a24bb
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.208 2022-01-11 08:23:09 +00:00
TheBusyBiscuit
35e8f04f13
[CI skip] Merge pull request #3410 from Slimefun/renovate/net.imprex-orebfuscator-api-5.x
Update dependency net.imprex:orebfuscator-api to v5.2.4
2022-01-07 16:19:13 +01:00
TheBusyBiscuit
8b08c8496a
[CI skip] Merge pull request #3409 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.13.6
2022-01-07 16:19:05 +01:00
Renovate Bot
9fd1191a45
Update dependency net.imprex:orebfuscator-api to v5.2.4 2022-01-07 10:15:20 +00:00