Jeff
65df4d5a9e
Merge branch 'master' into fix/industrial-miner-bug
2023-03-04 18:47:18 +08:00
FN-FAL113
e79091825d
oopsie fixy
2023-03-04 18:44:36 +08:00
FN-FAL113
b0ee2e55da
Refactor
2023-03-04 18:39:35 +08:00
Jeff
3a054f8d51
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java
...
Co-authored-by: Sefiraat <miakis@me.com>
2023-03-04 18:23:20 +08: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
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
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
TheBusyBiscuit
ad2b425cd6
[CI skip] Updated changelog
2023-02-23 16:25:57 +01:00
Ritwik-main
0622261e86
Update src/main/resources/tags/climbing_pick_strong_surfaces.json
...
Co-authored-by: Varian Anora <variananora@outlook.com>
2023-02-23 13:25:02 +05:30
Ritwik-main
d111b1bffb
Update src/main/resources/tags/climbing_pick_strong_surfaces.json
...
Co-authored-by: Varian Anora <variananora@outlook.com>
2023-02-23 13:24:55 +05:30
Ritwik-main
da3f6bd049
more blocks for climbing pickaxe take 3?
...
adding the new 1.18 and 1.19 blocks into climbing pick surfaces, as new blcoks generate in the world naturally and might need to be climbed
2023-02-23 13:15:48 +05:30
Varian Anora
bf11828e34
make mud not required
2023-02-23 14:44:52 +07:00
Ritwik-main
b81f2cc0a0
Revert "adding more blocks to climbing pickaxe table"
...
This reverts commit 66140e79ee
.
2023-02-23 13:02:55 +05:30
Ritwik-main
66140e79ee
adding more blocks to climbing pickaxe table
...
adding the new 1.18 and 1.19 blocks into climbing pick surfaces, as new blcoks generate in the world
2023-02-23 12:44:08 +05:30
Ritwik-main
e2df602c30
Revert "updated climbing pickaxe"
...
This reverts commit eb1bdc464c
.
2023-02-23 12:37:36 +05:30
Ritwik-main
eb1bdc464c
updated climbing pickaxe
...
adding the new 1.18 and 1.19 blocks into climbing pick surfaces, as new blcoks generate in the world
2023-02-23 12:34:03 +05:30
renovate[bot]
d87b508e27
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.5.0
2023-02-20 03:04:47 +01:00
renovate[bot]
4de76869c2
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M9
2023-02-18 20:56:12 +01:00
The Busy Bot
41f7f9a914
[CI skip] New locale updates from Crowdin
2023-02-12 21:49:04 +01:00
TheBusyBiscuit
4f1949fb2e
[CI skip] Update translators list
2023-02-12 21:25:42 +01:00
TheBusyBiscuit
f4440b9b2d
Apply suggestions from code review
2023-02-11 15:10:26 +01:00
JustAHuman-xD
6f2a4e369a
Specify within this instance
2023-02-11 07:43:19 -06:00
Daniel Walsh
08af8b2f99
Apply suggestions from code review
2023-02-11 00:01:20 +00:00
JustAHuman-xD
2a012cd9c3
Javadoc Changes
2023-02-10 16:45:12 -06:00
JustAHuman-xD
33d4741449
Add Javadocs
2023-02-10 16:20:52 -06:00
JustAHuman-xD
29757f1379
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/energy/EnergyNet.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2023-02-10 16:03:37 -06:00
renovate[bot]
17d2ffd731
[CI skip] Update actions/setup-java action to v3.10.0
2023-02-10 22:53:30 +01:00
JustAHuman-xD
e7372064d5
Requested Changes
2023-02-10 13:05:50 -06:00
JustAHuman-xD
424b889588
Add API Methods & Small Cleanup
2023-02-10 12:46:55 -06:00
renovate[bot]
b4083a480f
[CI skip] Update dependency org.mockito:mockito-core to v5.1.1
2023-01-31 19:49:27 +01:00
TheBusyBiscuit
4bfc4f06fb
Merge pull request #3695 from J3fftw1/chore/some-chores
...
Some cleanup
2023-01-30 18:00:25 +01:00
TheBusyBiscuit
434ee3b6f2
Merge pull request #3756 from J3fftw1/fix/3741
...
Fix smelting null items
2023-01-30 17:54:27 +01:00
TheBusyBiscuit
1d5d5fc680
[CI skip] Update changelog
2023-01-30 17:53:53 +01:00
renovate[bot]
d463f50e85
[CI skip] Update dependency org.mockito:mockito-core to v5.1.0
2023-01-30 17:49:39 +01:00
J3fftw1
c21e2f3076
Fix smelting null items
2023-01-30 16:33:09 +01:00