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

263 Commits

Author SHA1 Message Date
Renovate Bot
83cfcde657
Update dependency com.konghq:unirest-java to v3.11.03 2020-10-31 14:49:43 +00:00
Renovate Bot
3e795718f0
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.13.1 2020-10-30 22:40:04 +00:00
Renovate Bot
af584ffd48
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.150 2020-10-27 20:26:51 +00:00
Renovate Bot
c8ad6b1ae7
Update dependency org.mockito:mockito-core to v3.6.0 2020-10-27 03:16:54 +00:00
Renovate Bot
524ee1d3d3
Update dependency org.mockito:mockito-core to v3.5.15 2020-10-19 15:24:26 +00:00
Renovate Bot
087af60ab8
Update dependency com.konghq:unirest-java to v3.11.02 2020-10-17 13:17:35 +00:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
4a32858ee9 [CI skip] Updated MockBukkit 2020-10-13 20:09:36 +02:00
TheBusyBiscuit
4c47a9cb93
Merge pull request #2298 from Slimefun/tags
Implemented Tags
2020-10-10 13:38:48 +02:00
Renovate Bot
06272780bf
Update dependency com.konghq:unirest-java to v3.11.01 2020-10-09 12:16:10 +00:00
TheBusyBiscuit
cb35cddc9f Merged with master 2020-10-05 15:07:48 +02:00
TheBusyBiscuit
d60aeb05b8
[CI skip] Updated MockBukkit to 0.10.2 2020-10-05 15:07:04 +02:00
TheBusyBiscuit
1dc9aee488
[CI skip] Updated MockBukkit to 0.10.1 2020-10-05 13:02:05 +02:00
TheBusyBiscuit
060170c12d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
2020-10-05 10:03:44 +02:00
TheBusyBiscuit
904a9b1ef0 [CI skip] Updated to MockBukit 0.10.0 2020-10-05 10:01:46 +02:00
TheBusyBiscuit
76e42fa9af Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-10-04 13:17:13 +02:00
Renovate Bot
f55ebc663f
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.7.0 2020-10-04 09:47:32 +00:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
TheBusyBiscuit
87196ef3b9
Merge pull request #2385 from Mooy1/master
Speed can affect enchanter/disenchanter times, fixed pom typo
2020-10-04 00:40:01 +02:00
Mooy1
766d0bbc53 Speed can affect enchanter/disenchanter times, fixed pom typo 2020-10-03 16:27:54 -05:00
TheBusyBiscuit
33c8744478
[CI skip] Added maven default goals 2020-10-03 22:45:58 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
Renovate Bot
ce5b797420
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.6.0 2020-10-02 22:32:44 +00:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
Renovate Bot
678061d08f
Update dependency com.konghq:unirest-java to v3.11.00 2020-09-26 17:28:09 +00:00
TheBusyBiscuit
beb3a01323 [CI skip] Updated sonarcloud settings 2020-09-24 19:40:22 +02:00
Renovate Bot
f2e0606362
Update dependency org.mockito:mockito-core to v3.5.13 2020-09-24 15:53:41 +00:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
2020-09-19 11:35:41 +02:00
Renovate Bot
d79db00bf7
Update dependency org.mockito:mockito-core to v3.5.11 2020-09-18 00:28:24 +00:00
Renovate Bot
824d524d9a
Update dependency org.jacoco:jacoco-maven-plugin to v0.8.6 2020-09-15 21:47:54 +00:00
Renovate Bot
df327efdcc
Update dependency org.junit.jupiter:junit-jupiter to v5.7.0 2020-09-13 14:41:54 +00:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
TheBusyBiscuit
8838ab0963 [CI skip] Lock CS-CoreLib version 2020-09-13 11:37:07 +02:00
TheBusyBiscuit
4bfe587743 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-09-13 11:23:43 +02:00
TheBusyBiscuit
59ef524912 Updated pom.xml 2020-09-13 11:23:38 +02:00
Renovate Bot
ebdb295364
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.5.2 2020-09-12 22:23:28 +00:00
TheBusyBiscuit
6fd90bde4f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-10 16:19:23 +02:00
TheBusyBiscuit
d63ff915ce Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-09 13:19:04 +02:00
TheBusyBiscuit
f2eeadb24b [CI skip] Some minor changes 2020-09-09 13:18:43 +02:00
TheBusyBiscuit
7fdf10cc8b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
2020-09-08 12:37:25 +02:00
Renovate Bot
c7a1336e18
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.26 2020-09-08 10:30:17 +00:00
TheBusyBiscuit
3a5c1ee22b [CI skip] Removed deprecated class 2020-09-08 12:22:57 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
TheBusyBiscuit
81a8732f41 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-07 13:06:50 +02:00
TheBusyBiscuit
773996617d Added Tags 2020-09-07 00:31:26 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
TheBusyBiscuit
8061df9b5e [CI skip] More nullability annotations 2020-09-05 13:56:56 +02:00
Renovate Bot
ca45de1160
Update dependency org.mockito:mockito-core to v3.5.10 2020-09-04 14:18:52 +00:00
TheBusyBiscuit
e15d74bd00 [Ci skip] Re-incluce Junit4 2020-09-02 14:13:44 +02:00
TheBusyBiscuit
7d075efc3f [CI skip] Excluded some dependencies that could lead to inconsistencies 2020-09-02 14:08:40 +02:00