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

683 Commits

Author SHA1 Message Date
renovate[bot]
e6a10f7ce9
Update dependency com.konghq:unirest-java to v3.14.1 2022-12-04 14:59:59 +00:00
renovate[bot]
6a5f979fd6
[CI skip] Update dependency org.mockito:mockito-core to v4.9.0 2022-11-26 23:05:45 +01:00
renovate[bot]
bf28bbb5a8
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.5 2022-11-03 10:42:15 +01:00
renovate[bot]
155c639c60
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.1 2022-11-03 10:41:56 +01:00
renovate[bot]
fe11aaadcf
[CI skip] Update dependency org.mockito:mockito-core to v4.8.1 2022-11-03 10:41:41 +01:00
renovate[bot]
aa8d823632
[CI skip] Update dependency com.konghq:unirest-java to v3.13.11 2022-09-29 17:49:33 +02:00
renovate[bot]
ea029439ce
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.3-r8 2022-09-29 12:11:39 +02:00
renovate[bot]
7a8d85453d
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.1 2022-09-21 17:35:31 +02:00
renovate[bot]
8ecb91c7eb
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.4.0 2022-09-19 03:03:19 +02:00
renovate[bot]
e0017850b7
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.3.0 2022-09-18 13:54:48 +02:00
renovate[bot]
fd12df83d5
[CI skip] Update dependency org.mockito:mockito-core to v4.8.0 2022-09-18 13:53:45 +02:00
renovate[bot]
447e81f573
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.1 2022-08-18 12:38:37 +02:00
renovate[bot]
1a3b2e56ea
[CI skip] Update dependency org.mockito:mockito-core to v4.7.0 2022-08-13 20:14:17 +02:00
renovate[bot]
b407c248d2
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.217 2022-08-08 14:18:13 +02:00
renovate[bot]
75a684f614
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.12 2022-08-08 14:18:11 +02:00
renovate[bot]
f783fc7e95
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.12 2022-08-08 14:18:05 +02:00
renovate[bot]
de5e17533e
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.11 2022-08-04 11:42:42 +02:00
renovate[bot]
030e24c44a
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.11 2022-08-04 11:42:31 +02:00
renovate[bot]
8c12c92fec
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.0 2022-07-29 19:44:00 +02:00
renovate[bot]
f50bd4db90
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.3c 2022-07-29 19:43:33 +02:00
renovate[bot]
07715427ed
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.216 2022-07-25 11:58:00 +02:00
renovate[bot]
4275fe27ec
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.215 2022-07-24 10:42:49 +02:00
TheBusyBiscuit
6d141373fb
Merge branch 'master' into java16 2022-07-14 14:04:57 +02:00
renovate[bot]
b6e513eead
[CI skip] Update dependency com.konghq:unirest-java to v3.13.10 2022-07-10 18:51:26 +02:00
TheBusyBiscuit
5200823b4e
Merge branch 'master' into java16 2022-07-09 21:07:18 +02:00
renovate[bot]
d4428c00f1
[CI skip] Update dependency me.clip:placeholderapi to v2.11.2 2022-07-08 13:29:30 +02:00
renovate[bot]
b1802e05ef
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.1b 2022-07-02 21:47:06 +02:00
TheBusyBiscuit
20c3564e8f Initial update to Java 16 2022-07-02 20:49:00 +02:00
TheBusyBiscuit
8674e1f5de Revert to old MockBukkit version 2022-06-11 12:45:02 +02:00
TheBusyBiscuit
9226ccf1c9 Updated pom.xml 2022-06-11 12:25:32 +02:00
TheBusyBiscuit
03accf652f
Merge pull request #3577 from J3fftw1/feature/1-19
updated to 1.19
2022-06-11 12:12:41 +02:00
renovate[bot]
264883cfab
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.214 2022-06-10 21:45:17 +02:00
renovate[bot]
bfbc24a1c6
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.6 2022-06-09 19:46:47 +02:00
renovate[bot]
2370163f99
[CI skip] Update dependency org.mockito:mockito-core to v4.6.1 2022-06-09 19:46:44 +02:00
renovate[bot]
2c233ebe14
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M7 2022-06-09 19:46:41 +02:00
renovate[bot]
719aaf5017
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.213 2022-06-09 19:46:37 +02:00
renovate[bot]
7542966eee
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.10 2022-06-09 19:46:34 +02:00
renovate[bot]
f7623ed448
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.10 2022-06-09 19:46:01 +02:00
J3fftw
182e6771df
Merge branch 'master' into feature/1-19 2022-06-09 12:25:58 +02:00
TheBusyBiscuit
8ecda680e9
[CI skip] Updated WorldEdit maven repository url 2022-06-09 12:12:27 +02:00
Jeffrey Kosse
90bd28a10e changed worldedit manen dependency 2022-06-09 08:05:07 +02:00
Jeffrey Kosse
fb5a20c603 updated to 1.19 2022-06-07 21:55:18 +02:00
renovate[bot]
87e9713ef4
[CI skip] Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v2 2022-05-22 16:13:57 +02:00
renovate[bot]
e9715cf505
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.5 2022-05-22 16:13:38 +02:00
renovate[bot]
1097b5582e
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.212 2022-04-29 12:23:46 +02:00
renovate[bot]
63d70a52db
[CI skip] Update dependency org.mockito:mockito-core to v4.5.1 2022-04-23 13:14:37 +02:00
renovate[bot]
2e5962c87f
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.0 2022-04-23 13:14:23 +02:00
renovate[bot]
0a3508529c
[CI skip] Update dependency org.mockito:mockito-core to v4.5.0 2022-04-21 00:08:36 +02:00
renovate[bot]
5d093822de
[CI skip] Update dependency com.konghq:unirest-java to v3.13.8 2022-04-19 19:23:40 +02:00
renovate[bot]
92317c1e84
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.1.0b 2022-04-08 16:49:33 +02:00
renovate[bot]
e198135cf6
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.8 2022-04-08 16:49:08 +02:00
renovate[bot]
7f656a1b0d
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M6 2022-04-08 16:48:55 +02:00
renovate[bot]
77b2618ad7
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.0.5 2022-04-01 14:19:47 +02:00
renovate[bot]
89eaaffcf2
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.3.0 2022-04-01 14:18:48 +02:00
renovate[bot]
67be314df1
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.211 2022-03-20 00:36:29 +01:00
Renovate Bot
fa896a1f29
Update dependency com.konghq:unirest-java to v3.13.7 2022-03-16 15:00:32 +00:00
renovate[bot]
6ac9d68070
[CI skip] Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.24.1 2022-03-15 17:49:11 +01:00
renovate[bot]
54cb571e1b
[CI skip] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 2022-03-11 20:05:24 +01:00
renovate[bot]
32054f328d
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.2.6 2022-03-10 20:44:05 +01:00
TheBusyBiscuit
ef1b6ae9a9 Added support for Minecraft 1.18.2
Happy build DEV-1000 🎉
2022-03-09 14:14:05 +01:00
Renovate Bot
2acfa59026
Update dependency org.mockito:mockito-core to v4.4.0 2022-03-08 17:44:46 +00:00
TheBusyBiscuit
46cb868ca6
[CI skip] Merge pull request #3478 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.18.1
2022-03-07 16:31:44 +01:00
Renovate Bot
e2cefce50d
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.18.1 2022-03-03 10:12:16 +00:00
Renovate Bot
0c4cd0fff2
Update dependency com.github.LoneDev6:itemsadder-api to v3 2022-03-02 13:03:23 +00:00
TheBusyBiscuit
e3efd3330c
[CI skip] Merge pull request #3463 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.2
2022-02-21 00:43:14 +01:00
Renovate Bot
de0d3111b4
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.0 2022-02-14 09:08:14 +00:00
Renovate Bot
0edcb59c5a
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.2 2022-02-11 12:41:03 +00:00
Varian Anora
34e59c4895 Update Orebfuscator repo 2022-02-01 21:38:00 +07:00
Renovate Bot
d7d794e0b5
Update dependency org.mockito:mockito-core to v4.3.1 2022-01-26 09:40:00 +00:00
Renovate Bot
272f7b311c
Update dependency org.mockito:mockito-core to v4.3.0 2022-01-24 15:36:21 +00:00
Renovate Bot
b0faaf4895
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.5 2022-01-21 08:07:27 +00:00
Daniel Walsh
220cfc9058
Update dough 2022-01-16 16:54:19 +00:00
Renovate Bot
e545817f5c
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5 2022-01-16 13:25:23 +00:00
Renovate Bot
b402d841bd
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.209 2022-01-15 09:12:54 +00:00
Renovate Bot
40d02676e3
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.4 2022-01-14 09:19:00 +00:00
Renovate Bot
ff94add4c6
Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.9.0 2022-01-12 15:59:37 +00:00
Renovate Bot
96cd2a24bb
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.208 2022-01-11 08:23:09 +00:00
TheBusyBiscuit
35e8f04f13
[CI skip] Merge pull request #3410 from Slimefun/renovate/net.imprex-orebfuscator-api-5.x
Update dependency net.imprex:orebfuscator-api to v5.2.4
2022-01-07 16:19:13 +01:00
Renovate Bot
9fd1191a45
Update dependency net.imprex:orebfuscator-api to v5.2.4 2022-01-07 10:15:20 +00:00
Renovate Bot
6345149759
Update dependency com.konghq:unirest-java to v3.13.6 2022-01-07 10:15:16 +00:00
Renovate Bot
fe9a512ce6
Update dependency net.imprex:orebfuscator-api to v5.2.3 2022-01-05 10:28:40 +00:00
Renovate Bot
9ab5492f70
Update dependency net.imprex:orebfuscator-api to v5.2.2 2022-01-01 08:04:09 +00:00
Renovate Bot
9dfa98a4d3
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.207 2021-12-28 10:34:12 +00:00
Renovate Bot
575ef205e4
Update dependency me.clip:placeholderapi to v2.11.1 2021-12-24 18:17:04 +00:00
Renovate Bot
9c8f3f5c46
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.0 2021-12-22 21:16:34 +00:00
Renovate Bot
c203aba874
Update dependency me.clip:placeholderapi to v2.11.0 2021-12-20 18:58:36 +00:00
Renovate Bot
f3d91c5b87
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.206 2021-12-18 12:51:23 +00:00
TheBusyBiscuit
863b8d6425
Merge pull request #3369 from Slimefun/wip/1.18
Added 1.18 support
2021-12-18 13:01:49 +01:00
Daniel Walsh
de69f15db5
Updated dough to 1.1.1 2021-12-17 21:32:21 +00:00
TheBusyBiscuit
f88e2c287d Update dough dependency 2021-12-17 17:54:06 +01:00
Renovate Bot
bccf3086e4
Update dependency org.mockito:mockito-core to v4.2.0 2021-12-16 14:56:45 +00:00
TheBusyBiscuit
b90bbca2ad
[CI skip] Merge pull request #3370 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.8
2021-12-13 16:12:55 +01:00
TheBusyBiscuit
39a0c25d7e
[CI skip] Merge pull request #3371 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.8
2021-12-13 16:12:47 +01:00
Renovate Bot
2266647519
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.0 2021-12-13 11:33:00 +00:00
Renovate Bot
f35ed0a438
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.8 2021-12-11 07:53:26 +00:00
Renovate Bot
88c1d0323f
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.8 2021-12-11 07:53:22 +00:00
TheBusyBiscuit
a838a73d49
Bump to Spigot 1.18.1 2021-12-11 00:53:39 +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
b2e391e099 First steps towards biome maps 2021-12-08 18:08:18 +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
Renovate Bot
f4ad3d4e79
Update dependency org.junit.jupiter:junit-jupiter to v5.8.2 2021-11-28 16:28:02 +00:00
Renovate Bot
20652a8fe0
Update dependency io.papermc:paperlib to v1.0.7 2021-11-25 12:47:04 +00:00
Renovate Bot
96fdd47a5c
Update dependency com.konghq:unirest-java to v3.13.4 2021-11-20 16:18:47 +00:00
Renovate Bot
c5285e5bfc
Update dependency org.mockito:mockito-core to v4.1.0 2021-11-19 18:52:47 +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
5a8645550b
[CI Skip] Merge pull request #3334 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-11-06 20:53:00 +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
ca2347cabd
Update dependency com.konghq:unirest-java to v3.13.3 2021-11-01 15:35:33 +00: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
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
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
Renovate Bot
b51d7c0f88
Update dependency com.konghq:unirest-java to v3.13.2 2021-10-23 12:54:33 +00:00
Renovate Bot
c82e02db43
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.8 2021-10-12 11:51:49 +00:00
Renovate Bot
74dc110ac8
Update dependency org.mockito:mockito-core to v4 2021-10-07 15:30:57 +00:00
Renovate Bot
699dd9899a
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.202 2021-10-05 19:59:21 +00:00
Renovate Bot
80dc5a5e51
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.2 2021-09-24 08:11:24 +00:00
Renovate Bot
f89e9d4ebd
Update dependency org.junit.jupiter:junit-jupiter to v5.8.1 2021-09-22 20:21:04 +00:00
TheBusyBiscuit
7ae0128ff6
[CI skip] Merge pull request #3250 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0
2021-09-14 11:53:50 +02:00
Renovate Bot
3310897403
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0 2021-09-12 19:30:37 +00:00
Renovate Bot
dcfb399b3d
Update dependency com.konghq:unirest-java to v3.13.0 2021-09-12 16:17:39 +00:00
TheBusyBiscuit
1e5c32cf52
[CI skip] Merge pull request #3242 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1
2021-09-09 12:37:23 +02:00
Renovate Bot
312db84e47
Update dependency com.konghq:unirest-java to v3.12.0 2021-09-08 21:39:58 +00:00
Renovate Bot
8913e2e3b1
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 2021-09-07 19:20:33 +00:00
Renovate Bot
94da02e0e6
Update dependency io.github.baked-libs:dough-api to v1.0.3 2021-09-06 08:57:32 +00:00
Daniel Walsh
d64f2bba3f
Merge branch 'master' into breaking-changes/class-relocation 2021-09-01 21:03:22 +01:00
Renovate Bot
85f62a6688
Update dependency com.konghq:unirest-java to v3.11.13 2021-08-27 16:53:12 +00:00
Renovate Bot
9178fa7505
Update dependency org.mockito:mockito-core to v3.12.4 2021-08-25 21:28:35 +00:00
Daniel Walsh
d3bde94a7d
[CI Skip] Merge pull request #3210 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
2021-08-22 11:13:15 +01:00
Renovate Bot
51681529ab
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6 2021-08-22 05:08:57 +00:00
Renovate Bot
62e6b517a6
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6 2021-08-22 05:08:54 +00:00
Renovate Bot
7ba7f9342a
Update dependency org.mockito:mockito-core to v3.12.1 2021-08-20 15:56:59 +00:00
Renovate Bot
be69814f75
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.201 2021-08-10 22:16:12 +00:00
TheBusyBiscuit
c0f25ba5ec Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java
2021-08-05 15:08:54 +02:00
Renovate Bot
11fb4a47cc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.7 2021-08-03 15:31:25 +00:00
TheBusyBiscuit
708aa17340 Bump dough-api to 1.0.2 2021-07-28 14:33:44 +02:00
TheBusyBiscuit
633a736016 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/FlexCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/MultiCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
2021-07-28 14:32:27 +02:00
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master
Intregation: Orebfuscator
2021-07-26 12:51:31 +02:00
TheBusyBiscuit
1fbfa63507 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java
2021-07-26 00:12:45 +02:00
Renovate Bot
33405d90bc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.6 2021-07-23 15:29:46 +00:00
TheBusyBiscuit
6175540a4e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into breaking-changes/class-relocation 2021-07-15 17:29:43 +02:00
TheBusyBiscuit
ddd2d21245 Finished first transition to dough 2021-07-15 14:24:24 +02:00
Renovate Bot
5c0775e4c6
Update dependency com.konghq:unirest-java to v3.11.12 2021-07-14 20:43:07 +00:00
TheBusyBiscuit
91c6e869a5 Updated group id of baked-libs 2021-07-14 17:41:26 +02:00
TheBusyBiscuit
0cc9bd91de Progress towards dough 2021-07-14 16:47:41 +02:00
Renovate Bot
795a4c02db
Update dependency me.clip:placeholderapi to v2.10.10 2021-07-10 05:05:25 +00:00