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
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
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
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
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
TheBusyBiscuit
84d2d99097
not done yet
2021-01-14 20:44:56 +01:00
TheBusyBiscuit
739e7a7a9a
Merge branch 'master' into chore/has-unlocked
2021-01-14 14:44:57 +01:00
TheBusyBiscuit
ac590fdde3
Fixes #2721
2021-01-14 14:41:09 +01:00
TheBusyBiscuit
5d4e22c4b5
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
chore/has-unlocked
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/LockedCategory.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
2021-01-14 12:25:37 +01:00
TheBusyBiscuit
7826b2359a
Finished fix for #2636 and fixed a threading issue with BlockStates
2021-01-14 11:58:52 +01: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
Daniel Walsh
2f08066449
Merge pull request #2487 from CURVX/fix/sf-machine-hopper
2021-01-13 18:46:13 +00:00
TheBusyBiscuit
029bc2ae78
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
refactoring/holograms
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
2021-01-13 14:29:18 +01:00
TheBusyBiscuit
6e27ea0ca1
[CI skip] Fixed javadocs
2021-01-13 13:48:56 +01:00
TheBusyBiscuit
faa3219add
Added an additional item warning for illegal stack sizes
2021-01-13 13:15:05 +01:00
TheBusyBiscuit
b0f5768443
[CI skip] Removed a deprecated method
2021-01-13 12:46:16 +01:00
TheBusyBiscuit
69df04f128
Remove as much old stuff as possible
2021-01-13 11:58:54 +01:00
CURVX
889ffe4872
Few minor changes
2021-01-13 10:31:45 +05:30
TheBusyBiscuit
f602c6c575
Slimefun but without cs-corelib
2021-01-13 02:51:05 +01:00
TheBusyBiscuit
7339a6ed4b
[CI skip] Refactoring
2021-01-13 02:20:32 +01:00
TheBusyBiscuit
ec8eed58f9
[CI skip] Refactoring
2021-01-12 19:28:12 +01:00
CURVX
a0ab148a65
Cleaned imports pt.2
2021-01-12 23:42:19 +05:30
CURVX
f0e891134b
Cleaned imports
2021-01-12 23:17:23 +05:30
CURVX
19e2f37ac6
Resolve merge conflicts
2021-01-12 21:51:31 +05:30
CURVX
b3b7a22ee9
Changes req. by TTB
2021-01-12 21:42:53 +05:30
CURVX
105a57fb37
Merge pull request #6 from Slimefun/master
...
[CI skip] Update fork
2021-01-12 21:37:20 +05:30
TheBusyBiscuit
3f5fb7c7a7
[Ci skip] Fixed javadocs and improved documentation
2021-01-12 12:03:02 +01:00
TheBusyBiscuit
bc8d72b9ab
Small aesthetic change
2021-01-11 13:12:09 +01:00
TheBusyBiscuit
5ed452660f
Fixed elevator order (highest floor first)
2021-01-11 13:07:46 +01:00
TheBusyBiscuit
f6a9150296
Little bit of refactoring
2021-01-11 12:45:11 +01:00
TheBusyBiscuit
7a4712f930
Removed obsolete things
2021-01-11 12:33:49 +01:00
TheBusyBiscuit
7bfb46d3fd
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java
...
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
2021-01-11 12:07:46 +01:00
TheBusyBiscuit
85639c75ac
Fixed floor numbers
2021-01-11 11:25:03 +01:00
TheBusyBiscuit
32474a588b
Added ElevatorFloor class from PR #2699
2021-01-11 10:56:46 +01:00
TheBusyBiscuit
a313d8a878
Removed comments
2021-01-11 10:48:54 +01:00
TheBusyBiscuit
e119f762ac
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
features/inventory-elevator
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
2021-01-11 10:47:18 +01:00
TheBusyBiscuit
577ad2c308
[CI skip] Prepare RC-19
2021-01-11 10:33:12 +01:00
TheBusyBiscuit
4b6610d0b7
[CI skip] Finalized guide refactoring
2021-01-11 10:30:50 +01:00
Daniel Walsh
d4cfe2a0db
Quick fix
2021-01-11 07:57:51 +00:00
Daniel Walsh
116642fcec
Finish up
2021-01-11 07:38:26 +00:00
TheBusyBiscuit
7e48d96fa3
Removed "written book" slimefun guide and disabled elevators
2021-01-11 02:39:54 +01:00
TheBusyBiscuit
93dc77b188
[CI skip] Fixed javadocs
2021-01-11 02:14:49 +01:00
