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

7668 Commits

Author SHA1 Message Date
renovate[bot]
6d62d0e9a4
[CI skip] Update actions/checkout action to v3.0.2 2022-04-23 13:14:17 +02:00
craftish37
76444df8f5
Formatting
Co-authored-by: Varian Anora <variananora@outlook.com>
2022-04-22 16:31:27 +02:00
craftish37
1a5c3f024f Forgot to use my damn brain
(Also added Seagrass Fertilizer)
2022-04-22 16:02:21 +02:00
craftish37
3021a8efa9
Added Seagrass recipe (suggestion #398 from Mr.Moules) 2022-04-22 15:19:38 +02:00
itslukemango
7f70570260
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-04-22 12:11:27 +01:00
itslukemango
28445203f2
Merge branch 'Slimefun:master' into master 2022-04-20 23:14:21 +01:00
renovate[bot]
0a3508529c
[CI skip] Update dependency org.mockito:mockito-core to v4.5.0 2022-04-21 00:08:36 +02:00
=
ec79423123 Fix Arithmetic Error 2022-04-20 22:45:04 +01:00
TheBusyBiscuit
217196c137 Fixed #3534 2022-04-19 20:51:13 +02:00
renovate[bot]
5d093822de
[CI skip] Update dependency com.konghq:unirest-java to v3.13.8 2022-04-19 19:23:40 +02:00
renovate[bot]
b5e2b2160c
[CI skip] Update actions/checkout action to v3.0.1 2022-04-19 19:23:17 +02:00
renovate[bot]
c4317a23a0
[CI skip] Update actions/setup-java action to v3.1.1 2022-04-12 09:52:07 +02:00
TheBusyBiscuit
429ff50624 Fixed #3504 2022-04-08 18:02:45 +02:00
renovate[bot]
92317c1e84
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.0b 2022-04-08 16:49:33 +02:00
renovate[bot]
d375766139
[CI skip] Update hmarr/auto-approve-action action to v2.2.1 2022-04-08 16:49:22 +02:00
renovate[bot]
e198135cf6
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.8 2022-04-08 16:49:08 +02:00
renovate[bot]
7f656a1b0d
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M6 2022-04-08 16:48:55 +02:00
renovate[bot]
f805e3dc49
[CI skip] Update hmarr/auto-approve-action action to v2.2.0 2022-04-03 21:16:59 +02:00
renovate[bot]
91f46d483b
[CI skip] Update pascalgn/automerge-action action to v0.15.2 2022-04-01 14:20:14 +02:00
renovate[bot]
77b2618ad7
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.0.5 2022-04-01 14:19:47 +02:00
renovate[bot]
47cb2ce4fd
[CI skip] Update actions/cache action to v3 2022-04-01 14:19:18 +02:00
renovate[bot]
89eaaffcf2
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.3.0 2022-04-01 14:18:48 +02:00
renovate[bot]
ae8574f385
[CI skip] Update actions/setup-java action to v3.1.0 2022-04-01 14:18:10 +02:00
TheBusyBiscuit
020094e04e Fixed unit tests 2022-03-20 11:38:20 +01:00
TheBusyBiscuit
d3cf518f74 Refactored ItemGroups 2022-03-20 11:21:27 +01:00
TheBusyBiscuit
9139fffa7c
[CI skip] Merge pull request #3496 from haiman233/master
Add candle to ColoredMaterial
2022-03-20 01:29:20 +01:00
renovate[bot]
e52a9435c2
[CI skip] Update thollander/actions-comment-pull-request action to v1.1.0 2022-03-20 00:37:06 +01:00
renovate[bot]
67be314df1
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.211 2022-03-20 00:36:29 +01:00
TheBusyBiscuit
f36c8217a7
[CI skip] Merge pull request #3497 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.13.7
2022-03-16 16:40:30 +01:00
Renovate Bot
fa896a1f29
Update dependency com.konghq:unirest-java to v3.13.7 2022-03-16 15:00:32 +00:00
haiman
d31275c9ca
Update ColoredMaterial.java 2022-03-16 07:41:05 +08:00
renovate[bot]
6ac9d68070
[CI skip] Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.24.1 2022-03-15 17:49:11 +01:00
haiman
51bcf3d8b9
Update ColoredMaterial.java 2022-03-15 21:50:44 +08:00
TheBusyBiscuit
114de62942 Fixed #3445 2022-03-14 18:44:48 +01:00
TheBusyBiscuit
91a184a400 [CI skip] New changelog entry 2022-03-14 18:21:54 +01:00
TheBusyBiscuit
495208a089 [CI skip] Updated changelog 2022-03-14 18:19:48 +01:00
TheBusyBiscuit
b037c96d81
[CI skip] Merge pull request #3491 from ybw0014/feature/rainbow-shulker-box
Add shulker box to ColoredMaterial
2022-03-14 17:42:27 +01:00
ybw0014
e818597b0b
Add shulker box to ColoredMaterial 2022-03-12 16:36:22 -05:00
renovate[bot]
54cb571e1b
[CI skip] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 2022-03-11 20:05:24 +01:00
TheBusyBiscuit
357fee7fff
Merge pull request #3453 from FN-FAL113/fix/industrialminer-bug
Fixes #3336
2022-03-11 12:14:58 +01:00
TheBusyBiscuit
c5f4d55b27
[CI skip] Updated changelog 2022-03-11 12:14:04 +01:00
TheBusyBiscuit
cea7204994 Fixed #3487 2022-03-10 21:00:28 +01:00
TheBusyBiscuit
c88b43717c
[CI skip] Merge pull request #3479 from FN-FAL113/fix/pedestal-bug
Fix pedestal item disappearing (fixes #3476)
2022-03-10 20:51:57 +01:00
TheBusyBiscuit
3432941ba4
[CI skip] Merge pull request #3470 from J3fftw1/master
added rooted dirt to dirt variants (fixes #3469)
2022-03-10 20:48:47 +01:00
TheBusyBiscuit
f4ded6b09b
[CI skip] Properly name this workflow 2022-03-10 20:45:06 +01:00
renovate[bot]
32054f328d
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.2.6 2022-03-10 20:44:05 +01:00
TheBusyBiscuit
9387f28446
[CI skip] Updated auto-squash workflow 2022-03-10 20:40:47 +01:00
TheBusyBiscuit
f8db96532f
Merge pull request #3485 from J3fftw1/fix/fixes-inventory
fixes #3483
2022-03-10 00:16:50 +01:00
TheBusyBiscuit
52aa81419f
[CI skip] Updated changelog 2022-03-10 00:16:41 +01:00
Jeffrey Kosse
280440857b fixes #3483 2022-03-09 21:22:08 +01:00