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

6379 Commits

Author SHA1 Message Date
TheBusyBiscuit
bd06d0daec Wrong import 2020-12-22 15:58:18 +01:00
TheBusyBiscuit
2cd0378306 Thank god we have Unit Tests :monkaS: 2020-12-22 15:53:00 +01:00
TheBusyBiscuit
b00afa4790 Refactoring 2020-12-22 15:47:58 +01:00
TheBusyBiscuit
df08b6ff13
[CI skip] Merge pull request #2642 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.07
2020-12-22 13:03:36 +01:00
Renovate Bot
7c424ce538
Update dependency com.konghq:unirest-java to v3.11.07 2020-12-21 21:34:58 +00:00
TheBusyBiscuit
65fc3cea4e Finalized the fix for #2636 2020-12-21 12:27:16 +01:00
TheBusyBiscuit
0d5527793c
[CI skip] Updated changelog 2020-12-20 23:56:00 +01:00
Daniel Walsh
2c4c7579ae
Merge pull request #2637 from AnotherMC/master
Temporary fix for #2636
2020-12-20 22:20:03 +00:00
TheBusyBiscuit
6ada0d87d4
[CI skip] Merge pull request #2635 from Slimefun/gitlocalize-14424
Update zh-CN translation
2020-12-20 19:57:08 +01:00
Patbox
d7a8903211 Temponary fix for #2636 2020-12-19 16:30:38 +01:00
Nameless
6be86e99be Translate researches_zh-CN.yml via GitLocalize 2020-12-19 14:28:02 +00:00
TheBusyBiscuit
b8538c765a Translate messages_zh-CN.yml via GitLocalize 2020-12-19 14:28:00 +00:00
Nameless
7659ae892f Translate messages_zh-CN.yml via GitLocalize 2020-12-19 14:27:59 +00:00
TheBusyBiscuit
301a45cea7
[CI skip] Updated workflow label reference 2020-12-19 13:52:09 +01:00
svr333
5aa34c7a6e
Update recipe 2020-12-17 21:05:12 +01:00
TheBusyBiscuit
2ff24c2889 Fixed compilation 2020-12-17 19:45:43 +01:00
TheBusyBiscuit
26a64004d2
Merge branch 'master' into fixes/blocks 2020-12-17 19:42:56 +01:00
TheBusyBiscuit
f755e943c4 [CI skip] Refactoring and code cleanup 2020-12-17 18:30:51 +01:00
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
TheBusyBiscuit
88f2f1ea4b
[CI skip] Merge pull request #2626 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.06
2020-12-13 20:35:40 +01:00
Daniel Walsh
8baf55f454 Fix 2020-12-13 17:32:55 +00:00
Daniel Walsh
ce3db29785 Added PR labels workflow file 2020-12-13 17:25:25 +00:00
Renovate Bot
55782ff4ce
Update dependency com.konghq:unirest-java to v3.11.06 2020-12-13 14:13:13 +00:00
TheBusyBiscuit
5a8ecdbf1e
[CI skip] Merge pull request #2625 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.18.0
2020-12-13 12:34:04 +01:00
Renovate Bot
aa028854e1
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.18.0 2020-12-12 20:39:04 +00:00
DaHolyCheese
b99f04eab4 Translate researches_es.yml via GitLocalize 2020-12-12 14:51:08 +00:00
DaHolyCheese
557095d42a Translate messages_es.yml via GitLocalize 2020-12-12 14:50:27 +00:00
Luu7
67112e29ac Translate messages_es.yml via GitLocalize 2020-12-12 14:50:26 +00:00
TheBusyBiscuit
13e93e6145
[CI skip] Merge pull request #2622 from Slimefun/gitlocalize-14289
Updated german translations
2020-12-12 14:26:12 +01:00
Doeniel
cb2aa0646e Translate messages_de.yml via GitLocalize 2020-12-12 13:23:57 +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
7dee366fc2 Translate recipes_de.yml via GitLocalize 2020-12-12 13:23:53 +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
bito-blosh
997afb09a4 Translate messages_ja.yml via GitLocalize 2020-12-11 20:09:07 +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
HeroBrineKing
07bd66fc2d Translate messages_zh-TW.yml via GitLocalize 2020-12-11 13:07:10 +00:00
TheBusyBiscuit
4fd973b3b1 Translate messages_zh-TW.yml via GitLocalize 2020-12-11 13:07:09 +00:00