TheBusyBiscuit
|
7a2347a027
|
Merge pull request #3546 from craftish37/master
Added Seagrass recipe (suggestion #398 from Mr.Moules)
|
2022-04-24 19:26:23 +02:00 |
|
TheBusyBiscuit
|
ab6790aed0
|
[CI skip] Updated changelog
|
2022-04-24 19:26:09 +02:00 |
|
TheBusyBiscuit
|
2d5c62fc8e
|
Merge pull request #3541 from itslukemango/master
Fix Arithmetic Error
|
2022-04-23 13:20:38 +02:00 |
|
TheBusyBiscuit
|
dee40e48cf
|
[CI skip] Update changelog
|
2022-04-23 13:20:26 +02:00 |
|
renovate[bot]
|
63d70a52db
|
[CI skip] Update dependency org.mockito:mockito-core to v4.5.1
|
2022-04-23 13:14:37 +02:00 |
|
renovate[bot]
|
2e5962c87f
|
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.0
|
2022-04-23 13:14:23 +02:00 |
|
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 |
|
Jeffrey Kosse
|
30386fbcb5
|
did requested changes
|
2022-04-05 19:34:06 +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 |
|
Jeffrey Kosse
|
15dce08769
|
fixed error on startup
|
2022-03-22 07:35:13 +01:00 |
|
J3fftw
|
b7825a4c95
|
Merge branch 'Slimefun:master' into master
|
2022-03-20 14:31:44 +01: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 |
|
Jeffrey Kosse
|
8043261da7
|
added freezer 3
|
2022-03-19 17:44:58 +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 |
|
qwertyuioplkjhgfd
|
d2d4dd54d5
|
comments and fix a mistake
|
2022-03-15 22:47:29 -07: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 |
|
Jeffrey Kosse
|
a3cfb94217
|
Merge branch 'master' of https://github.com/J3fftw1/Slimefun4
|
2022-03-14 10:37:16 +01:00 |
|
J3fftw
|
c71263a75c
|
Merge branch 'Slimefun:master' into master
|
2022-03-14 10:36:04 +01:00 |
|