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

7592 Commits

Author SHA1 Message Date
TheBusyBiscuit
2ab59393a6 Added 1.18 biome-maps 2021-12-10 23:03:17 +01:00
TheBusyBiscuit
93775e36b4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
wip/1.18

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java
	src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java
2021-12-10 22:45:00 +01:00
TheBusyBiscuit
250fe4c901
Merge pull request #3367 from Slimefun/api/biome-maps
(API) Added Biome Maps [1.18 preparation]
2021-12-10 22:38:36 +01:00
TheBusyBiscuit
2296ae3aff
[CI skip] Merge pull request #3297 from svr333/WikiUpdate
Update wiki.json
2021-12-10 19:39:11 +01:00
TheBusyBiscuit
8e73ef9287
Update CHANGELOG.md 2021-12-10 19:39:00 +01:00
TheBusyBiscuit
3a52496980
Update CHANGELOG.md 2021-12-10 19:03:06 +01:00
TheBusyBiscuit
4daa5d6475
[CI skip] Merge pull request #3315 from TerslenK/master
Re-adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOC…
2021-12-10 19:01:38 +01:00
TheBusyBiscuit
224049431e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-12-10 18:57:28 +01:00
TheBusyBiscuit
50310fd2ce
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-12-10 18:21:04 +01:00
TheBusyBiscuit
796193207e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
2021-12-09 16:25:47 +01:00
TheBusyBiscuit
b58fff602e Finished configuration 2021-12-09 15:28:10 +01:00
TheBusyBiscuit
6e60e94031 Updated Nether Ice biome map 2021-12-09 13:40:12 +01:00
TheBusyBiscuit
829a7d6bf6 Added version compat tests 2021-12-09 13:31:04 +01:00
TheBusyBiscuit
5ba049d29c Added lenient parsing and more documentation 2021-12-09 12:42:02 +01:00
TheBusyBiscuit
db5e4ffa2e Refactoring and documentation 2021-12-08 20:25:04 +01:00
TheBusyBiscuit
4136615c67 shhhh, this wasn't copy-pasted at all 👀 2021-12-08 18:44:36 +01:00
TheBusyBiscuit
ecc8505d46 Updated changelog 2021-12-08 18:39:05 +01:00
TheBusyBiscuit
9c938df2d5 Fixed unit test 2021-12-08 18:37:56 +01:00
TheBusyBiscuit
4ba36a7dab Added biome maps for existing resources 2021-12-08 18:36:53 +01:00
TheBusyBiscuit
074571ac22 Added more unit tests 2021-12-08 18:30:10 +01:00
TheBusyBiscuit
b2e391e099 First steps towards biome maps 2021-12-08 18:08:18 +01:00
Alessio Colombo
4e7ae6c5b0 Made gps complexity compatible with negative y 2021-12-08 15:10:17 +01:00
TheBusyBiscuit
a8bd5fbec5
[CI skip] Merge pull request #3364 from Slimefun/renovate/net.imprex-orebfuscator-api-5.x
Update dependency net.imprex:orebfuscator-api to v5
2021-12-08 13:05:05 +01:00
Renovate Bot
8f3b04ea2d
Update dependency net.imprex:orebfuscator-api to v5 2021-12-03 01:38:22 +00:00
Daniel Walsh
ab477b412f
Push my WIP changes 2021-12-01 13:08:08 +00:00
TheBusyBiscuit
1f3d0f5c20 Fixed #3336
(untested)
2021-11-30 22:11:46 +01:00
TheBusyBiscuit
bacaceb22f Refactored Industrial Miner ore handling 2021-11-30 19:45:10 +01:00
TheBusyBiscuit
fff04798d5
[CI skip] Merge pull request #3358 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.8.2
2021-11-29 12:52:13 +01:00
TheBusyBiscuit
120600f7a2
[CI skip] Merge pull request #3360 from Slimefun/renovate/actions-setup-java-2.x
Update actions/setup-java action to v2.4.0
2021-11-29 12:51:58 +01:00
Renovate Bot
76b6e399ee
Update actions/setup-java action to v2.4.0 2021-11-29 11:48:44 +00:00
Renovate Bot
f4ad3d4e79
Update dependency org.junit.jupiter:junit-jupiter to v5.8.2 2021-11-28 16:28:02 +00:00
TheBusyBiscuit
95d03f084a
[CI skip] Merge pull request #3354 from Slimefun/renovate/io.papermc-paperlib-1.x
Update dependency io.papermc:paperlib to v1.0.7
2021-11-26 18:30:16 +01:00
Renovate Bot
20652a8fe0
Update dependency io.papermc:paperlib to v1.0.7 2021-11-25 12:47:04 +00:00
TheBusyBiscuit
66afe9c649
[CI skip] Merge pull request #3353 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.13.4
2021-11-20 17:24:28 +01:00
Renovate Bot
96fdd47a5c
Update dependency com.konghq:unirest-java to v3.13.4 2021-11-20 16:18:47 +00:00
TheBusyBiscuit
db5fe1cf72
[CI skip] Merge pull request #3352 from Slimefun/renovate/mockito-monorepo
Update dependency org.mockito:mockito-core to v4.1.0
2021-11-20 17:17:53 +01:00
Renovate Bot
c5285e5bfc
Update dependency org.mockito:mockito-core to v4.1.0 2021-11-19 18:52:47 +00:00
Daniel Walsh
e1fff0dafa
[CI Skip] Merge pull request #3348 from Slimefun/renovate/org.sonarsource.scanner.maven-sonar-maven-plugin-3.x 2021-11-09 15:55:32 +00:00
Renovate Bot
577ee33cb3
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.1.2184 2021-11-09 14:46:09 +00:00
Daniel Walsh
3f41f6dfaa
[CI Skip] Merge pull request #3345 from J3fftw1/chore/update_pressure_plate_tag 2021-11-08 19:09:07 +00:00
TerslenK
cb734961d6
Merge branch 'Slimefun:master' into master 2021-11-08 17:48:26 +03:00
Jeffrey Kosse
1ae54130ef changed up the tag 2021-11-07 14:44:14 +01:00
Jeffrey Kosse
9d3ef19a24 updated pressure plate tag 2021-11-07 14:23:27 +01:00
TheBusyBiscuit
558bfb5c37
[CI skip] Updated changelog 2021-11-07 13:56:34 +01:00
Daniel Walsh
5a8645550b
[CI Skip] Merge pull request #3334 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-11-06 20:53:00 +00:00
Daniel Walsh
bf8e0d1825
[CI Skip] Merge pull request #3339 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 2021-11-06 20:52:36 +00:00
Daniel Walsh
cd6b39b3d1
[CI Skip] Merge pull request #3337 from Slimefun/renovate/actions-checkout-2.x 2021-11-06 20:52:07 +00:00
Renovate Bot
a8c0b17fc5
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.21 2021-11-03 16:04:50 +00:00
Renovate Bot
ab8ec1653d
Update actions/checkout action to v2.4.0 2021-11-02 18:12:06 +00:00
Renovate Bot
ca2347cabd
Update dependency com.konghq:unirest-java to v3.13.3 2021-11-01 15:35:33 +00:00