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

443 Commits

Author SHA1 Message Date
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