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

6012 Commits

Author SHA1 Message Date
Senne
40635c7bd5
Move to var 2021-07-20 21:25:47 +02:00
svr333
7109873c16
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-06-28 17:00:32 +02:00
Senne
369efa6be3
Resolve merge conflict 2021-06-28 10:59:09 +02:00
Senne
c16e444995
Split up if statements 2021-06-28 10:57:17 +02:00
svr333
ffcb8d7146
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-06-14 14:20:16 +02:00
Senne
e40f7996bf
Clean up equalsItemMeta() 2021-06-09 12:36:48 +02:00
Thehrz
9b8eff4977 Fixes #equalsItemMeta 2021-02-28 12:28:35 +08:00
Thehrz
45c807c6bd Fixes 2021-02-20 22:07:19 +08:00
Thehrz
bb0ef24188 Fixes #2677 2021-02-20 20:06:03 +08:00
TheBusyBiscuit
c09773fcef
[CI skip] Manually sync czech translations 2021-02-13 13:10:45 +01:00
TheBusyBiscuit
c27eb2959a
[CI skip] Manually update dutch translations... 2021-02-12 20:09:19 +01:00
TheBusyBiscuit
0564776bb7
[CI skip] Merge pull request #2820 from Slimefun/gitlocalize-14964
Updated dutch categories
2021-02-12 18:35:57 +01:00
TheBusyBiscuit
ce643ad87f
Update Translators.java 2021-02-12 18:35:44 +01:00
peppower
40754d7da0 Translate categories_nl.yml via GitLocalize 2021-02-12 17:33:32 +00:00
TheBusyBiscuit
686fbf28c6
[CI skip] Merge pull request #2819 from Slimefun/gitlocalize-14960
Bulgarian Language - Fixed Some Mistakes & Polished Translations
2021-02-12 18:03:51 +01:00
Nikolay
eebaa069c9 Translate messages_bg.yml via GitLocalize 2021-02-12 16:08:55 +00:00
TheBusyBiscuit
854c3335e9 Fixes #2818 2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66 Fixes #2817 2021-02-09 17:08:49 +01:00
TheBusyBiscuit
45a48288b2
[CI skip] Merge pull request #2815 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.1.35
2021-02-09 10:13:13 +01:00
Renovate Bot
b0355d1814
Update dependency com.github.LoneDev6:itemsadder-api to v2.1.35 2021-02-08 21:36:51 +00:00
TheBusyBiscuit
520208d353
[CI skip] Added compatibility label 2021-02-08 19:53:01 +01:00
TheBusyBiscuit
b224123918 Fixes #2804 2021-02-07 18:26:08 +01:00
TheBusyBiscuit
d3f4ca4779 Proper error-handling for addon inventories 2021-02-07 16:06:06 +01:00
TheBusyBiscuit
e47d0171cc Fixes #2810 2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9e83b4af00 Fixes #2809 2021-02-06 20:23:32 +01:00
TheBusyBiscuit
7ddd0469eb Deprecated Automated Crafting Chamber (soon to be replaced) 2021-02-06 19:32:41 +01:00
TheBusyBiscuit
452e99dbee
[CI skip] Merge pull request #2808 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.11
2021-02-06 16:07:21 +01:00
Renovate Bot
aeef442935
Update dependency com.konghq:unirest-java to v3.11.11 2021-02-06 15:03:51 +00:00
TheBusyBiscuit
47743b632e Fixed an exception when disabled in an invalid environment. 2021-02-06 11:18:09 +01:00
TheBusyBiscuit
dec868284d Updated dependencies 2021-02-06 11:11:58 +01:00
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