Varian Anora
473c58d720
Update GrindStone.java
2021-04-18 12:12:30 +07:00
TheBusyBiscuit
f3765ba7c7
Merge pull request #2956 from Slimefun/fix/2942
...
Fixes #2942
2021-04-17 09:46:35 +02:00
TheBusyBiscuit
2adedd2c76
[CI skip] Ffs, what is wrong with my keyboard
2021-04-17 09:45:22 +02:00
TheBusyBiscuit
34c3593e86
[CI skip] forgot one
2021-04-17 09:44:52 +02:00
TheBusyBiscuit
c6ad928a24
[CI skip] +1
2021-04-17 09:44:29 +02:00
Daniel Walsh
bf22f40f99
Oops forgot one validate
2021-04-17 08:39:56 +01:00
TheBusyBiscuit
b0c82c2395
[CI skip] Merge pull request #2962 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
2021-04-17 09:37:17 +02:00
Renovate Bot
50bc7525e0
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
2021-04-16 17:43:23 +00:00
TheBusyBiscuit
deba144d6f
[CI skip] Merge pull request #2961 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
2021-04-16 14:14:59 +02:00
Renovate Bot
f547a7dad2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
2021-04-15 22:03:54 +00:00
Daniel Walsh
448d6ca565
Fix nullability - not sure why this wasnt flagged...
2021-04-15 12:23:02 +01:00
TheBusyBiscuit
fc6de18088
[CI skip] Merge pull request #2960 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190
2021-04-15 10:45:12 +02:00
Renovate Bot
cc6eac8d33
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190
2021-04-15 02:50:11 +00:00
Daniel Walsh
6c6acacd54
Changelog
2021-04-14 12:32:00 +01:00
Daniel Walsh
38a2246561
Fixes #2942
2021-04-14 12:15:55 +01:00
TheBusyBiscuit
dcc9e97509
[CI skip] Lock release date for RC-22
2021-04-13 19:22:34 +02:00
TheBusyBiscuit
53471f1177
[CI skip] Refactoring
2021-04-10 21:03:03 +02:00
TheBusyBiscuit
485dec746b
Merge pull request #2951 from Slimefun/api/auto-enchant-event
...
AutoEnchantEvent
2021-04-10 19:12:03 +02:00
Daniel Walsh
74333e9d40
Update changelog
2021-04-10 16:29:28 +01:00
Daniel Walsh
c8bf364e8f
no idea what you mean :eyes
2021-04-10 16:28:46 +01:00
TheBusyBiscuit
8be5673b7f
Merge pull request #2950 from md5sha256/feature/optimized-cargo
...
Optimizations to cargo
2021-04-10 17:20:21 +02:00
Daniel Walsh
20855c6977
AutoEnchantEvent
2021-04-10 15:36:47 +01:00
Andrew Wong
270b907582
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-10 16:30:47 +02:00
TheBusyBiscuit
5c772c87b2
[CI skip] Updated changelog
2021-04-10 15:08:27 +02:00
Daniel Walsh
2e682c185d
Merge pull request #2929 from RobotHanzo/fix/unbreaking-misbehaviour
2021-04-10 13:51:02 +01:00
Daniel Walsh
63e3f553ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
2021-04-10 13:40:28 +01:00
TheBusyBiscuit
b4b0636cd7
Added magma cream/block to slime ball/block recipes to Freezer
2021-04-09 19:06:19 +02:00
TheBusyBiscuit
2ef332a003
Lowered "Magma block -> Sulfate" recipe to only require 1 magma block
2021-04-09 18:54:16 +02:00
TheBusyBiscuit
dbda4d0b23
Added a deprecation warning to the SlimefunBlockHandler
...
Also converted the remaining machines to the new system
2021-04-09 18:30:27 +02:00
Andrew Wong
debbc5bd17
Code format fixes, use an ArrayDeqeue in CargoNet#distributeItems
2021-04-09 14:20:23 +02:00
TheBusyBiscuit
2d8ddfc675
Merge pull request #2949 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
...
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.4
2021-04-09 11:49:59 +02:00
Andrew Wong
6c0c95c138
Fix star import
2021-04-09 00:19:41 +02:00
Andrew Wong
bccb2f38d5
Optimizations to cargo
...
This commit introduces two optimizations to cargo handling:
- Utilization of regex to validate integers in CargoNet#getFrequency,
- Smart shallow-cloning in CargoNetworkTask: using an ArrayList when round-robin is disabled
2021-04-08 23:46:43 +02:00
Renovate Bot
8b606766dc
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.4
2021-04-08 18:12:25 +00:00
TheBusyBiscuit
e1f0e0cd6c
Converted more machines to the new BlockBreakHandler
2021-04-08 13:34:18 +02:00
TheBusyBiscuit
058d01835e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-07 16:34:44 +02:00
TheBusyBiscuit
e52b1a92c7
Fixes #2944
2021-04-07 16:34:39 +02:00
TheBusyBiscuit
71110179a8
[CI skip] Merge pull request #2945 from Slimefun/renovate/org.mockito-mockito-core-3.x
...
Update dependency org.mockito:mockito-core to v3.9.0
2021-04-07 16:34:15 +02:00
TheBusyBiscuit
a520925ddd
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-07 16:31:59 +02:00
Renovate Bot
2053b4d907
Update dependency org.mockito:mockito-core to v3.9.0
2021-04-07 14:24:34 +00:00
TheBusyBiscuit
0f332d9b61
[CI skip] Merge pull request #2938 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.188
2021-04-06 00:10:46 +02:00
TheBusyBiscuit
1361ed8eef
[CI skip] Added distribution parameter to workflow
2021-04-06 00:10:16 +02:00
TheBusyBiscuit
14ff891d62
[CI skip] Update java setup action inputs
2021-04-06 00:09:26 +02:00
Renovate Bot
90cb7101ba
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.188
2021-04-05 22:06:28 +00:00
TheBusyBiscuit
3f5b9a6c11
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-05 13:45:34 +02:00
TheBusyBiscuit
12f0937436
[CI skip] Merge pull request #2933 from StarWishsama/patch-1
...
Added missing changelog for #2756
2021-04-05 13:23:52 +02:00
TheBusyBiscuit
7ee5909555
[CI skip] Merge pull request #2936 from Slimefun/renovate/actions-setup-java-2.x
...
Update actions/setup-java action to v2
2021-04-05 13:23:43 +02:00
TheBusyBiscuit
b106592ab8
Update CHANGELOG.md
2021-04-05 13:23:15 +02:00
TheBusyBiscuit
96f657f6e7
Small performance improvements
2021-04-05 13:16:31 +02:00
Renovate Bot
8e1e9d25ee
Update actions/setup-java action to v2
2021-04-05 11:05:35 +00:00
