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

6126 Commits

Author SHA1 Message Date
TheBusyBiscuit
5edf61404b Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-02-05 14:15:17 +01:00
TheBusyBiscuit
8526cf679f Small visual changes 2021-02-05 14:12:47 +01:00
TheBusyBiscuit
155b2fc637 Some small visual changes 2021-02-05 14:12:17 +01:00
TheBusyBiscuit
9f2d2ddd45
[CI skip] Re-enable MockBukkit-blocked test 2021-02-05 00:12:19 +01:00
TheBusyBiscuit
cdef859062
[CI skip] Merge pull request #2802 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.24.0
2021-02-05 00:11:25 +01:00
TheBusyBiscuit
dca2157f63
[CI skip] Merge pull request #2803 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.7.1
2021-02-05 00:10:58 +01:00
Renovate Bot
d7aa2893b0
Update dependency org.junit.jupiter:junit-jupiter to v5.7.1 2021-02-04 20:50:54 +00:00
Renovate Bot
c01a3c461c
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.24.0 2021-02-04 20:50:48 +00:00
TheBusyBiscuit
600e020325
[CI skip] Merge pull request #2801 from Slimefun/gitlocalize-14919
Updated czech translations
2021-02-04 20:45:48 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java 2021-02-04 20:12:47 +01:00
LirCZE
a2c3e24a95 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:50 +00:00
100petr
e6a9511136 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:49 +00:00
jakmanda05
bbce73ce76 Translate recipes_cs.yml via GitLocalize 2021-02-04 19:07:47 +00:00
100petr
c94add139b Translate categories_cs.yml via GitLocalize 2021-02-04 19:07:45 +00:00
Jan Vrska
405b553f0b Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:44 +00:00
frfole
08942610af Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:43 +00:00
100petr
4c16273097 Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:42 +00:00
Renzotom
4b4ef00ecb Translate researches_cs.yml via GitLocalize 2021-02-04 19:07:41 +00:00
TheBusyBiscuit
a2f0544378
[CI skip] Merge pull request #2798 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.174
2021-02-04 00:51:33 +01:00
TheBusyBiscuit
51f1b67326
[CI skip] Updated names 2021-02-04 00:51:19 +01:00
TheBusyBiscuit
a9f74ed28d
[CI skip] Added renovate branch rule 2021-02-04 00:50:31 +01:00
TheBusyBiscuit
c747e86ae5
[CI skip] Update renovate config 2021-02-04 00:42:18 +01:00
Renovate Bot
d37c7b41e1
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.174 2021-02-03 23:26:42 +00:00
TheBusyBiscuit
fe2e5c1444
Update CHANGELOG.md 2021-02-02 18:34:05 +01:00
Daniel Walsh
36639fd22c
Merge pull request #2791 from Slimefun/feature/componentify-versions-subcommand 2021-02-02 17:31:35 +00:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked 2021-02-02 17:30:45 +00:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar
Allow Talismans to use the Actionbar
2021-02-02 17:27:47 +00:00
Daniel Walsh
636d44cfb8
oops forgot 1 space 2021-02-02 12:25:43 +00:00
TheBusyBiscuit
baf3bd0dfb
[CI skip] Updated workflow 2021-02-02 13:09:26 +01:00
Daniel Walsh
498050dc81
Apply suggestions from code review
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-02-02 11:51:56 +00:00
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab Fixes #2794 2021-02-02 09:39:22 +01:00
Daniel Walsh
d41f276543
Lots more hover and click! 2021-02-01 17:14:21 +00:00
Daniel Walsh
e11929b587
Add java ver and hover to versions subcommand 2021-02-01 16:07:06 +00:00
TheBusyBiscuit
fe42f6fa9f Nether Wart Blocks can be turned into Nether Warts using a Grind Stone 2021-02-01 10:47:31 +01:00
TheBusyBiscuit
ddfac01d35
[CI skip] Merge pull request #2790 from Slimefun/gitlocalize-14897
Those files completed
2021-01-31 10:34:58 +01:00
PaladinBear
6f8134a800 Translate researches_he.yml via GitLocalize 2021-01-31 07:52:59 +00:00
PaladinBear
dabc8bbbc0 Translate messages_he.yml via GitLocalize 2021-01-31 07:52:58 +00:00
TheBusyBiscuit
418b6ffa74
[CI skip] Merge pull request #2787 from Slimefun/gitlocalize-14895 2021-01-31 00:28:14 +01:00
TheBusyBiscuit
c78092bb85
[CI skip] Updated translators list 2021-01-31 00:27:14 +01:00
amarcais53
704e100e07 Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:29 +00:00
Maxime
d6ae3ac81d Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:28 +00:00
Pierre
dbe127a1d1 Translate messages_fr.yml via GitLocalize 2021-01-30 21:07:27 +00:00
TheBusyBiscuit
5aaed5d814
[CI skip] Updated changelog 2021-01-30 13:14:27 +01:00
TheBusyBiscuit
b4d1894d8f
Merge pull request #2757 from StarWishsama/magician-talisman-fix
Fixes #2679
2021-01-29 16:34:53 +01:00
TheBusyBiscuit
c523fc279f
[CI skip] Updated changelog 2021-01-29 16:34:32 +01:00
TheBusyBiscuit
a80269b7d9 [CI skip] Formatting 2021-01-29 12:19:40 +01:00
TheBusyBiscuit
96f93bd808
[CI skip] Merge pull request #2786 from Slimefun/gitlocalize-14894
Updated german translations
2021-01-29 11:51:45 +01:00
TheBusyBiscuit
f207601244 Translate messages_de.yml via GitLocalize 2021-01-29 10:51:06 +00:00
TheBusyBiscuit
d1b907dc02 Translate researches_de.yml via GitLocalize 2021-01-29 10:51:04 +00:00