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

2806 Commits

Author SHA1 Message Date
TheBusyBiscuit
8c8685b6de
Merge branch 'master' into fixes/blocks 2020-12-17 15:35:57 +01:00
TheBusyBiscuit
2ced45b485
Merge pull request #2609 from Slimefun/refactoring/third-party-integrations
Refactored integrations (+ Fixed #2575)
2020-12-17 15:30:16 +01:00
TheBusyBiscuit
d70e79ccfa
[CI skip] Merge pull request #2623 from Slimefun/gitlocalize-14291
messges_es
2020-12-17 13:36:21 +01:00
TheBusyBiscuit
41dfc92358
[CI skip] Merge pull request #2624 from Slimefun/gitlocalize-14292
researches_es
2020-12-17 13:33:55 +01:00
TheBusyBiscuit
e6114f7e4b
[CI skip] Updated translators list 2020-12-17 13:33:23 +01:00
TheBusyBiscuit
dbaca5f7aa
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-12-16 15:53:50 +01:00
DaHolyCheese
b99f04eab4 Translate researches_es.yml via GitLocalize 2020-12-12 14:51:08 +00:00
Luu7
67112e29ac Translate messages_es.yml via GitLocalize 2020-12-12 14:50:26 +00:00
TheBusyBiscuit
86e677cd93 Translate messages_de.yml via GitLocalize 2020-12-12 13:23:55 +00:00
TheBusyBiscuit
e56ba77002 Translate researches_de.yml via GitLocalize 2020-12-12 13:23:54 +00:00
TheBusyBiscuit
a95652f718
[CI skip] Merge pull request #2620 from Slimefun/gitlocalize-14285
add zh-TW version of bee armor research
2020-12-12 14:05:04 +01:00
TheBusyBiscuit
f32be5649a
[CI skip] Merge pull request #2619 from Slimefun/gitlocalize-14284
add zh-TW version of bee armor message
2020-12-12 14:04:29 +01:00
TheBusyBiscuit
f84faab48d
[CI skip] Merge pull request #2615 from Slimefun/gitlocalize-14281
Updated Russian localizations
2020-12-12 14:03:49 +01:00
TheBusyBiscuit
88b6e6d9af
[CI skip] Merge pull request #2617 from Slimefun/gitlocalize-14283
Updated Hungarian translations
2020-12-12 14:02:53 +01:00
TheBusyBiscuit
d2e1ac9b6e
[CI skip] Merge pull request #2621 from Slimefun/gitlocalize-14287
Update Japanese translation file.
2020-12-12 14:02:06 +01:00
TheBusyBiscuit
3d54080001 [CI skip] A bit o refactoring 2020-12-12 14:00:11 +01:00
bito-blosh
3825fa5d4b Translate researches_ja.yml via GitLocalize 2020-12-11 20:09:09 +00:00
TheBusyBiscuit
def67399c4 Translate messages_ja.yml via GitLocalize 2020-12-11 20:09:06 +00:00
HeroBrineKing
4e510aefc8 Translate researches_zh-TW.yml via GitLocalize 2020-12-11 13:07:36 +00:00
TheBusyBiscuit
4fd973b3b1 Translate messages_zh-TW.yml via GitLocalize 2020-12-11 13:07:09 +00:00
poma123
b43277c0f4 Translate researches_hu.yml via GitLocalize 2020-12-11 12:36:35 +00:00
TheBusyBiscuit
f36743cfe3 Translate messages_hu.yml via GitLocalize 2020-12-11 12:36:33 +00:00
SoSeDiK
fc97648abb Translate researches_ru.yml via GitLocalize 2020-12-11 12:11:41 +00:00
SoSeDiK
8d7e15df81 Translate messages_ru.yml via GitLocalize 2020-12-11 12:11:38 +00:00
TheBusyBiscuit
498da0e00a
[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor
Added Bee Armor
2020-12-11 13:05:20 +01:00
TheBusyBiscuit
3c72abad7b
Merge branch 'master' into fixes/blocks 2020-12-10 22:05:25 +01:00
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
Patbox
28e5771ca8 Implement more suggestions 2020-12-10 12:38:31 +01:00
TheBusyBiscuit
7b0f9c1300
Fixed naming 2020-12-10 00:22:14 +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
Just Mango
555aa050a1 Translate categories_vi.yml via GitLocalize 2020-12-07 11:16:58 +00: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
e717b77ddc [CI skip] Might as well push this today 2020-12-03 15:28:58 +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