TheBusyBiscuit
|
9d3b8c7dbf
|
[CI skip] Updated changelog
|
2021-05-24 14:24:05 +02:00 |
|
TheBusyBiscuit
|
c1de61d1c1
|
Merge branch 'fix/improve-research-message' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
|
2021-05-24 13:09:57 +02:00 |
|
TheBusyBiscuit
|
a5a8615af2
|
Updated changelog
|
2021-05-24 13:09:51 +02:00 |
|
TheBusyBiscuit
|
3e4af70e10
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
|
2021-05-24 13:09:06 +02:00 |
|
TheBusyBiscuit
|
213c2b0e4d
|
Changed color to white now
|
2021-05-24 13:07:46 +02:00 |
|
TheBusyBiscuit
|
da6c909d3a
|
Update src/main/resources/languages/en/messages.yml
|
2021-05-24 13:06:54 +02:00 |
|
TheBusyBiscuit
|
31af8f3b25
|
Fixed #3053
|
2021-05-24 13:04:45 +02:00 |
|
TheBusyBiscuit
|
fd2d30a3ae
|
Validate progress arguments
|
2021-05-24 11:23:36 +02:00 |
|
TheBusyBiscuit
|
466990a03e
|
Switch to a Concurrent Map
|
2021-05-24 11:18:13 +02:00 |
|
TheBusyBiscuit
|
a249ca7848
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
|
2021-05-24 11:09:52 +02:00 |
|
TheBusyBiscuit
|
d29e96b5df
|
[CI skip] Merge pull request #3073 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0
|
2021-05-22 19:17:55 +02:00 |
|
Andrew Wong
|
8fb1c7cdfb
|
Enforce nullability
|
2021-05-22 16:04:43 +02:00 |
|
Renovate Bot
|
769d299204
|
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0
|
2021-05-22 12:46:10 +00:00 |
|
Andrew Wong
|
5e94f454c8
|
Fix documentation for ItemStackAndInteger and tests for ItemStackWrapper
|
2021-05-21 13:29:45 +02:00 |
|
TheBusyBiscuit
|
36414486f0
|
[CI skip] Merge pull request #3072 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.0.1
|
2021-05-20 23:25:37 +02:00 |
|
Renovate Bot
|
bee1abf859
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.0.1
|
2021-05-20 19:58:31 +00:00 |
|
TheBusyBiscuit
|
ec51f534cb
|
[CI skip] Merge pull request #3071 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.8
|
2021-05-20 17:17:39 +02:00 |
|
Renovate Bot
|
986d6ae15d
|
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.8
|
2021-05-20 15:12:44 +00:00 |
|
Andrew Wong
|
57b559e81d
|
Fix nullability and docs
|
2021-05-19 18:57:29 +02:00 |
|
Andrew Wong
|
7e43e68f68
|
Method renames, update docs and unit tests
|
2021-05-19 18:19:04 +02:00 |
|
TheBusyBiscuit
|
e4225d7aec
|
Fixed a permissions issue with /sf charge
|
2021-05-19 17:36:10 +02:00 |
|
TheBusyBiscuit
|
2e5bedc932
|
Merge pull request #3062 from martinbrom/feature/configurable-altar-speed
Add a configurable step delay to the Ancient Altar
|
2021-05-19 17:26:26 +02:00 |
|
TheBusyBiscuit
|
58fbc423af
|
Merge pull request #3052 from martinbrom/fix/woodcutter-android-stuck fixes #2964
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
|
2021-05-19 17:25:50 +02:00 |
|
TheBusyBiscuit
|
eb34c01f86
|
Merge pull request #3058 from Mooy1/fix/block-menu-loading
Fixed menu loading issues and probably improved BlockStorage load times
|
2021-05-19 17:25:11 +02:00 |
|
TheBusyBiscuit
|
aca9fd7dfd
|
[CI skip] Updated changelog
|
2021-05-19 17:24:59 +02:00 |
|
TheBusyBiscuit
|
6353720d39
|
Merge pull request #3065 from martinbrom/fix/gold-pan-exception
Fixed an Exception when any GoldPan drops have zero chance of dropping
|
2021-05-19 14:03:08 +02:00 |
|
TheBusyBiscuit
|
a1116ec75e
|
[CI skip] Updated changelog
|
2021-05-19 14:02:57 +02:00 |
|
TheBusyBiscuit
|
593e0a08c9
|
[CI skip] Removed deprecated class
|
2021-05-19 10:45:30 +02:00 |
|
TheBusyBiscuit
|
d9cb5ef0ba
|
[CI skip] Updated changelog
|
2021-05-19 10:38:31 +02:00 |
|
a
|
1e459693fb
|
Update BlockStorage.java
|
2021-05-18 11:45:01 -05:00 |
|
a
|
9db161569d
|
Update BlockStorage.java
|
2021-05-18 11:44:21 -05:00 |
|
Andrew Wong
|
7085f0d0a8
|
Update unit tests for ItemStackWrapper
|
2021-05-18 14:32:40 +02:00 |
|
Andrew Wong
|
3dfc83ac6a
|
Try to inject and use the ItemStackWrapper into frequently used CargoUtils methods
|
2021-05-18 14:12:28 +02:00 |
|
Andrew Wong
|
9e6aa5b39a
|
Actually use the wrapper in CargoNetTask#distributeItems
|
2021-05-18 13:40:10 +02:00 |
|
TheBusyBiscuit
|
41a19ac312
|
[CI skip] Merge pull request #3067 from Slimefun/renovate/actions-setup-java-2.x
Update actions/setup-java action to v2.1.0
|
2021-05-18 12:34:52 +02:00 |
|
Andrew Wong
|
4704b9fa8f
|
Check for ItemStackWrappers in ItemStackAndInteger
|
2021-05-18 12:05:38 +02:00 |
|
Andrew Wong
|
6f042e60ad
|
Deprecate the public constructor of ItemStackWrapper(ItemStack). More docs and use #ofItem where possible
|
2021-05-17 21:46:59 +02:00 |
|
Andrew Wong
|
727c8d34b9
|
Add ItemStackWrapper#ofItem, try not to use duplicate ItemStackWrappers in CargoNet
|
2021-05-17 21:36:10 +02:00 |
|
Renovate Bot
|
d705e99139
|
Update actions/setup-java action to v2.1.0
|
2021-05-17 14:32:39 +00:00 |
|
TheBusyBiscuit
|
f822bdd12d
|
Merge pull request #3044 from martinbrom/feature/portable-teleporter
Add PortableTeleporter
|
2021-05-16 21:53:37 +02:00 |
|
TheBusyBiscuit
|
5b8440daca
|
[CI skip] Updated changelog
|
2021-05-16 21:52:27 +02:00 |
|
Martin Brom
|
f2ee8a27f3
|
Add annotations and clarify naming for AncientAltar related classes
|
2021-05-16 12:04:44 +02:00 |
|
TheBusyBiscuit
|
f12e68dd72
|
[CI skip] Fixed some of the technical debt caused by recent PRs
|
2021-05-16 11:55:59 +02:00 |
|
Martin Brom
|
092808b847
|
Check for any GoldPan drops with zero chance
Resolves #3064
|
2021-05-16 10:18:18 +02:00 |
|
TheBusyBiscuit
|
3645aba487
|
[CI skip] Merge pull request #3063 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.7.2
|
2021-05-15 16:12:06 +02:00 |
|
Renovate Bot
|
452f262e38
|
Update dependency org.junit.jupiter:junit-jupiter to v5.7.2
|
2021-05-15 13:51:29 +00:00 |
|
TheBusyBiscuit
|
f4b4733146
|
Merge pull request #3061 from martinbrom/fix/bows-ignore-shields
Fix Icy Bow ignores shields
|
2021-05-15 12:42:23 +02:00 |
|
TheBusyBiscuit
|
2061891984
|
[CI skip] Updated changelog
|
2021-05-15 12:42:09 +02:00 |
|
Martin Brom
|
2ac333b037
|
Add a configurable step delay to the Ancient Altar
|
2021-05-15 10:53:48 +02:00 |
|
Martin Brom
|
0cced1a8d0
|
IcyBow now takes shielded players into consideration
Resolves #3060
|
2021-05-14 22:57:38 +02:00 |
|