TheBusyBiscuit
|
0696991ab0
|
[CI skip] A lot of refactoring
|
2021-03-09 16:55:28 +01:00 |
|
TheBusyBiscuit
|
717e8c84a0
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
feature/auto-crafters
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
|
2021-03-09 16:44:54 +01:00 |
|
Mooy1
|
f7be9289d9
|
Update SlimefunPlugin.java
|
2021-03-06 01:00:56 -06:00 |
|
Mooy1
|
4dcf8aabea
|
fix addon inventories bug with non-default worlds
|
2021-03-06 00:55:12 -06:00 |
|
TheBusyBiscuit
|
d33dc965e0
|
Merge pull request #2827 from ProfElements/bookbinder-fixes
Fix multiple Book Binder issues.
|
2021-03-05 09:58:49 +01:00 |
|
GallowsDove
|
66db725ebc
|
forgot one thing, now it's ready.
|
2021-03-03 23:02:05 +01:00 |
|
GallowsDove
|
0518681887
|
Did requested changes
|
2021-03-03 19:56:14 +01:00 |
|
GallowsDove
|
3a7be26342
|
Added getExplosiveTool
|
2021-03-03 17:56:14 +01:00 |
|
GallowsDove
|
fe2492f006
|
Changed it into a single event instead of calling an event per block
|
2021-03-03 16:45:11 +01:00 |
|
GallowsDove
|
edf15fb40a
|
Added ExplosiveToolBreakBlockEvent triggered by an explosive tool breaking a block.
|
2021-03-03 16:23:14 +01:00 |
|
TheBusyBiscuit
|
8368194d94
|
[CI skip] Updated translators list
|
2021-03-03 14:21:19 +01:00 |
|
Mooy1
|
c8fd79938b
|
did walshys annotations
|
2021-03-02 00:04:37 -06:00 |
|
TheBusyBiscuit
|
49950cf64c
|
Reduced technical debt
|
2021-03-01 14:07:20 +01:00 |
|
TheBusyBiscuit
|
15f4e838a8
|
Small improvements to logging
|
2021-03-01 13:55:57 +01:00 |
|
TheBusyBiscuit
|
8c1c67731b
|
Fixes #2852
|
2021-03-01 09:31:59 +01:00 |
|
TheBusyBiscuit
|
51b56b1e0b
|
Fixes #2851
|
2021-03-01 09:30:38 +01:00 |
|
ProfElements
|
9e01444b69
|
Make requested changes. Use Object.equals() instead of !=, make docs overall better
|
2021-02-27 18:23:35 -06:00 |
|
TheBusyBiscuit
|
84ad08be37
|
Fixes #2849
|
2021-02-27 10:19:19 +01:00 |
|
ProfElements
|
fb86415f31
|
Make requested changes. Fixed styling.
|
2021-02-26 15:07:47 -06:00 |
|
TheBusyBiscuit
|
c4be51f7bb
|
Fixes #2839
|
2021-02-24 15:57:21 +01:00 |
|
TheBusyBiscuit
|
979bb4b5f4
|
Updated textures and names
|
2021-02-23 11:14:07 +01:00 |
|
TheBusyBiscuit
|
659f329349
|
Merge branch 'master' into feature/auto-crafters
|
2021-02-23 11:11:26 +01:00 |
|
TheBusyBiscuit
|
6533b5023c
|
Merge pull request #2830 from StarWishsama/fix/wood-cutter-duplication
Fix duplicating woods when unable to replant
|
2021-02-23 11:05:45 +01:00 |
|
TheBusyBiscuit
|
338fe0f84b
|
Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560
Refactoring + Fixes to Block Handlers
|
2021-02-22 18:34:19 +01:00 |
|
Name1ess
|
c854cb7788
|
fix: duplicating woods when unable to replant
|
2021-02-20 12:34:56 +08:00 |
|
ProfElements
|
c3349f8b4c
|
Actually comment the file
|
2021-02-19 13:20:02 -06:00 |
|
ProfElements
|
0439a48a16
|
Make requested changes
|
2021-02-19 13:01:48 -06:00 |
|
ProfElements
|
c643a52b4e
|
fix merge conflicts
|
2021-02-18 20:39:24 -06:00 |
|
ProfElements
|
92ed16473e
|
Fix #2805, make sure the book binder doesnt kill overleveled enchantments
|
2021-02-18 20:26:41 -06:00 |
|
TheBusyBiscuit
|
ce643ad87f
|
Update Translators.java
|
2021-02-12 18:35:44 +01:00 |
|
TheBusyBiscuit
|
2754703f9d
|
Merge branch 'master' into feature/auto-crafters
|
2021-02-10 18:34:34 +01: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
|
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
|
6e864ace99
|
Added researches and updated textures
|
2021-02-06 19:35:58 +01:00 |
|
TheBusyBiscuit
|
bbd631536d
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
|
2021-02-06 19:33:45 +01:00 |
|
TheBusyBiscuit
|
7ddd0469eb
|
Deprecated Automated Crafting Chamber (soon to be replaced)
|
2021-02-06 19:32:41 +01:00 |
|
TheBusyBiscuit
|
e6494da8c9
|
Allow any RecipeType (in theory)
|
2021-02-06 14:00:56 +01:00 |
|
TheBusyBiscuit
|
a5a16621ee
|
Merge branch 'master' into feature/auto-crafters
|
2021-02-06 11:19:07 +01:00 |
|
TheBusyBiscuit
|
47743b632e
|
Fixed an exception when disabled in an invalid environment.
|
2021-02-06 11:18:09 +01:00 |
|
TheBusyBiscuit
|
baa4f92ea1
|
Added documentation
|
2021-02-06 11:09:13 +01:00 |
|
TheBusyBiscuit
|
eeb89c3c3b
|
Some very basic unit tests
|
2021-02-06 10:48:30 +01:00 |
|
TheBusyBiscuit
|
0adc1c3192
|
The Enhanced Auto Crafter now requires confirmation too
|
2021-02-06 01:55:54 +01:00 |
|
TheBusyBiscuit
|
e8a67cdd6a
|
Many more fixes
|
2021-02-06 01:54:08 +01:00 |
|
TheBusyBiscuit
|
340005109b
|
Even more fixes!
|
2021-02-06 01:14:23 +01:00 |
|
TheBusyBiscuit
|
1e9e8be82a
|
More bug fixes
|
2021-02-06 01:06:11 +01:00 |
|
TheBusyBiscuit
|
dd9a04fe04
|
Restored old classes and added deprecation warnings
|
2021-02-06 01:02:31 +01:00 |
|
TheBusyBiscuit
|
83aa84ca3b
|
Some bug fixes
|
2021-02-06 00:58:29 +01:00 |
|
TheBusyBiscuit
|
057fad1f08
|
Finished Auto-Crafters
|
2021-02-06 00:46:55 +01:00 |
|
TheBusyBiscuit
|
2d050a8e35
|
RecipeChoice task is now thread-safe
|
2021-02-06 00:29:57 +01:00 |
|
TheBusyBiscuit
|
a25b470272
|
Added sounds and two more messages
|
2021-02-06 00:14:44 +01:00 |
|
TheBusyBiscuit
|
3567dd87ba
|
Show recipe after selecting
|
2021-02-05 20:03:06 +01:00 |
|
TheBusyBiscuit
|
53ac633927
|
Split up recipe classes
|
2021-02-05 19:53:48 +01:00 |
|
TheBusyBiscuit
|
7d50d0eb32
|
Fixes #1161
|
2021-02-05 18:40:41 +01:00 |
|
TheBusyBiscuit
|
7ff6d755e8
|
Implemented basic behaviour
|
2021-02-05 17:26:03 +01:00 |
|
TheBusyBiscuit
|
6b4fe8a7a9
|
Added Enhanced Auto Crafter
|
2021-02-05 15:14:09 +01:00 |
|
TheBusyBiscuit
|
a7e890829d
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
|
2021-02-05 14:16:47 +01:00 |
|
TheBusyBiscuit
|
5edf61404b
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-02-05 14:15:17 +01:00 |
|
TheBusyBiscuit
|
155b2fc637
|
Some small visual changes
|
2021-02-05 14:12:17 +01:00 |
|
TheBusyBiscuit
|
80b49c264f
|
Update Translators.java
|
2021-02-04 20:12:47 +01:00 |
|
StarWishsama
|
b7fa8b621e
|
fix: color text doesn't work
|
2021-02-03 12:45:55 +08:00 |
|
StarWishsama
|
bc3b61ed90
|
optimize: no need display enchant item
|
2021-02-03 12:43:20 +08:00 |
|
StarWishsama
|
f0d427a19c
|
forget to return
|
2021-02-03 12:36:17 +08:00 |
|
StarWishsama
|
e5deee2bbd
|
optimize: add a switch for limit, set default value to 10
feat: utilize the progress bar to display (dis)enchant failed
|
2021-02-03 12:31:42 +08:00 |
|
TheBusyBiscuit
|
581199271c
|
Almost done with the vanilla auto crafter
|
2021-02-02 20:27:04 +01:00 |
|
TheBusyBiscuit
|
2c22983f0a
|
Added package descriptions
|
2021-02-02 19:38:01 +01:00 |
|
TheBusyBiscuit
|
0bf27fca15
|
Refactoring
|
2021-02-02 19:36:00 +01:00 |
|
TheBusyBiscuit
|
0aa5a999d4
|
Created abstract auto crafter framework
|
2021-02-02 18:57:45 +01:00 |
|
TheBusyBiscuit
|
5a0a52baab
|
Sweet deprecation warnings
|
2021-02-02 18:57:29 +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 |
|
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 |
|
StarWishsama
|
f308c60bd1
|
fix: Unable to limit enchantment level
optimize: set default and max level to Short.MAX_VALUE
|
2021-02-02 12:49:02 +08: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
|
ffb063e2d8
|
refactor: removed unused import
|
2021-01-24 11:42:01 +08:00 |
|
StarWishsama
|
078a553283
|
refactor: replace Auto Enchanter setting to IntRange
|
2021-01-24 11:40:38 +08:00 |
|
StarWishsama
|
f89db91778
|
refactor: use for-loop for notice and replace to IntRangeSetting
|
2021-01-24 11:37:59 +08: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 |
|
StarWishsama
|
018cfc33c8
|
feat: add display limit level
|
2021-01-23 17:07:30 +08:00 |
|
StarWishsama
|
7d1df8ca24
|
feat: Add enchant limit to AutoDisenchanter and message
|
2021-01-23 14:36:50 +08:00 |
|
Name1ess
|
2777cec1d5
|
feat: Add enchant level limit to AutoEnchanter
|
2021-01-23 14:25:36 +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 |
|