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

501 Commits

Author SHA1 Message Date
TheBusyBiscuit
487108df14 Fixes #2505 2020-10-25 14:40:05 +01:00
TheBusyBiscuit
cf283c24ab
[CI skip] Updated changelog 2020-10-20 17:42:57 +02:00
TheBusyBiscuit
48f8311a20
[CI skip] Updated changelog 2020-10-20 16:45:26 +02:00
TheBusyBiscuit
df03c4bd8d
[CI skip] Updated changelog 2020-10-19 12:49:43 +02:00
TheBusyBiscuit
95636818f5
[CI skip] Updated changelog 2020-10-18 19:21:46 +02:00
TheBusyBiscuit
e054fe6682 Fixes #2448 2020-10-18 13:17:18 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
TheBusyBiscuit
e18c7cb245 Fixed a dupe bug with mcMMO 2020-10-15 13:50:12 +02:00
TheBusyBiscuit
88cf1f2df2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 14:57:10 +02:00
TheBusyBiscuit
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +02:00
TheBusyBiscuit
f75da6af33
[Ci skip] Seting a release date for RC-17 2020-10-14 14:40:10 +02:00
TheBusyBiscuit
42f849d891 Fixes #2423 2020-10-14 13:31:02 +02:00
TheBusyBiscuit
1ffe2fd493 Fixes #2411 2020-10-14 00:51:21 +02:00
TheBusyBiscuit
50e926d18a Fixes #2457 2020-10-14 00:34:04 +02:00
TheBusyBiscuit
de1eaca1dc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
8dfb235488
[CI skip] Updated changelog 2020-10-13 23:21:15 +02:00
TheBusyBiscuit
5c0b7e2ee2 Fixes #2468 2020-10-13 21:44:24 +02:00
TheBusyBiscuit
eeffb30f4a
[CI skip] Updated changelog 2020-10-13 01:52:07 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector
Energy Connectors
2020-10-12 15:49:50 +02:00
TheBusyBiscuit
612aad5d95 Fixes #2424 2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164 Fixes #2450 2020-10-12 11:52:23 +02:00
TheBusyBiscuit
14e18d2962 Fixes #2455 2020-10-12 11:47:13 +02:00
TheBusyBiscuit
c65687acf7 [CI skip] Updated changelog 2020-10-11 18:09:03 +02:00
TheBusyBiscuit
bbe196e838
[CI skip] Updated changelog 2020-10-11 13:45:53 +02:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector 2020-10-11 00:26:43 +03:00
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
LinoxGH
8ce474331e
Update CHANGELOG.md 2020-10-10 16:05:41 +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
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	CHANGELOG.md
2020-09-11 10:33:02 +02:00
TheBusyBiscuit
5989fde476
[CI skip] Updated changelog 2020-09-11 10:21:07 +02:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
TheBusyBiscuit
a30d41ea9e
[CI skip] Updated change log 2020-09-09 11:31:52 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
TheBusyBiscuit
239df5cc30
[CI skip] Updated change log 2020-09-07 12:45:27 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
TheBusyBiscuit
ff99da0b7d
[Ci skip] Updated change log 2020-09-05 22:15:40 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
c156a317a5 [CI skip] Updated change log 2020-09-03 20:06:53 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
c5630791c0 Added item break sound to some tools 2020-09-02 12:19:18 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
3d22e42bef
Merge pull request #2270 from LinoxGH/master
Fixes #2265 <Tested>
2020-08-31 19:56:05 +02:00
TheBusyBiscuit
8073b5dafb Fixes #2266 2020-08-31 19:49:25 +02:00
LinoxGH
6dba662d4b
Merge branch 'master' into master 2020-08-31 20:34:15 +03:00
TheBusyBiscuit
68b9a0aed8 Fixes #2269 (+ refactoring) 2020-08-31 19:08:15 +02:00
LinoxGH
4346d374d8
Update CHANGELOG.md 2020-08-31 18:57:06 +03:00
LinoxGH
e8498f8c0c
Update CHANGELOG.md 2020-08-30 18:15:59 +03:00