mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
6,057 Commits 1 Branch 0 Tags 64 MiB
16110b85cc
Commit Graph

6057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vravinite
352d1c0823 Translate recipes_es.yml via GitLocalize 2021-01-24 19:21:48 +00:00
Luu7
794d184a41 Translate researches_es.yml via GitLocalize 2021-01-24 19:21:47 +00:00
Luu7
0da0468b23 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:46 +00:00
dylan
cd643cabb5 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:45 +00:00
TheBusyBiscuit
f958385f3d Translate messages_es.yml via GitLocalize 2021-01-24 19:21:44 +00:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00
StarWishsama
8302c0c932 fix: add missing judge in getRandomEnchantment 2021-01-24 11:01:42 +08:00
StarWishsama
9e49071161 feat: Add ItemSetting for magician talisman 
This setting can set whether books can be enchanted.
 2021-01-24 10:59:55 +08:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public 
Make RechargeableHelper public
 2021-01-23 16:11:29 +01:00
TheBusyBiscuit
2ceef773c6 Finished fix for #2754 2021-01-23 15:32:37 +01:00
TheBusyBiscuit
1b4504a8cf Added a Unit Test to verify that #2754 is fixed 2021-01-23 15:20:18 +01:00
TheBusyBiscuit
389a2978c0 Fixes #2754 2021-01-23 14:25:10 +01:00
StarWishsama
48165dd138 fix: add enchant item check in filter 2021-01-23 18:49:42 +08:00
Name1ess
a94567333a
fix: add bypass for book 2021-01-23 18:45:31 +08:00
TheBusyBiscuit
83c2c6a915 [CI skip] Refactoring 2021-01-22 22:00:27 +01:00
Keaton
76a0ea1fdc
Check inv maxStackSize 
As mentioned in CS-CoreLib2's #141 and #142 PR's, previous iterations of Slimefun AContainers would not consider the underlying Inventory's max stack size when determining sizing or pushing items. This commit changes DirtyChestMenus to act similarly by storing a variable defined as the lower of the Inventory's max stack size and the ItemStack's max stack size in a slot.
 2021-01-22 13:40:01 -06:00
TheBusyBiscuit
1169896034
Update bug-report.md 2021-01-22 13:56:39 +01:00
TheBusyBiscuit
913da23667
Merge pull request #2753 from Slimefun/gitlocalize-14845 
Added hebrew language
 2021-01-22 13:17:44 +01:00
TheBusyBiscuit
95170b6115
Update messages_he.yml 2021-01-22 13:16:40 +01:00
TheBusyBiscuit
feef32f44e
Update messages_he.yml 2021-01-22 13:15:43 +01:00
TheBusyBiscuit
2af5ce0b2d
Update messages_he.yml 2021-01-22 13:14:57 +01:00
TheBusyBiscuit
85ff6af02e
Fixed this mess of variables. 2021-01-22 13:13:33 +01:00
TheBusyBiscuit
123eb350a0
Update CHANGELOG.md 2021-01-22 13:03:09 +01:00
TheBusyBiscuit
663f5e2063
Update SupportedLanguage.java 2021-01-22 13:02:46 +01:00
TheBusyBiscuit
5a6081ec98
Update Translators.java 2021-01-22 13:02:24 +01:00
Molioron
5763553859 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:58 +00:00
McAlmog
4fc735bb23 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:56 +00:00
Omer Oreg
63009c0824 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:54 +00:00
Timotiyadeyhakesem
ea32ae19c3 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:52 +00:00
dhtdht020
22e07a716c Translate messages_he.yml via GitLocalize 2021-01-22 12:00:51 +00:00
Eylonnn
4beda62944 Translate messages_he.yml via GitLocalize 2021-01-22 12:00:49 +00:00
TheBusyBiscuit
50149f6b99
[CI skip] Merge pull request #2752 from Slimefun/gitlocalize-14844 
Update Chinese Translation
 2021-01-22 12:59:02 +01:00
Nameless
c9591d34bb Translate messages_zh-CN.yml via GitLocalize 2021-01-22 11:51:19 +00:00
TheBusyBiscuit
d00eff49b9 Translate messages_zh-CN.yml via GitLocalize 2021-01-22 11:51:18 +00:00
TheBusyBiscuit
a60bc30506 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-22 12:31:38 +01:00
TheBusyBiscuit
f36532550b [CI skip] Added a few more unit tests 2021-01-22 12:31:18 +01:00
TheBusyBiscuit
c9834137fb
[CI skip] Merge pull request #2750 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.172
 2021-01-22 11:15:17 +01:00
Renovate Bot
4f800c7d09
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.172 2021-01-22 00:31:48 +00:00
TheBusyBiscuit
ab8e603ec6
Update ChargeUtils.java 2021-01-21 22:25:53 +01:00
Daniel Walsh
1bc0ae56f1
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-01-21 21:20:14 +00:00
Daniel Walsh
b5d74830d9
Fix missing branch from jacoco report 2021-01-21 20:39:01 +00:00
Daniel Walsh
89c0988aca
Make sure capacity is greater than 0 2021-01-21 20:20:52 +00:00
Daniel Walsh
84ca63365c
RechargeableHelper -> ChargeUtils 2021-01-21 20:07:31 +00:00
Daniel Walsh
f65efd95fc
Requested changes 2021-01-21 20:05:27 +00:00
Daniel Walsh
499a464595
Add unit test 2021-01-21 19:53:19 +00:00
Daniel Walsh
549b075939
Make RechargeableHelper public 2021-01-21 19:25:38 +00:00
TheBusyBiscuit
d8aaf00635
Merge pull request #2715 from Slimefun/experimental/remove-cscorelib 
Experimental: Slimefun but without CS-CoreLib
 2021-01-21 15:58:38 +01:00