1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

6924 Commits

Author SHA1 Message Date
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
NatsuHana
8c6bb68103
Resolves request 2021-04-05 09:28:19 +08:00
NatsuHana
a18ee91dd4
docs: add missing changelog 2021-04-05 00:19:33 +08:00
TheBusyBiscuit
bbd41ff70c [CI skip] Fixed 24k carat gold ingot 2021-04-03 19:42:14 +02:00
TheBusyBiscuit
1955d1235b [CI skip] Refactoring 2021-04-03 19:40:54 +02:00
TheBusyBiscuit
b3e5978817
[CI skip] Merge pull request #2932 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.187
2021-04-03 19:40:02 +02:00
Renovate Bot
576aa48bc8
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.187 2021-04-03 17:31:32 +00:00
TheBusyBiscuit
89b8b76fce [CI skip] Refactoring... I said 2021-04-03 15:20:45 +02:00
TheBusyBiscuit
cb05563014 [CI skip] Refactoring
+ Removed unused class
2021-04-03 15:20:08 +02:00
TheBusyBiscuit
18139bb5c4 Fixed Grappling Hook vanishing in creative mode 2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c Fixes #2926 2021-04-03 14:01:48 +02:00
TheBusyBiscuit
5b517ea1b1
[CI skip] Updated changelog 2021-04-03 13:32:25 +02:00
RobotHanzo
dcf411032e Fixes 2021-04-03 19:25:22 +08:00
RobotHanzo
d428375132
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 19:21:52 +08:00
RobotHanzo
a268088d59 Even more advanced enum 2021-04-03 19:13:12 +08:00
RobotHanzo
d61ebb6c19 Fix catastrophe 2021-04-03 16:11:37 +08:00
RobotHanzo
13e17beab4 Merge remote-tracking branch 'origin/fix/unbreaking-misbehaviour' into fix/unbreaking-misbehaviour 2021-04-03 16:10:35 +08:00
RobotHanzo
7e76392535 Test improvement 2021-04-03 16:10:18 +08:00
RobotHanzo
cceb2af054
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/mocks/DamageableMock.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 16:09:27 +08:00
RobotHanzo
c56713ed7d Now using enum 2021-04-03 16:07:41 +08:00
Daniel Walsh
16674a38c1
[CI Skip] Merge pull request #2931 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.186
2021-04-03 07:34:21 +01:00
Renovate Bot
aab6ea7a93
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.186 2021-04-03 03:59:50 +00:00
Daniel Walsh
cbaad1267e
[CI Skip] Merge pull request #2864 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.185
2021-04-02 21:18:06 +01:00
Renovate Bot
b5397968e6
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.185 2021-04-02 16:00:47 +00:00
RobotHanzo
11fded46db Overridable durability RNG 2021-04-02 22:16:25 +08:00
RobotHanzo
6d12d1f7ac Move classes out 2021-04-02 21:53:05 +08:00
RobotHanzo
f9201b648a Unused imp. 2021-04-02 21:48:44 +08:00
RobotHanzo
53b38e51be
Fix mistakes 2021-04-02 21:11:42 +08:00
RobotHanzo
61224ec686
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestDamageableItem.java
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2021-04-02 20:57:03 +08:00
RobotHanzo
a000c92d93 Null checks 2021-04-02 20:50:28 +08:00