1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

424 Commits

Author SHA1 Message Date
LinoxGH
6082abb9b6
Merge branch 'master' into ExplosivePickFix 2020-10-11 00:23:59 +03:00
LinoxGH
fdd33f9182
Update CHANGELOG.md 2020-10-11 00:20:02 +03:00
TheBusyBiscuit
83e8010e29 Lots of refactoring 2020-10-09 17:39:21 +02:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags 2020-10-09 11:46:47 +02:00
TheBusyBiscuit
a82eb7405a
[CI skip] Updated changelog 2020-10-08 21:20:38 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +02:00
TheBusyBiscuit
359cba3c13
[CI skip] Updated changelog 2020-10-08 14:36:58 +02:00
poma123
cd00848795
Merge branch 'master' into tags 2020-10-07 17:55:26 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
c3302d8cbd
Merge branch 'master' into tags 2020-10-07 17:44:27 +02:00
TheBusyBiscuit
354cb201c5
[CI skip] Updated changelog 2020-10-07 16:31:33 +02:00
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
7b179239e4
[CI skip] Updated changelog 2020-10-07 16:01:19 +02:00
TheBusyBiscuit
c33f73d2fe
[CI skip] Updated changelog 2020-10-07 14:30:01 +02:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02:00
TheBusyBiscuit
d09a7e0f93 Fixes #2391 2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5 Added NotConfigurable attribute 2020-10-06 21:01:18 +02:00
TheBusyBiscuit
b26924bf81
[CI skip] Updated changelog 2020-10-05 22:50:32 +02:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
TheBusyBiscuit
e83e194784
[CI skip] Updated changelog 2020-10-04 00:39:31 +02:00
TheBusyBiscuit
6b3ae3b1cf
Merge branch 'master' into tags 2020-10-03 22:05:13 +02:00
TheBusyBiscuit
a2cb2eb324
[CI skip] Updated changelog 2020-10-03 22:03:30 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
TheBusyBiscuit
49b0ec6a9e
[CI skip] Updated changelog 2020-10-03 21:29:13 +02:00
TheBusyBiscuit
ada6ce775c
[CI skip] Updated changelog 2020-10-03 21:13:46 +02:00
TheBusyBiscuit
815b5ce5c2
[CI skip] Updated changelog 2020-10-01 21:04:12 +02:00
TheBusyBiscuit
501394bd08
[CI skip] Updated changelog 2020-10-01 20:45:25 +02:00
LinoxGH
50e48ed87c
Merge branch 'master' into tags 2020-10-01 21:42:50 +03:00
TheBusyBiscuit
2e4f5d565f
[CI skip] Updated changelog 2020-10-01 20:28:28 +02:00
TheBusyBiscuit
2263c26d2c
[CI skip] Updated changelog 2020-10-01 11:00:51 +02:00
TheBusyBiscuit
9dcd4193f2
[CI skip] Updated changelog 2020-09-30 20:29:14 +02:00
TheBusyBiscuit
20de967306 Improvements to block ticking 2020-09-29 20:38:41 +02:00
TheBusyBiscuit
277ecb4a29
Merge branch 'master' into tags 2020-09-29 18:57:38 +02:00
TheBusyBiscuit
fd1a30be82
[Ci skip] Updated change log 2020-09-29 15:51:59 +02:00
TheBusyBiscuit
362b7bda63
Merge branch 'master' into tags 2020-09-28 16:01:30 +02:00
TheBusyBiscuit
35b25636d4
[CI skip] Updated changelog 2020-09-28 15:53:09 +02:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
TheBusyBiscuit
1bca830cb0
[CI skip] Updated changelog 2020-09-27 20:13:38 +02:00
TheBusyBiscuit
8365d1e6d9
Merge branch 'master' into tags 2020-09-22 15:33:56 +02:00
TheBusyBiscuit
e0a76fa0e8
[CI skip] Updated changelog 2020-09-22 15:32:06 +02:00
TheBusyBiscuit
4412b40709
Merge branch 'master' into tags 2020-09-21 15:59:08 +02:00
TheBusyBiscuit
a36dfc1151
[CI skip] Updated changelog 2020-09-21 15:47:06 +02:00
TheBusyBiscuit
2f37c2b8b7
Merge branch 'master' into tags 2020-09-21 13:24:44 +02:00
TheBusyBiscuit
5cd1d99b70 Fixes #2322 2020-09-21 13:23:14 +02:00
TheBusyBiscuit
9dfd43fda6 Fixed Climbing Pick having no animation in creative mode 2020-09-21 13:14:56 +02:00
TheBusyBiscuit
cdc495e62b Fixes #2325 2020-09-21 13:09:45 +02: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
TheBusyBiscuit
917bcce636 Fixed an issue with ChestTerminal 2020-09-18 10:48:36 +02:00
TheBusyBiscuit
5fb1ca2b8e
[CI skip] Updated changelog 2020-09-13 23:38:29 +02:00
TheBusyBiscuit
817ec43153
[CI skip] Updated changelog 2020-09-13 12:38:13 +02:00