ybw0014
|
8d72b90add
|
Merged upstream
|
2022-10-19 19:36:21 -04:00 |
|
ybw0014
|
48d67d49c5
|
Merge remote-tracking branch 'upstream/master' into chore/drop-low-version
|
2022-10-19 19:34:38 -04:00 |
|
ybw0014
|
281d1e7632
|
Fix test
|
2022-10-18 13:33:49 -04:00 |
|
ybw0014
|
bbf39f6a69
|
Remove SlimefunUtils.isInventoryEmpty
|
2022-10-18 13:32:14 -04:00 |
|
ybw0014
|
f1ab7ecd4e
|
Remove WorldUtils
|
2022-10-18 13:29:24 -04:00 |
|
Jeffrey Kosse
|
63fc4397dc
|
whoops
|
2022-10-18 18:34:40 +02:00 |
|
renovate[bot]
|
5887e2c90a
|
[CI skip] Update pascalgn/automerge-action action to v0.15.5
|
2022-10-18 18:14:45 +02:00 |
|
renovate[bot]
|
028c6c7f68
|
[CI skip] Update actions/setup-java action to v3.6.0
|
2022-10-18 18:13:53 +02:00 |
|
Jeffrey Kosse
|
3b7bdb059d
|
suggested changes
|
2022-10-18 17:55:23 +02:00 |
|
TheBusyBiscuit
|
0b7c656d86
|
Improved logging for issue #3699
|
2022-10-18 15:42:39 +02:00 |
|
TheBusyBiscuit
|
27847a6396
|
Fixed #3664 (again, I hope)
|
2022-10-18 15:24:58 +02:00 |
|
Jeffrey Kosse
|
117a867071
|
tag naming consicentencies
|
2022-10-17 13:27:17 +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 |
|
Jeffrey Kosse
|
e7d766e229
|
suggested changes
|
2022-10-17 12:34:44 +02:00 |
|
Jeffrey Kosse
|
3e776a7fba
|
changed to enhanced for loop
|
2022-10-17 07:53:49 +02:00 |
|
Jeffrey Kosse
|
7dcd574db1
|
smart to actually add the tag
|
2022-10-16 14:10:32 +02:00 |
|
Jeffrey Kosse
|
c40bf0d1d3
|
tags
|
2022-10-16 14:03:43 +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 |
|