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

380 Commits

Author SHA1 Message Date
Renovate Bot
0fd952d9e5
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.1 2020-11-15 10:54:53 +00:00
Renovate Bot
2cd1fa2019
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27 2020-11-14 16:38:22 +00:00
Renovate Bot
9c70c91118
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.157 2020-11-12 01:45:59 +00:00
Renovate Bot
a6c8f3cf6c
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.156 2020-11-10 23:40:26 +00:00
Renovate Bot
c243dd6927
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.155 2020-11-10 01:55:24 +00:00
Renovate Bot
ba8a663aad
Update dependency com.konghq:unirest-java to v3.11.05 2020-11-09 02:43:09 +00:00
Renovate Bot
fdb603dad4
Update dependency com.konghq:unirest-java to v3.11.04 2020-11-07 14:52:52 +00:00
TheBusyBiscuit
19873de5a5
[CI skip] Merge pull request #2541 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.0
2020-11-07 10:00:38 +01:00
Renovate Bot
41f49877e3
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.154 2020-11-07 00:17:01 +00:00
Renovate Bot
255730dcb8
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.0 2020-11-05 11:17:16 +00:00
TheBusyBiscuit
c54dd1e6e4
[CI skip] Merge pull request #2538 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.14.0
2020-11-04 22:18:31 +01:00
Renovate Bot
58d47da62f
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.153 2020-11-04 21:05:26 +00:00
Renovate Bot
1b79a3791e
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.14.0 2020-11-04 19:52:30 +00:00
TheBusyBiscuit
57590b2ff3
[CI skip] Updated Spigot version 2020-11-03 18:32:14 +01:00
TheBusyBiscuit
1d8d1d3084
[CI skip] Merge pull request #2531 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.0
2020-11-03 18:31:50 +01:00
Renovate Bot
9789c5e46d
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.0 2020-11-02 23:30:09 +00:00
Renovate Bot
15b0bb1303
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.152 2020-11-02 23:30:00 +00:00
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
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
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
Daniel Walsh
41e384a0b3 Imaging local files in 2020 LULW 2020-06-20 20:02:03 +01:00
Renovate Bot
ee070f9fbc
Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-M5 2020-06-17 21:55:23 +00:00
TheBusyBiscuit
c915b3375b [Ci skip] Updated MockBukkit 2020-06-13 21:05:55 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
Renovate Bot
fa4bc980cd
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.2.4 2020-06-02 19:20:57 +00:00
TheBusyBiscuit
9297495cd3 [CI skip] Updated dependencies and undeprecated old Config class 2020-05-30 16:15:47 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
TheBusyBiscuit
a96f85ece4 [CI skip] Coverage ahoy! 2020-05-23 20:18:43 +02:00
TheBusyBiscuit
de93daf9be [CI skip] Updated MockBukkit 2020-05-22 16:40:26 +02:00
TheBusyBiscuit
1f2b45c3fd [Ci skip] Updated MockBukkit dependency 2020-05-20 17:13:04 +02:00
TheBusyBiscuit
f603841a7e [CI skip] Updated MockBukkit test dependency 2020-05-18 11:34:26 +02:00
TheBusyBiscuit
7242886585 [Ci skip] Fixed unit tests 2020-05-17 12:18:31 +02:00
TheBusyBiscuit
f1ecb2aed4 [CI skip] Fixed Unit Tests :o 2020-05-17 12:17:34 +02:00
TheBusyBiscuit
6a27bfd629 [CI skip] Updated the pom slightly 2020-05-16 16:12:30 +02:00
TheBusyBiscuit
13b1a7f947 Fixed some weird head issues 2020-05-16 12:32:56 +02:00
Renovate Bot
536f712c0f
Update dependency org.junit.jupiter:junit-jupiter to v5.6.2 2020-05-13 22:53:19 +00:00
TheBusyBiscuit
e79bf4e29b
Merge branch 'tests' into renovate/com.github.thebusybiscuit-cs-corelib2-0.x 2020-05-12 22:27:01 +02:00
Renovate Bot
78dc3a116f
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.19 2020-05-12 00:34:54 +00:00
TheBusyBiscuit
f30b212e96 Maven Surefire, I wanna talk to your manager (actually I don't) 2020-05-09 19:43:47 +02:00
TheBusyBiscuit
4f9ff597f3 ecnayonna na fo lleh eno era uoy ,eriferuS nevaM 2020-05-09 19:30:44 +02:00
TheBusyBiscuit
ada8081440 Please work 2020-05-09 19:25:29 +02:00
TheBusyBiscuit
3661c05d2a Trying this out 2020-05-09 18:52:35 +02:00
TheBusyBiscuit
c019ac8289 Testing to see if this works 2020-05-09 18:42:58 +02:00
TheBusyBiscuit
b908336cfc Updated pom.xml 2020-05-09 18:22:50 +02:00
TheBusyBiscuit
da95bb832d Fixes #1891 (actually fixed in a commit before the issue was posted) 2020-05-09 18:10:04 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
TheBusyBiscuit
dd159184a4 Refined pom.xml 2020-05-09 11:20:47 +02:00
TheBusyBiscuit
f598089826 Fixed Multiblocks tests 2020-05-09 10:24:19 +02:00
TheBusyBiscuit
a68f2503cb Updated pom.xml 2020-05-07 20:51:00 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
TheBusyBiscuit
b456da9ffc First Unit Tests 2020-05-06 22:08:15 +02:00