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
|
72bd02b833
|
Removed ChestTerminal support
|
2022-01-15 16:55:12 +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 |
|
qwertyuioplkjhgfd
|
c038e1ffc3
|
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
|
2022-01-12 23:38:15 +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 |
|
Renovate Bot
|
6345149759
|
Update dependency com.konghq:unirest-java to v3.13.6
|
2022-01-07 10:15:16 +00:00 |
|
TheBusyBiscuit
|
59027cec57
|
[CI skip] Updated README
|
2022-01-06 16:12:53 +01:00 |
|
TheBusyBiscuit
|
5827ff280b
|
[CI skip] Merge pull request #3407 from Slimefun/renovate/net.imprex-orebfuscator-api-5.x
Update dependency net.imprex:orebfuscator-api to v5.2.3
|
2022-01-05 20:45:32 +01:00 |
|
Renovate Bot
|
fe9a512ce6
|
Update dependency net.imprex:orebfuscator-api to v5.2.3
|
2022-01-05 10:28:40 +00:00 |
|
qwertyuioplkjhgfd
|
72d9e1edd4
|
Merge remote-tracking branch 'upstream/master' into register-filled-flask
# Conflicts:
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
|
2022-01-03 18:27:35 -08:00 |
|
TheBusyBiscuit
|
5c1dda32a4
|
[CI skip] Some unit test changes
|
2022-01-04 01:30:21 +01:00 |
|
svr333
|
7f8ef8be84
|
Minor tweaks
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2022-01-02 15:17:45 +01:00 |
|
TheBusyBiscuit
|
eac32ac94c
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2022-01-02 12:51:38 +01:00 |
|
TheBusyBiscuit
|
f2f3a6c719
|
Fixed unit test
|
2022-01-02 12:51:30 +01:00 |
|
TheBusyBiscuit
|
730f2676b3
|
Merge pull request #3401 from variananora/feature/add-fuel-to-bio-reactor
Add fuel types to BioGenerator
|
2022-01-02 12:48:06 +01:00 |
|
TheBusyBiscuit
|
03a40c0455
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2022-01-02 12:47:38 +01:00 |
|
TheBusyBiscuit
|
3d87cb3df1
|
Fixed #3400
|
2022-01-02 12:47:22 +01:00 |
|
Varian Anora
|
9703016ae2
|
Added 1.17 items and blocks
|
2022-01-02 18:31:46 +07:00 |
|
Varian Anora
|
311d600095
|
Add fuel types to BioGenerator
|
2022-01-02 18:02:52 +07:00 |
|
Senne
|
ef8e84a350
|
Invert if statement
|
2022-01-01 22:48:16 +01:00 |
|