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 |
|
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
|
c78092bb85
|
[CI skip] Updated translators list
|
2021-01-31 00:27:14 +01:00 |
|
TheBusyBiscuit
|
b4d1894d8f
|
Merge pull request #2757 from StarWishsama/magician-talisman-fix
Fixes #2679
|
2021-01-29 16:34:53 +01:00 |
|
TheBusyBiscuit
|
a80269b7d9
|
[CI skip] Formatting
|
2021-01-29 12:19:40 +01:00 |
|
TheBusyBiscuit
|
24d0a87fe0
|
[CI skip] Updated translators list
|
2021-01-29 09:23:47 +01:00 |
|
Name1ess
|
d5d7bc705a
|
Merge branch 'master' into magician-talisman-fix
|
2021-01-29 12:14:39 +08:00 |
|
StarWishsama
|
29b368f648
|
fix: shadow name
|
2021-01-29 12:13:24 +08:00 |
|
StarWishsama
|
8effed7139
|
Merge remote-tracking branch 'origin/magician-talisman-fix' into magician-talisman-fix
|
2021-01-29 12:10:02 +08:00 |
|
StarWishsama
|
a031585b5a
|
fix: thank you idea
|
2021-01-29 12:09:24 +08:00 |
|
TheBusyBiscuit
|
ee7786b8e4
|
Allow Talismans to use the Actionbar
|
2021-01-29 03:02:50 +01:00 |
|
TheBusyBiscuit
|
3c0afeb943
|
Small fix
|
2021-01-29 02:47:20 +01:00 |
|
TheBusyBiscuit
|
46de5a700a
|
Little bit of refactoring
|
2021-01-28 18:43:20 +01:00 |
|
TheBusyBiscuit
|
8cf0f61f3e
|
Added placeholder for unloaded profiles to PlaceholderAPI integration
|
2021-01-28 18:21:22 +01:00 |
|
TheBusyBiscuit
|
cadf66a13c
|
Merge branch 'master' into fixes/blocks
|
2021-01-28 13:41:27 +01:00 |
|
TheBusyBiscuit
|
6df052e4cf
|
Fixes #2771
|
2021-01-28 12:37:13 +01:00 |
|
TheBusyBiscuit
|
7ffc8aff24
|
Fixes #2760
|
2021-01-26 10:35:47 +01:00 |
|
TheBusyBiscuit
|
9436ce451a
|
Fixes #2460
|
2021-01-26 10:07:12 +01:00 |
|
TheBusyBiscuit
|
ff83bb025e
|
[CI skip] Merge pull request #2481 from MoKe12g/master
Explosive tools not working with silk touch
|
2021-01-26 10:02:25 +01:00 |
|
TheBusyBiscuit
|
c2da6c5f53
|
Changed recipe for Tier 3 electric ore grinder
|
2021-01-26 00:57:49 +01:00 |
|
TheBusyBiscuit
|
7d0168115f
|
Merge pull request #2599 from svr333/AddT3ElectricGrinder
Add Tier 3 Electric Ore Grinder
|
2021-01-26 00:56:19 +01:00 |
|
TheBusyBiscuit
|
2085d9eeba
|
[CI skip] Updated changelog
|
2021-01-26 00:56:03 +01:00 |
|
Daniel Walsh
|
91aaa546a6
|
Merge pull request #2680 from ProfElements/master
|
2021-01-25 15:44:06 +00:00 |
|
TheBusyBiscuit
|
36fe08a349
|
Merge pull request #2765 from StarWishsama/2761
Fixes #2761 probably
|
2021-01-25 16:36:49 +01:00 |
|
TheBusyBiscuit
|
9f29901eb8
|
[CI skip] Updated translators list
|
2021-01-25 15:46:35 +01:00 |
|
Name1ess
|
f3fafabcff
|
Update TalismanListener.java
|
2021-01-25 20:10:35 +08:00 |
|
StarWishsama
|
a6bcab266f
|
chore: remove register call when initialize
|
2021-01-25 12:18:24 +08:00 |
|
StarWishsama
|
decf9bd08c
|
fix: grammar issue
|
2021-01-25 11:59:53 +08:00 |
|
TheBusyBiscuit
|
a9c4df30a4
|
Update Translators.java
|
2021-01-24 20:23:30 +01: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
|
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 |
|
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 |
|
TheBusyBiscuit
|
f36532550b
|
[CI skip] Added a few more unit tests
|
2021-01-22 12:31:18 +01: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
|
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 |
|
TheBusyBiscuit
|
1a2858c6a0
|
Fixed imports
|
2021-01-20 17:23:25 +01:00 |
|
TheBusyBiscuit
|
570c981de3
|
Merge branch 'master' into fixes/blocks
|
2021-01-20 17:19:18 +01:00 |
|
TheBusyBiscuit
|
35b2c4a1e4
|
Updated translators list
|
2021-01-20 14:55:03 +01:00 |
|
Daniel Walsh
|
346fc7bc44
|
Merge pull request #2733 from Seggan/master
|
2021-01-20 12:35:07 +00:00 |
|
TheBusyBiscuit
|
591421fc32
|
[CI skip] Fixed javadocs
|
2021-01-19 10:01:55 +01:00 |
|
TheBusyBiscuit
|
9840a550ce
|
[CI skip] Changed internal profiler flag to a volatile boolean
|
2021-01-19 10:01:28 +01:00 |
|
TheBusyBiscuit
|
4075c51975
|
[CI skip] Refactoring and improved logging
|
2021-01-18 23:29:44 +01:00 |
|
svr333
|
ffef8350b1
|
Merge branch 'master' into performance/cobblestone
|
2021-01-18 22:18:02 +01:00 |
|
Seggan
|
3fac23e26b
|
Fine
|
2021-01-18 16:03:19 -05:00 |
|
Seggan
|
31a1d7b3b2
|
Localization + removed redundant 1st check
|
2021-01-18 09:41:38 -05:00 |
|
TheBusyBiscuit
|
8b28f3685a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into chore/has-unlocked
|
2021-01-17 14:33:46 +01:00 |
|
TheBusyBiscuit
|
7eff4d381e
|
Fixed a small issue with backpacks
|
2021-01-17 14:27:01 +01:00 |
|
TheBusyBiscuit
|
9c3c6d7245
|
[CI skip] Fixed javadocs
|
2021-01-17 14:04:51 +01:00 |
|
TheBusyBiscuit
|
eab6164690
|
Fixed
|
2021-01-17 12:19:08 +01:00 |
|
TheBusyBiscuit
|
7ca8392616
|
Improved documentation
|
2021-01-17 01:48:26 +01:00 |
|
TheBusyBiscuit
|
79c7c4826f
|
Refactoring and documentation
|
2021-01-17 01:01:42 +01:00 |
|
Seggan
|
e1810f60ff
|
Oops
|
2021-01-16 12:01:27 -05:00 |
|
Seggan
|
2e7291c3a5
|
Script validation
|
2021-01-16 11:38:19 -05:00 |
|
svr333
|
f8b135592d
|
Merge branch 'master' into chore/has-unlocked
|
2021-01-16 16:04:21 +01:00 |
|
TheBusyBiscuit
|
16ed670573
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
refactoring/holograms
Conflicts:
CHANGELOG.md
|
2021-01-16 15:56:23 +01:00 |
|
TheBusyBiscuit
|
0feace9c06
|
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
|
2021-01-16 15:51:17 +01:00 |
|
TheBusyBiscuit
|
03b4c10bad
|
[CI skip] Updated changelog
|
2021-01-16 14:46:00 +01:00 |
|
Daniel Walsh
|
485fc1aa69
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-01-16 10:39:05 +00:00 |
|
Daniel Walsh
|
ff368bdf56
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-01-16 10:35:03 +00:00 |
|
TheBusyBiscuit
|
1b527f4a61
|
Merge branch 'master' into chore/has-unlocked
|
2021-01-16 11:34:57 +01:00 |
|
TheBusyBiscuit
|
34d18c5547
|
Merge branch 'master' into refactoring/holograms
|
2021-01-16 11:34:24 +01:00 |
|
Daniel Walsh
|
55d2f82dcd
|
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items
|
2021-01-16 10:33:16 +00:00 |
|
TheBusyBiscuit
|
7c929a2f22
|
Fixes #2728
|
2021-01-16 11:30:39 +01:00 |
|
TheBusyBiscuit
|
e523d7849e
|
Fixes #2662
|
2021-01-16 11:28:38 +01:00 |
|
Daniel Walsh
|
da2419d414
|
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
|
2021-01-16 10:26:22 +00:00 |
|
TheBusyBiscuit
|
d678977a03
|
Fixed formatting, import and small optimization
|
2021-01-15 11:52:56 +01:00 |
|
TheBusyBiscuit
|
a810458345
|
[CI skip] Small changes
|
2021-01-15 11:46:40 +01:00 |
|
TheBusyBiscuit
|
3663a7d43b
|
Proper error handling and updated changelog
|
2021-01-15 03:31:33 +01:00 |
|
TheBusyBiscuit
|
1997fe04d8
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms
|
2021-01-15 03:12:41 +01:00 |
|
TheBusyBiscuit
|
5ea34a895d
|
Fixed holograms cache
|
2021-01-15 01:37:55 +01:00 |
|
TheBusyBiscuit
|
3ea2fccf25
|
Fixed docs
|
2021-01-15 01:34:56 +01:00 |
|
TheBusyBiscuit
|
570908a448
|
Cache entity names
|
2021-01-15 01:32:39 +01:00 |
|
TheBusyBiscuit
|
34f24f4d60
|
Invisible and invulnerable might be a good idea.
|
2021-01-15 00:29:28 +01:00 |
|
TheBusyBiscuit
|
d84a2e37a3
|
Lowered purge delay
|
2021-01-15 00:24:23 +01:00 |
|
TheBusyBiscuit
|
a7d0758692
|
More work on holograms
|
2021-01-15 00:16:58 +01:00 |
|
ProfElements
|
58eca5affa
|
Check for conflicting enchantments, this can probably be better
|
2021-01-14 16:02:33 -06:00 |
|
ProfElements
|
fada355fe5
|
Add research and make Book Binder recipe slightly harder
|
2021-01-14 14:39:28 -06:00 |
|