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

4415 Commits

Author SHA1 Message Date
TheBusyBiscuit
d2754f06fc [CI skip] A bit refactoring 2020-07-22 18:11:43 +02:00
TheBusyBiscuit
4b4a9c2e11
Merge pull request #2108 from poma123/master
Added BONE_BLOCK to GrindStone
2020-07-22 15:32:38 +02:00
TheBusyBiscuit
86c253c929 [CI skip] Updated change log 2020-07-22 15:32:26 +02:00
Daniel Walsh
2646eba615 Small change 2020-07-21 14:51:04 +01:00
Daniel Walsh
f632dee560 Modify changelog 2020-07-21 13:59:48 +01:00
Daniel Walsh
52a3cbae41 Merge master 2020-07-21 13:57:40 +01:00
Poma123
5fa4e8b083
Added BONE_BLOCK to GrindStone 2020-07-21 13:51:08 +02:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
a1952edde3
Merge pull request #2106 from TheBusyBiscuit/paper
Optimizations for Paper (cargo network optimizations)
2020-07-21 10:17:46 +02:00
TheBusyBiscuit
6eebb79314 Fixed 2020-07-21 09:56:29 +02:00
Daniel Walsh
58dbbd8944 Better handling of downloaded files, typo fix and small changes 2020-07-21 08:47:36 +01:00
TheBusyBiscuit
2d64f37999
Update CHANGELOG.md 2020-07-20 19:33:03 +02:00
TheBusyBiscuit
7554b12c66
[CI skip] Maybe not so useful 2020-07-20 17:40:21 +02:00
TheBusyBiscuit
484f3d7c12
[CI skip] Created CODEOWNERS file 2020-07-20 17:34:56 +02:00
Daniel Walsh
d31a293486 Requested changes 2020-07-20 16:04:49 +01:00
Daniel Walsh
d252e5a2b5 final final final small thing 2020-07-20 15:51:32 +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
50f034b3e3 Documentation 2020-07-20 15:31:32 +01:00
TheBusyBiscuit
29b26ed327 Made requested changes 2020-07-20 16:30:20 +02:00
Daniel Walsh
fb40bffdce Small change 2020-07-20 15:17:24 +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
397f194029 Fixed two synchronization issues 2020-07-20 13:08:13 +02:00
TheBusyBiscuit
fd10f2ea4c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into paper 2020-07-20 12:48:25 +02:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-07-20 12:46:12 +02:00
TheBusyBiscuit
613bcd86b8 Fixes #2093 2020-07-20 12:43:05 +02:00
TheBusyBiscuit
f4c0c9f905 Minor changes 2020-07-20 10:49:59 +02:00
TheBusyBiscuit
64b59e3a02 Spigot is now called "Spigot" 2020-07-20 03:05:49 +02:00
TheBusyBiscuit
c1d6021216 Optimized teleportations 2020-07-20 02:31:58 +02:00
TheBusyBiscuit
045cdf1090 Added performance improvements for Block States 2020-07-20 02:22:24 +02: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
TheBusyBiscuit
8042deb591 Some small improvements 2020-07-19 10:31:12 +02:00
TheBusyBiscuit
7d82bfe35d
[CI skip] Merge pull request #2101 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.4.4
2020-07-18 22:18:12 +02:00
Renovate Bot
88b24dc4ec
Update dependency org.mockito:mockito-core to v3.4.4 2020-07-18 19:51:01 +00:00
TheBusyBiscuit
41e52b5285
[CI skip] Merge pull request #2095 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.4.3
2020-07-17 14:48:18 +02:00
Renovate Bot
b75deaf02e
Update dependency org.mockito:mockito-core to v3.4.3 2020-07-17 12:45:02 +00:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
TheBusyBiscuit
a42c62dd04 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-16 21:53:26 +02:00
TheBusyBiscuit
ae5e97a81b
[CI skip] Merge pull request #2094 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.4.2
2020-07-16 21:53:05 +02:00
Renovate Bot
7dd13ec57e
Update dependency org.mockito:mockito-core to v3.4.2 2020-07-16 19:47:31 +00:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
75ca7f1d4b Cargo performance improvement 2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305 Relocated a class 2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705 Refactoring 2020-07-15 18:50:26 +02:00