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

248 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
486253973c Renamed to Villager Rune 2020-09-02 11:16:45 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
da4560d490 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-09-02 10:31:58 +02:00
TheBusyBiscuit
f4091e931b Refactoring and some annotations 2020-09-02 10:31:35 +02:00
Renovate Bot
4a4ad466ce
Update dependency org.mockito:mockito-core to v3.5.9 2020-09-01 23:14:48 +00:00
Renovate Bot
b7b4d08ae3
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.25.1 2020-08-29 11:25:29 +00:00
TheBusyBiscuit
9d740436a7
Merge branch 'master' into experimental 2020-08-28 20:53:20 +02:00
Renovate Bot
11d751eecd
Update dependency org.mockito:mockito-core to v3.5.7 2020-08-25 23:31:28 +00:00
Renovate Bot
8d774dec3f
Update dependency org.mockito:mockito-core to v3.5.6 2020-08-24 23:00:40 +00:00
TheBusyBiscuit
6ca009e48d
Updated MockBukkit 2020-08-24 23:23:34 +02:00
TheBusyBiscuit
155092a321 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
Conflicts:
	pom.xml
2020-08-23 17:57:13 +02:00
TheBusyBiscuit
f51a19777f [CI skip] Added more Unit tests 2020-08-23 17:56:38 +02:00
TheBusyBiscuit
49573ad55b
[CI skip] Merge pull request #2244 from TheBusyBiscuit/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.10.00
2020-08-23 14:12:11 +02:00
Renovate Bot
69a3c227dc
Update dependency com.konghq:unirest-java to v3.10.00 2020-08-22 22:08:54 +00:00
Renovate Bot
2db1466807
Update dependency org.mockito:mockito-core to v3.5.5 2020-08-22 21:39:29 +00:00