1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

7974 Commits

Author SHA1 Message Date
renovate[bot]
d2ad2b181c
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.9 2023-04-22 12:26:32 +02:00
renovate[bot]
affa844dfa
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.219 2023-04-22 12:26:23 +02:00
renovate[bot]
beafe0e41f
[CI skip] Update actions/setup-java action to v3.11.0 2023-04-22 12:26:15 +02:00
renovate[bot]
f5f4e56ed5
[CI skip] Update actions/checkout action to v3.5.2 2023-04-22 12:26:05 +02:00
renovate[bot]
7841b5da8a
[CI skip] Update dependency org.mockito:mockito-core to v5.3.1 2023-04-22 12:25:40 +02:00
renovate[bot]
d860ee56b2
[CI skip] Update actions/checkout action to v3.5.0 2023-03-25 12:40:13 +01:00
renovate[bot]
cb7b14a430
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.14 2023-03-21 15:38:41 +01:00
renovate[bot]
5c2e5867f1
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.14 2023-03-21 15:38:22 +01:00
renovate[bot]
e835a96f56
[CI skip] Update dependency me.clip:placeholderapi to v2.11.3 2023-03-21 15:37:59 +01:00
renovate[bot]
643c59fefe
[CI skip] Update hmarr/auto-approve-action action to v3.2.1 2023-03-21 15:36:28 +01:00
renovate[bot]
8ca7ecd3b1
[CI skip] Update actions/checkout action to v3.4.0 2023-03-21 15:36:17 +01:00
renovate[bot]
9b72c3d842
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0 2023-03-21 15:35:52 +01:00
Daniel Walsh
22a7f42207
Merge pull request #3802 from J3fftw1/fix/error-on-startup 2023-03-19 12:56:24 +00:00
J3fftw1
4ebc1f0591 requested changes 2023-03-19 13:17:35 +01:00
J3fftw1
4ffd10531b fixed username not being found 2023-03-18 14:11:01 +01:00
TheBusyBiscuit
735e4cc38a
Merge pull request #3755 from J3fftw1/fix/saldedupe
fixes #3254
2023-03-13 15:13:57 +01:00
TheBusyBiscuit
dc4eb8a859
[CI skip] Update CHANGELOG.md 2023-03-13 15:13:34 +01:00
renovate[bot]
c362653b0d
[CI skip] Update pascalgn/automerge-action action to v0.15.6 2023-03-13 15:10:50 +01:00
Daniel Walsh
f375f7befa
[CI Skip] Merge pull request #3793 from J3fftw1/fix/change-paper-repo
Change paper repo
2023-03-11 11:32:24 +00:00
J3fftw1
31aa80429c Change paper repo 2023-03-11 12:22:42 +01:00
renovate[bot]
27caae8647
[CI skip] Update dependency org.mockito:mockito-core to v5.2.0 2023-03-10 13:09:14 +01:00
renovate[bot]
90650ead8b
[CI skip] Update hmarr/auto-approve-action action to v3.2.0 2023-03-10 13:06:04 +01:00
TheBusyBiscuit
157fe4494c
Merge pull request #3786 from JustAHuman-xD/fix/soulbound-when-disabled
Fixes #3361
2023-03-07 22:57:46 +01:00
TheBusyBiscuit
a761ab9194
Merge pull request #3679 from svr333/AddBasaltToBlackstone
Add Basalt->Blackstone recipe
2023-03-07 22:57:28 +01:00
TheBusyBiscuit
5c81577e4d
[CI skip] Updated changelog 2023-03-07 22:57:10 +01:00
TheBusyBiscuit
840083301c
Merge pull request #3707 from tandrew468/fix/golden-apple-juice-#3701
Fixes #3701
2023-03-04 17:23:19 +01:00
TheBusyBiscuit
fb93b5d3f0
[CI skip] Updated changelog 2023-03-04 17:23:06 +01:00
JustAHuman-xD
7fff6e4d9b Fix Import Order 2023-03-04 06:06:15 -06:00
TheBusyBiscuit
8197b06682
Merge pull request #3783 from JustAHuman-xD/fix/energy-integer-overflow
Fix Energy Nets Over&Underflowing
2023-03-04 11:21:16 +01:00
TheBusyBiscuit
8606aa66cc
[CI skip] Updated changelog 2023-03-04 11:21:04 +01:00
TheBusyBiscuit
d542d304f5
Merge pull request #3779 from variananora/fix/3724
Fix #3724
2023-03-04 11:12:46 +01:00
TheBusyBiscuit
367a0688d9
Merge pull request #3752 from J3fftw1/feature/bamboo-as-fuel
Added bamboo as a fuel type for androids
2023-03-04 11:12:37 +01:00
TheBusyBiscuit
ed05f1b854
Merge pull request #3787 from JustAHuman-xD/fix/android-null-exception
Fix #3462
2023-03-04 11:12:30 +01:00
TheBusyBiscuit
8f36b19925
[CI skip] Updated changelog 2023-03-04 11:12:22 +01:00
JustAHuman-xD
adf5ae7a6f Flip the order of max and min 2023-03-02 09:15:47 -06:00
JustAHuman-xD
7821258589
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/NumberUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2023-03-02 09:11:55 -06:00
JustAHuman-xD
128d091389
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2023-03-02 09:07:10 -06:00
JustAHuman-xD
e32f95bc56 Flip the parameters
By checking if the unique id as a string equals the locationinfo, we avoid the null pointer exception, this is how it is achieved in this same class line 177
2023-03-02 08:17:48 -06:00
JustAHuman-xD
4f37d876a8 Also check if its disabled in that world 2023-03-02 07:57:25 -06:00
JustAHuman-xD
8bbe180334 Add a null check 2023-03-02 07:54:29 -06:00
JustAHuman-xD
f08a57e3e6 Check if the soulbound rune is disabled 2023-03-02 07:44:27 -06:00
JustAHuman-xD
9029dbadba Add Unit Tests
Testing these locally the tests were pasted
2023-03-02 06:44:44 -06:00
JustAHuman-xD
cc557a19cf Javadocs 2023-03-02 06:20:00 -06:00
JustAHuman-xD
1d24e832b5 Requested Changes (Next Up Unit Tests) 2023-03-02 06:16:07 -06:00
renovate[bot]
137cdc94bf
[CI skip] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.11.0 2023-03-02 11:20:21 +01:00
JustAHuman-xD
800abe0f3c
Add Spaces before Or Operators
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2023-02-26 09:01:12 -06:00
JustAHuman-xD
e51f910633 Handle underflow properly 2023-02-26 08:02:22 -06:00
JustAHuman-xD
34905ebffa Add overflow protection (untested) 2023-02-26 06:28:27 -06:00
TheBusyBiscuit
ddb7ebd134
Merge pull request #3778 from Ritwik-main/master
updated climbing pickaxe to allow climbing 1.18 and 1.19 blocks
2023-02-23 16:26:36 +01:00
TheBusyBiscuit
038742c9a3
Merge pull request #3766 from JustAHuman-xD/api/energy-net-changes
Add API Methods to EnergyNet
2023-02-23 16:26:25 +01:00