TheBusyBiscuit
|
79c7c4826f
|
Refactoring and documentation
|
2021-01-17 01:01:42 +01:00 |
|
TheBusyBiscuit
|
372be75506
|
Merge pull request #2724 from Slimefun/refactoring/holograms
Massive performance improvements and fixes to holograms
|
2021-01-16 18:38:18 +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
|
7758fabcec
|
Merge pull request #2732 from Slimefun/gitlocalize-14785
Translated to Bulgarian
|
2021-01-16 15:50:38 +01:00 |
|
TheBusyBiscuit
|
a6acf53b3d
|
[CI skip] Merge pull request #2730 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.21.0
|
2021-01-16 15:50:25 +01:00 |
|
TheBusyBiscuit
|
91ccd10ce2
|
[CI skip] Merge pull request #2731 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.7.7
|
2021-01-16 15:50:08 +01:00 |
|
TheBusyBiscuit
|
03b4c10bad
|
[CI skip] Updated changelog
|
2021-01-16 14:46:00 +01:00 |
|
Nikolay
|
defad8af32
|
Translate messages_bg.yml via GitLocalize
|
2021-01-16 13:13:35 +00:00 |
|
DNBGlol
|
61a30ec8b3
|
Translate messages_bg.yml via GitLocalize
|
2021-01-16 13:13:33 +00:00 |
|
Renovate Bot
|
6e55731f9c
|
Update dependency org.mockito:mockito-core to v3.7.7
|
2021-01-16 11:32:16 +00:00 |
|
Renovate Bot
|
05493d1da6
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.21.0
|
2021-01-16 11:32:09 +00: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 |
|
Daniel Walsh
|
5c2a2faa79
|
Add to changelog
|
2021-01-16 10:30:31 +00: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
|
24f1359ecf
|
[CI skip] Merge pull request #2727 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.3
|
2021-01-16 11:24:04 +01:00 |
|
Renovate Bot
|
773e7e984e
|
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.3
|
2021-01-16 05:12:20 +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
|
a58fa5881f
|
Merge branch 'master' of https://github.com/ProfElements/Slimefun4
|
2021-01-14 16:03:56 -06:00 |
|
ProfElements
|
58eca5affa
|
Check for conflicting enchantments, this can probably be better
|
2021-01-14 16:02:33 -06:00 |
|
TheBusyBiscuit
|
18787779af
|
Update researches_en.yml
|
2021-01-14 22:06:11 +01:00 |
|
ProfElements
|
5cd1d8cb22
|
appease yaml lint v3
|
2021-01-14 15:05:08 -06:00 |
|
ProfElements
|
782da8582f
|
fix researches_en.yml formatting
|
2021-01-14 14:56:13 -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
|
dfcca27dd4
|
[CI skip] Merge pull request #2723 from Slimefun/renovate/org.sonarsource.scanner.maven-sonar-maven-plugin-3.x
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.8.0.2131
|
2021-01-14 17:57:06 +01:00 |
|
Renovate Bot
|
1510a49032
|
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.8.0.2131
|
2021-01-14 16:53:50 +00: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
|
a3715d3b88
|
[CI skip] Merge pull request #2720 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.2
|
2021-01-14 14:32:46 +01:00 |
|
Renovate Bot
|
05548723f7
|
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.2
|
2021-01-14 13:21:24 +00:00 |
|
TheBusyBiscuit
|
05b67869a8
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
features/multi-categories
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
|
2021-01-14 12:41:53 +01:00 |
|