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 |
|
TheBusyBiscuit
|
ae4e4bed73
|
Merge branch 'master' into fixes/blocks
|
2021-01-14 12:35:57 +01:00 |
|
TheBusyBiscuit
|
5d28261626
|
[CI skip] Fix discord webhook
|
2021-01-14 12:32:21 +01:00 |
|
TheBusyBiscuit
|
452dc5c3c5
|
Updated changelog
|
2021-01-14 12:26:21 +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 |
|
TheBusyBiscuit
|
43109ab2d3
|
Merge branch 'master' into performance/cobblestone
|
2021-01-14 11:16:39 +01:00 |
|
TheBusyBiscuit
|
42631a1165
|
[CI skip] Removed URL checker
|
2021-01-14 11:08:56 +01:00 |
|
TheBusyBiscuit
|
552abb31d6
|
[CI skip] Merge pull request #2718 from Slimefun/renovate/superkogito-urls-checker-0.x
Update SuperKogito/URLs-checker action to v0.2.2
|
2021-01-14 11:03:31 +01:00 |
|
Renovate Bot
|
3fe60b91c7
|
Update SuperKogito/URLs-checker action to v0.2.2
|
2021-01-13 22:07:20 +00: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
|
9be11921c7
|
Merge branch 'master' into fixes/blocks
|
2021-01-13 18:50:06 +00:00 |
|
TheBusyBiscuit
|
d8004510e5
|
Updated changelog (fixed two bugs)
|
2021-01-13 19:48:30 +01:00 |
|
Daniel Walsh
|
2f08066449
|
Merge pull request #2487 from CURVX/fix/sf-machine-hopper
|
2021-01-13 18:46:13 +00:00 |
|
TheBusyBiscuit
|
0ae418250b
|
[CI skip] Merge pull request #2716 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2
|
2021-01-13 17:38:40 +01:00 |
|
Renovate Bot
|
c53d87d064
|
Update dependency com.github.LoneDev6:itemsadder-api to v2
|
2021-01-13 16:31:00 +00:00 |
|
TheBusyBiscuit
|
4494a32826
|
[CI skip] Updated diagram
|
2021-01-13 15:55:12 +01:00 |
|
TheBusyBiscuit
|
f9a138b79c
|
[CI skip] Added Triage workflow
|
2021-01-13 15:33:29 +01:00 |
|