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

213 Commits

Author SHA1 Message Date
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
Renovate Bot
9f4c34e826
Update dependency org.mockito:mockito-core to v3.5.2 2020-08-18 21:24:32 +00:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
Renovate Bot
d9d1d0961f
Update dependency org.mockito:mockito-core to v3.5.0 2020-08-16 00:58:12 +00:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
d26ba90b5b [CI skip] Updated paper repository url 2020-08-08 11:50:56 +02:00
TheBusyBiscuit
99d07c42e5 [CI skip] Update MockBukkit 2020-08-07 19:05:51 +02:00
Renovate Bot
cf82201dca
Update dependency me.clip:placeholderapi to v2.10.9 2020-08-04 16:31:44 +00:00
Renovate Bot
3580876ec5
Update dependency com.konghq:unirest-java to v3.9.00 2020-08-02 18:08:23 +00:00
Renovate Bot
9b6cb20e02
Update dependency com.konghq:unirest-java to v3.8.07 2020-08-02 15:27:07 +00:00
Renovate Bot
b9e857f9b0
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.25 2020-08-01 14:29:33 +00:00
Renovate Bot
7362ee3a0f
Update dependency org.mockito:mockito-core to v3.4.6 2020-07-29 17:07:04 +00:00
Renovate Bot
0346a9556f
Update dependency io.papermc:paperlib to v1.0.5 2020-07-28 00:21:58 +00:00
Daniel Walsh
01b653ff39 Fix the critical game-breaking bug 2020-07-22 20:07:55 +01:00
Daniel Walsh
52a3cbae41 Merge master 2020-07-21 13:57:40 +01:00
Daniel Walsh
445853bf51 No one saw that 2020-07-20 15:49:59 +01:00
Daniel Walsh
4d61a7db51 Reshade stupid bStats 2020-07-20 15:47:22 +01:00
Daniel Walsh
8da64ab308 Moved the metric class 2020-07-20 15:35:31 +01:00
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
ae780a69bb Added PaperLib 2020-07-20 01:51:14 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
14f88495c4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-19 10:32:17 +02:00
Renovate Bot
88b24dc4ec
Update dependency org.mockito:mockito-core to v3.4.4 2020-07-18 19:51:01 +00:00
Renovate Bot
b75deaf02e
Update dependency org.mockito:mockito-core to v3.4.3 2020-07-17 12:45:02 +00:00
TheBusyBiscuit
a42c62dd04 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-16 21:53:26 +02:00
Renovate Bot
7dd13ec57e
Update dependency org.mockito:mockito-core to v3.4.2 2020-07-16 19:47:31 +00:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
Renovate Bot
767e9001a4
Update dependency org.mockito:mockito-core to v3.4.0 2020-07-10 20:05:27 +00:00
TheBusyBiscuit
0984afb3c6 Post-PR refactoring 2020-07-07 10:54:32 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
311202ce35 Another patch for 1.16 compatibility 2020-06-25 15:14:58 +02:00
TheBusyBiscuit
fc8fdacd3f
Updated CS-CoreLIb2 version 2020-06-25 13:41:30 +02:00
Daniel Walsh
120ece9646 Support 1.16 fully! :) 2020-06-25 09:31:50 +01:00
Daniel Walsh
81e16a6c47 1.16 support 2020-06-25 06:05:17 +01:00
TheBusyBiscuit
4a2d4ab1b1 [CI skip] Updated a dependency repo to use HTTPS 2020-06-22 12:26:03 +02:00