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

2847 Commits

Author SHA1 Message Date
TheBusyBiscuit
e36027fb48
Merge branch 'master' into fixes/blocks 2021-01-06 21:06:26 +01:00
TheBusyBiscuit
22f308884c
[CI skip] Merge pull request #2689 from Slimefun/gitlocalize-14616
Updated portuguese (brazil) translations
2021-01-06 20:58:32 +01:00
TheBusyBiscuit
5fae6f1c37
[CI skip] Updated translators list 2021-01-06 20:57:58 +01:00
Gustavo de Souza
47d5d356d3 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:19 +00:00
DayOS
389dc388ed Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:18 +00:00
Marcio
c613d1220f Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:16 +00:00
Sxigames
58113d9aff Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:15 +00:00
FaolanMalcadh
1fa59c7d31 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:14 +00:00
TheBusyBiscuit
a2be3d1255 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:13 +00:00
krazybeat
a65a61a557 Translate messages_pt-BR.yml via GitLocalize 2021-01-06 19:56:12 +00:00
Gustavo de Souza
cee50cd615 Translate resources_pt.yml via GitLocalize 2021-01-06 19:48:33 +00:00
TheBusyBiscuit
75b72eb630 Removed deprecated stuff 2021-01-06 16:26:40 +01:00
TheBusyBiscuit
74f8204b75 [Ci skip] Refactoring 2021-01-06 14:23:49 +01:00
TheBusyBiscuit
a1ce83b58a [CI skip] Removed redundant modifiers 2021-01-06 12:24:56 +01:00
TheBusyBiscuit
00902c8738
Merge pull request #2666 from Slimefun/chore/craftbukkit-warning
Enforce Server Software requirements
2021-01-03 19:50:51 +01:00
TheBusyBiscuit
ef0d557b62
[CI skip] Merge pull request #2678 from Slimefun/gitlocalize-14569
Updated bulgarian translations
2021-01-02 20:43:50 +01:00
TheBusyBiscuit
c637b2fd0c
[CI skip] Updated translators list 2021-01-02 20:43:29 +01:00
Nikolay
3acdcec70f Translate categories_bg.yml via GitLocalize 2021-01-02 19:42:31 +00:00
Nikolay
e89363e8bb Translate recipes_bg.yml via GitLocalize 2021-01-02 19:42:30 +00:00
TheBusyBiscuit
60acccfb28
[CI skip] Merge pull request #2671 from Slimefun/gitlocalize-14557
update translation
2021-01-02 20:37:25 +01:00
TheBusyBiscuit
1d95455429
[CI skip] Merge pull request #2672 from Slimefun/gitlocalize-14558
update translation
2021-01-02 20:37:09 +01:00
TheBusyBiscuit
df2dce0c95
[CI skip] Updated translators list 2021-01-02 20:35:54 +01:00
Aeris One
863306d2df Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:21 +00:00
Pierre
270382d7ec Translate messages_fr.yml via GitLocalize 2021-01-01 16:07:19 +00:00
Aeris One
b23972c7dd Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:53 +00:00
TheRetix
b41a4df823 Translate researches_fr.yml via GitLocalize 2021-01-01 16:06:52 +00:00
TheBusyBiscuit
db789f1b0d A little bit of additional refactoring 2021-01-01 00:45:05 +01:00
TheBusyBiscuit
f2dd3a0125 Fixes #2655 2020-12-31 17:38:51 +01:00
TheBusyBiscuit
aa98bd0ba2 Fixes #2664 2020-12-31 17:08:50 +01:00
TheBusyBiscuit
bd9d496b4d Enforce Server Software requirements 2020-12-31 16:33:43 +01:00
Daniel Walsh
9c31c746dd Requested changes 2020-12-23 22:16:45 +00:00
Daniel Walsh
6cf2051e60 Panda smells 2020-12-23 14:56:51 +00:00
Daniel Walsh
00c233dee5 Move to a method 2020-12-23 14:32:47 +00:00
Daniel Walsh
2872cf8a2e Fixed #2647 2020-12-23 14:17:35 +00:00
Daniel Walsh
2c4c7579ae
Merge pull request #2637 from AnotherMC/master
Temporary fix for #2636
2020-12-20 22:20:03 +00: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
Nameless
7659ae892f Translate messages_zh-CN.yml via GitLocalize 2020-12-19 14:27:59 +00: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
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