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

5464 Commits

Author SHA1 Message Date
ProfElements
fada355fe5 Add research and make Book Binder recipe slightly harder 2021-01-14 14:39:28 -06:00
ProfElements
23049b64fa Make request changes, simpliflied BookBinder 2021-01-13 15:25:28 -06:00
ProfElements
088a08952b Make requested changes, made combineEnchantments better generally 2021-01-13 14:35:17 -06:00
ProfElements
93997718c0 Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if 2021-01-09 15:25:59 -06:00
ProfElements
23d0f0ae2a Made requested changes. 2021-01-07 14:41:59 -06:00
ProfElements
b26376078e Made requested changes. Defaulted has-custom-level to false because no-bypass is true 2021-01-06 16:03:44 -06:00
ProfElements
4eda0923bf Make all ItemSettings reasonable values 2021-01-04 14:14:30 -06:00
ProfElements
685614803c Add ItemSettings, hasCustomMaxLevel, customMaxLevel. Bypasses vanilla but not a custom defined max 2021-01-03 13:53:43 -06:00
ProfElements
62f0019a7f Lower time requirement to deal with large enchantments books (>4 enchantments) 2021-01-03 12:36:08 -06:00
ProfElements
fe8b0c21f7 Fixed code inconsistencies 2021-01-03 12:35:00 -06:00
ProfElements
c162e5194d
Merge branch 'master' into master 2021-01-03 05:10:28 +00:00
ProfElements
a42af430e3 Add deniesVanillaRules ItemSetting, this can make the Book Binder adhere to vanilla rules 2021-01-02 22:50:48 -06:00
ProfElements
b23869f037 Added Book Binder 2021-01-02 22:26:59 -06: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
DNBGlol
badc3ff2f4 Translate categories_bg.yml via GitLocalize 2021-01-02 19:42:32 +00: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
TheBusyBiscuit
994f6de132
[CI skip] Merge pull request #2673 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.167
2021-01-02 13:22:05 +01:00
Renovate Bot
8c5edcd673
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.167 2021-01-02 06:40:15 +00: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
ee50836181
[CI skip] Merge pull request #2669 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.165
2021-01-01 15:42:30 +01:00
Renovate Bot
5584a86f18
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.165 2021-01-01 01:48:48 +00: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
292ed2be05
[CI skip] Merge pull request #2665 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.164
2020-12-30 02:25:02 +01:00
Renovate Bot
7dbc9a7294
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.164 2020-12-29 22:11:57 +00:00
Daniel Walsh
7f02c551db
[CI Skip] Merge pull request #2661 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.163
2020-12-28 21:52:20 +00:00
Renovate Bot
a323aa2029
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.163 2020-12-28 21:31:02 +00:00
TheBusyBiscuit
e021ee8b73
[CI skip] Merge pull request #2660 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.20.0
2020-12-28 17:30:48 +01:00
Renovate Bot
0ffa2da582
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.20.0 2020-12-28 14:10:09 +00:00
TheBusyBiscuit
d9cdbad824
[CI skip] Updated label reference in workflow 2020-12-27 18:51:01 +01:00
TheBusyBiscuit
d048f7f8d4
Merge pull request #2648 from WalshyDev/fix/stomper-boots-moving-immovable-entities
Fixes #2647
2020-12-24 02:27:49 +01:00
TheBusyBiscuit
43af06f888
[CI skip] Updated changelog 2020-12-24 02:27:41 +01:00
TheBusyBiscuit
3be87294ca
[CI skip] Merge pull request #2649 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.09
2020-12-24 02:26:18 +01:00
Renovate Bot
a0bd1a6056
Update dependency com.konghq:unirest-java to v3.11.09 2020-12-24 00:29:40 +00: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
TheBusyBiscuit
801b1759d2
[CI skip] Merge pull request #2644 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.08
2020-12-22 20:49:44 +01:00
Renovate Bot
a1384360b6
Update dependency com.konghq:unirest-java to v3.11.08 2020-12-22 19:18:33 +00:00
TheBusyBiscuit
cb6efba888
[CI skip] Updated issues template 2020-12-22 18:21:49 +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