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

6371 Commits

Author SHA1 Message Date
Senne Van Rompaey
3acd6926ad
Merge branch 'master' into refactoring/third-party-integrations 2020-12-10 22:02:21 +01:00
TheBusyBiscuit
5aa5ca1aed
Merge pull request #2595 from AnotherMC/master
Fix ghost blocks
2020-12-10 21:51:00 +01:00
TheBusyBiscuit
8b45a8a009
[CI skip] Updated changelog 2020-12-10 21:50:36 +01:00
Patbox
28e5771ca8 Implement more suggestions 2020-12-10 12:38:31 +01:00
TheBusyBiscuit
eac09eea9e Switched to BlockFormEvent 2020-12-10 12:11:25 +01:00
TheBusyBiscuit
b07a54d515 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into performance/cobblestone 2020-12-10 12:04:48 +01:00
TheBusyBiscuit
e243ff7824
[CI skip] Merge pull request #2614 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.161
2020-12-10 10:09:46 +01:00
Renovate Bot
a23b97ceef
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.161 2020-12-10 04:25:38 +00:00
TheBusyBiscuit
70d6241f78
[CI skip] Merge pull request #2613 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.160
2020-12-10 01:29:22 +01:00
Renovate Bot
cc282c2887
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.160 2020-12-09 23:53:15 +00:00
TheBusyBiscuit
f0f545dd9f
Fixed changelog 2020-12-10 00:23:00 +01:00
TheBusyBiscuit
7b0f9c1300
Fixed naming 2020-12-10 00:22:14 +01:00
TheBusyBiscuit
0c1485aa7c
Merge branch 'master' into fix/sf-machine-hopper 2020-12-09 18:42:42 +01:00
TheBusyBiscuit
b03e037476 [CI skip] Fixed issues template 2020-12-09 15:03:54 +01:00
TheBusyBiscuit
8b4dc25053 [CI skip] Updated labels 2020-12-09 15:02:35 +01:00
TheBusyBiscuit
36be4c29de More refactoring 2020-12-09 13:33:34 +01:00
TheBusyBiscuit
7d9e726102 More refactoring 2020-12-09 12:39:24 +01:00
TheBusyBiscuit
88c81a9cc2 Added ItemsAdder support (fixes #2575) 2020-12-09 11:41:59 +01:00
TheBusyBiscuit
2e13cd2e88 Refactoring for third-party integrations 2020-12-08 21:07:48 +01:00
TheBusyBiscuit
f0b78dd356
[CI skip] Merge pull request #2602 from Slimefun/gitlocalize-14245
Categories Vi translate
2020-12-08 11:12:58 +01:00
TheBusyBiscuit
8ae533f327
[CI skip] Merge pull request #2607 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.17.0
2020-12-08 11:12:49 +01:00
Renovate Bot
8268b65237
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.17.0 2020-12-08 09:09:46 +00:00
Just Mango
555aa050a1 Translate categories_vi.yml via GitLocalize 2020-12-07 11:16:58 +00:00
svr333
d571fc5c18
Change speed to 45 instead of 90 2020-12-06 13:19:02 +01:00
svr333
434d469a0d
Add t3 Electric Ore Grinder 2020-12-06 02:01:39 +01:00
TheBusyBiscuit
56316426aa Updated to latest Slimefun version 2020-12-05 21:50:46 +01:00
TheBusyBiscuit
bd213a7789
No idea what that was doing here... 2020-12-05 21:45:42 +01:00
TheBusyBiscuit
9504e523f4
Merge branch 'master' into feature/bee-armor 2020-12-05 21:43:40 +01:00
TheBusyBiscuit
080bc42130 Updated more implementations 2020-12-05 21:35:43 +01:00
Patbox
7afb9b9791 Implement more suggestions 2020-12-05 20:51:30 +01:00
Patbox
ff634c0f5c Make code better 2020-12-05 20:22:03 +01:00
Patbox
f4633c528f Fix ghost blocks 2020-12-05 17:48:17 +01:00
TheBusyBiscuit
175a79ebdc Registered missing Listener 2020-12-05 14:36:04 +01:00
TheBusyBiscuit
036c156f40 Some more changes 2020-12-05 14:21:14 +01:00
TheBusyBiscuit
c84200d2c4 Some stuff + fixes #2560 2020-12-05 13:54:46 +01:00
TheBusyBiscuit
282367d6ff [CI skip] Removed an old version of bStats 2020-12-03 15:51:17 +01:00
TheBusyBiscuit
96c4d9081c
Merge pull request #2503 from Slimefun/optimization/cargo-filters
Cargo Net Optimization: Cached Item Filters
2020-12-03 15:41:35 +01:00
TheBusyBiscuit
761126c673
[CI skip] Updated changelog 2020-12-03 15:40:24 +01:00
TheBusyBiscuit
6f3059cbbc [CI skip] Updated README 2020-12-03 15:29:48 +01:00
TheBusyBiscuit
e717b77ddc [CI skip] Might as well push this today 2020-12-03 15:28:58 +01:00
TheBusyBiscuit
42d393296a
[CI skip] Added a release date for RC-18 2020-12-03 12:28:27 +01:00
TheBusyBiscuit
5d15a7e5cf Another small change 2020-12-03 10:38:03 +01:00
TheBusyBiscuit
e1a3bf730b Made requested changes 2020-12-03 10:34:05 +01:00
TheBusyBiscuit
90df68b0e0 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into optimization/cargo-filters 2020-12-03 10:23:18 +01:00
Daniel Walsh
487bd1aec3
[CI-Skip] Merge pull request #2589 from Slimefun/renovate/io.papermc-paperlib-1.x
Update dependency io.papermc:paperlib to v1.0.6
2020-12-02 19:25:44 +00:00
Renovate Bot
27967657e3
Update dependency io.papermc:paperlib to v1.0.6 2020-12-02 19:22:49 +00:00
TheBusyBiscuit
96e38608f9 Added 4 bricks -> 1 brick block recipe to the Electric Press 2020-12-01 16:37:51 +01:00
TheBusyBiscuit
5d0ed3570d Fixes #2583 2020-12-01 16:12:57 +01:00
TheBusyBiscuit
ac7bb44d98 Fixes #2585 2020-12-01 11:46:59 +01:00
TheBusyBiscuit
b4edc6c5bf Fixes #2496 2020-11-30 17:39:31 +01:00