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

7874 Commits

Author SHA1 Message Date
TheBusyBiscuit
27847a6396 Fixed #3664 (again, I hope) 2022-10-18 15:24:58 +02:00
renovate[bot]
05d97c2afb
[CI skip] Update ibiqlik/action-yamllint action to v3.1.1 2022-10-17 13:20:04 +02:00
renovate[bot]
7c44e63e0b
[CI skip] Update hmarr/auto-approve-action action to v3 2022-10-17 13:19:51 +02:00
renovate[bot]
4b6dc01cd7
[CI skip] Update thollander/actions-comment-pull-request action to v1.5.0 2022-10-17 13:19:40 +02:00
renovate[bot]
475b27b48c
[CI skip] Update actions/checkout action to v3.1.0 2022-10-04 12:42:09 +02:00
TheBusyBiscuit
7b9d769bab
Merge pull request #3678 from J3fftw1/fix-3577
fixed 3677
2022-10-04 10:47:03 +02:00
TheBusyBiscuit
485d212a1e
[CI skip] Updated changelog 2022-10-04 10:46:51 +02:00
Jeffrey Kosse
61f549260f forgot to change json name 2022-10-01 19:10:27 +02:00
Jeffrey Kosse
64c8dd571a changed tag name 2022-10-01 19:04:09 +02:00
Jeffrey Kosse
b516e69e5c added mangrove tag 2022-09-30 21:58:40 +02:00
Jeffrey Kosse
501c7ba85a whoops 2022-09-30 20:56:13 +02:00
Jeffrey Kosse
317a92bd69 fix 3577 2022-09-30 20:54:33 +02:00
ybw0014
030b7ff5c4
Merge remote-tracking branch 'upstream/master' into chore/drop-low-version
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
2022-09-29 12:13:42 -04:00
TheBusyBiscuit
5455fb08ec
Merge pull request #3594 from TheWireLord/master
Added Glow Berries Being Useful
2022-09-29 17:59:02 +02:00
TheBusyBiscuit
477a0552c0
[CI skip] Updated changelog 2022-09-29 17:58:46 +02:00
renovate[bot]
aa8d823632
[CI skip] Update dependency com.konghq:unirest-java to v3.13.11 2022-09-29 17:49:33 +02:00
TheWireLord
9f01ec03b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-09-29 08:02:51 -04:00
TheBusyBiscuit
fd00771222
Merge pull request #3363 from qwertyuioplkjhgfd/register-filled-flask
Register filled flask as a Slimefun Item
2022-09-29 13:50:54 +02:00
renovate[bot]
9ef5f991c2
[CI skip] Update actions/setup-java action to v3.5.1 2022-09-29 13:50:40 +02:00
TheBusyBiscuit
62c7324e6d
Merge pull request #3500 from J3fftw1/feature/freezer-3
added freezer 3
2022-09-29 13:38:55 +02:00
TheBusyBiscuit
636008dcb3 Removed research for the Hercules Pickaxe 2022-09-29 13:38:41 +02:00
TheBusyBiscuit
73db0212d9 Fixed #3651 2022-09-29 13:05:16 +02:00
TheBusyBiscuit
f9f3b3ddf9 Resolved #3455 and removed the Hercules Pickaxe 2022-09-29 13:04:31 +02:00
TheBusyBiscuit
497a4af1c5 Fixed #3664 2022-09-29 12:39:40 +02:00
renovate[bot]
ea029439ce
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.3-r8 2022-09-29 12:11:39 +02:00
renovate[bot]
7a8d85453d
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.1 2022-09-21 17:35:31 +02:00
TheBusyBiscuit
1dcc4bdd3f
Merge pull request #3652 from Speebr0/master
"Fixing" Dust Order
2022-09-19 03:04:17 +02:00
renovate[bot]
8ecb91c7eb
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 2022-09-19 03:03:19 +02:00
The Busy Bot
5af46611a2
[CI skip] New locale updates from Crowdin 2022-09-18 14:17:52 +02:00
renovate[bot]
e0017850b7
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.3.0 2022-09-18 13:54:48 +02:00
renovate[bot]
fd12df83d5
[CI skip] Update dependency org.mockito:mockito-core to v4.8.0 2022-09-18 13:53:45 +02:00
renovate[bot]
90ddf88a68
[CI skip] Update hmarr/auto-approve-action action to v2.4.0 2022-08-21 12:32:46 +02:00
renovate[bot]
447e81f573
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.1 2022-08-18 12:38:37 +02:00
renovate[bot]
1a3b2e56ea
[CI skip] Update dependency org.mockito:mockito-core to v4.7.0 2022-08-13 20:14:17 +02:00
The Busy Bot
0b6a81aa4d
[CI skip] New locale updates from Crowdin 2022-08-13 19:29:15 +02:00
Speebr0
c71722a3ff
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
Dunno what it actually does, seems to remove empty space in line 534

Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2022-08-12 16:03:40 -07:00
Speebr0
70cfb0dea1
"Fixing" Dust Order
Literally just put the silver dust before the lead dust, just like the silver ingot is before the lead ingot in the guide, a dumb, small issue that was bugging me.
2022-08-12 02:05:53 -07:00
The Busy Bot
b1aae439f3
[CI skip] New locale updates from Crowdin 2022-08-08 21:12:50 +02:00
TheBusyBiscuit
96c873bda7
Merge pull request #3643 from JustAHuman-xD/fix-rune-lore
Remove "Burst"  & "Custom" from Lore
2022-08-08 20:22:44 +02:00
renovate[bot]
b407c248d2
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.217 2022-08-08 14:18:13 +02:00
renovate[bot]
75a684f614
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.12 2022-08-08 14:18:11 +02:00
renovate[bot]
f783fc7e95
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.12 2022-08-08 14:18:05 +02:00
ybw0014
076c55c696
Remove unused imports 2022-08-07 22:41:56 -04:00
ybw0014
aa79e640e8
Change GEO resource versions 2022-08-07 20:59:54 -04:00
ybw0014
fd74586e23
Remove unused imports 2022-08-07 20:58:25 -04:00
ybw0014
af897d5df7
Fix test 2022-08-07 18:41:23 -04:00
ybw0014
435f09b6b1
Remove more version specific stuff 2022-08-07 17:46:28 -04:00
ybw0014
eb5d4ca3f7
Fix test compile 2022-08-07 16:54:18 -04:00
ybw0014
dcc13a8f9a
Remove 1.14 & 1.15 from MinecraftVersion 2022-08-07 16:41:36 -04:00
ybw0014
5cd5f26c91
Drop support for 1.14 and 1.15 2022-08-07 16:15:17 -04:00