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

7672 Commits

Author SHA1 Message Date
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
terslenk
caca7fc7b9 forgot to remove second anvil tag ;-; 2021-11-01 17:51:18 +03:00
terslenk
a9c371a1d0 forgot to remove second anvil tag ;-; 2021-11-01 17:48:28 +03:00
terslenk
78aa3074ec fixed tags location 2021-11-01 17:41:29 +03:00
terslenk
fa09f17d16 fixed values 2021-11-01 17:32:45 +03:00
terslenk
bcd0094652 removed tabs 2021-11-01 17:28:13 +03:00
TerslenK
88a496a0f1
Merge branch 'Slimefun:master' into master 2021-11-01 16:36:43 +03:00
TerslenK
62f43bfca6
Update src/main/resources/tags/gravity_affected_blocks.json
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2021-11-01 16:34:33 +03:00
svr333
29585eb1a1
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-10-28 13:07:43 +02:00
TheBusyBiscuit
1ef99aac68
[CI skip] Merge pull request #3331 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20
2021-10-28 13:04:39 +02:00
TheBusyBiscuit
b569ad6c73
[CI skip] Merge pull request #3332 from Slimefun/chore/update-changelog
Update changelog with PR #3326
2021-10-28 13:04:09 +02:00
svr333
0f176694a6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-28 12:24:59 +02:00
Daniel Walsh
a0dade18c3
Update CHANGELOG.md
Co-authored-by: Varian Anora <variananora@outlook.com>
2021-10-28 08:26:01 +01:00
Daniel Walsh
82978f7d5b
Merge pull request #3326 from guizhanss/fix/smithing-table-listener 2021-10-28 02:31:17 +01:00
Daniel Walsh
5eab8072fa
Update changelog with PR #3326 2021-10-28 02:30:55 +01:00
Daniel Walsh
52cec21e29
[CI Skip] Merge pull request #3327 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-10-28 02:21:00 +01:00
Renovate Bot
a0767b034c
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20 2021-10-25 15:31:24 +00:00
Daniel Walsh
b8f7dc5d7b
[CI Skip] Merge pull request #3329 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 2021-10-25 10:14:18 +01:00
Daniel Walsh
b3f3818ec7
[CI Skip] Merge pull request #3330 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x 2021-10-25 10:13:49 +01:00
Renovate Bot
863de0ad72
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.7 2021-10-24 14:32:49 +00:00
Renovate Bot
36a6f65012
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.7 2021-10-24 14:32:45 +00:00