Renovate Bot
|
3836368276
|
Update technote-space/toc-generator action to v2.5.1
|
2020-10-20 14:23:38 +00:00 |
|
Mooy1
|
4d6d031bca
|
fix empty slot
|
2020-10-20 08:56:53 -05:00 |
|
TheBusyBiscuit
|
24806ab5d0
|
Adjusted CargoNet implementation
|
2020-10-20 14:22:17 +02:00 |
|
TheBusyBiscuit
|
aaec763a78
|
Added ItemFilter
|
2020-10-20 13:56:21 +02:00 |
|
CURVX
|
71ca1458fe
|
Changes req. by TTB
|
2020-10-20 00:32:20 +05:30 |
|
CURVX
|
f651f960c0
|
Made ArmorForge extend BackpackCrafter
|
2020-10-19 22:56:14 +05:30 |
|
TheBusyBiscuit
|
c9adba2f39
|
[CI skip] Merge pull request #2486 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.15
|
2020-10-19 17:30:18 +02:00 |
|
Renovate Bot
|
524ee1d3d3
|
Update dependency org.mockito:mockito-core to v3.5.15
|
2020-10-19 15:24:26 +00:00 |
|
CURVX
|
37585d0584
|
Merge pull request #4 from Slimefun/master
[CI skip] Update fork
|
2020-10-19 16:21:27 +05:30 |
|
TheBusyBiscuit
|
c7960c292c
|
Merge pull request #2479 from CURVX/fix/ender-boots fixes #2478
Fixes damage taken from Enderpearl with Enderboot on
|
2020-10-19 12:49:58 +02:00 |
|
TheBusyBiscuit
|
df03c4bd8d
|
[CI skip] Updated changelog
|
2020-10-19 12:49:43 +02:00 |
|
Moritz Kempe
|
e9d2d28c43
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
|
2020-10-19 07:36:07 +02:00 |
|
TheBusyBiscuit
|
1998c7746f
|
Merge pull request #2477 from J3fftw1/fix/#2470
fixes #2470
|
2020-10-18 19:22:04 +02:00 |
|
TheBusyBiscuit
|
95636818f5
|
[CI skip] Updated changelog
|
2020-10-18 19:21:46 +02:00 |
|
CURVX
|
c98292b08c
|
Added changes req. by TTB
|
2020-10-18 22:32:36 +05:30 |
|
Panda.com
|
766a245a16
|
whoops
|
2020-10-18 18:42:12 +02:00 |
|
Panda.com
|
48f45bef02
|
Whoops
|
2020-10-18 17:39:54 +02:00 |
|
Panda.com
|
0a4f666094
|
me dumb
|
2020-10-18 16:06:19 +02:00 |
|
Panda.com
|
b4cd8e0d0c
|
added Unit Test
|
2020-10-18 16:01:32 +02:00 |
|
Panda.com
|
e3df3ab012
|
added tall_flowers.json and requested changes
|
2020-10-18 15:47:47 +02:00 |
|
Panda.com
|
dc025c7b28
|
fix
|
2020-10-18 14:31:54 +02:00 |
|
TheBusyBiscuit
|
734b853eb7
|
[CI skip] Reduced technical debt
|
2020-10-18 13:53:15 +02:00 |
|
Panda.com
|
3d364ee331
|
did requested changes
|
2020-10-18 13:48:38 +02:00 |
|
TheBusyBiscuit
|
56a1ee5336
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2020-10-18 13:17:29 +02:00 |
|
TheBusyBiscuit
|
e054fe6682
|
Fixes #2448
|
2020-10-18 13:17:18 +02:00 |
|
TheBusyBiscuit
|
1d5fe45394
|
[CI skip] Merge pull request #2483 from Slimefun/gitlocalize-13855
Updated zh-CN translation
|
2020-10-18 11:40:18 +02:00 |
|
Nameless
|
de1e846382
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-10-18 02:44:36 +00:00 |
|
TheBusyBiscuit
|
1257ca5ebb
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-10-18 02:44:34 +00:00 |
|
Nameless
|
f9d4be9cbb
|
Translate messages_zh-CN.yml via GitLocalize
|
2020-10-18 02:44:33 +00:00 |
|
TheBusyBiscuit
|
c4bf0ecdd2
|
First step towards a task
|
2020-10-18 01:44:32 +02:00 |
|
TheBusyBiscuit
|
13cbe829dc
|
[CI skip] Merge pull request #2482 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.02
|
2020-10-17 15:20:14 +02:00 |
|
Renovate Bot
|
087af60ab8
|
Update dependency com.konghq:unirest-java to v3.11.02
|
2020-10-17 13:17:35 +00:00 |
|
Panda.com
|
e5d341485f
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/#2470
# Conflicts:
# src/main/resources/tags/block_placer_ignored_materials.json
|
2020-10-17 13:37:41 +02:00 |
|
TheBusyBiscuit
|
07eba9319a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
bee-armor
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
|
2020-10-17 13:28:30 +02:00 |
|
TheBusyBiscuit
|
9f3e2bba7c
|
[CI skip] Removed a troublesome config setting
|
2020-10-17 13:22:22 +02:00 |
|
TheBusyBiscuit
|
b08532b2e5
|
Merge branch 'master' into master
|
2020-10-17 13:20:31 +02:00 |
|
TheBusyBiscuit
|
4aff61f3b1
|
Removed 1.13 support
|
2020-10-17 12:54:36 +02:00 |
|
TheBusyBiscuit
|
b976370d97
|
Reverted deprecation warning
|
2020-10-17 12:07:21 +02:00 |
|
TheBusyBiscuit
|
bc7acfee22
|
[CI skip] Merge pull request #2480 from Slimefun/gitlocalize-13844
Updated hebrew translations
|
2020-10-17 12:03:51 +02:00 |
|
Moritz Kempe
|
92696226e4
|
fixes PR Explosive tools not working with silk touch
Explosive Tools no longer ignore their SILK_TOUCH enchantment.
Fixes PR #2460
|
2020-10-17 11:58:56 +02:00 |
|
Timotiyadeyhakesem
|
ca6962811f
|
Translate categories_he.yml via GitLocalize
|
2020-10-16 21:57:07 +00:00 |
|
CURVX
|
adcb52becf
|
Merge pull request #3 from Slimefun/master
[CI skip] Update fork
|
2020-10-16 01:09:20 +05:30 |
|
uiytt
|
0a18c30890
|
Removed now useless method : research
|
2020-10-15 17:38:59 +02:00 |
|
uiytt
|
f987e6b85d
|
Added unit test for event
I'm not so sure about this.
I've never writed any tests before
|
2020-10-15 17:34:56 +02:00 |
|
Panda.com
|
49c7d3ad23
|
14* prs
|
2020-10-15 15:49:00 +02:00 |
|
Panda.com
|
c00ded786a
|
fix?
|
2020-10-15 15:46:01 +02:00 |
|
Panda.com
|
372c6b41b1
|
a
|
2020-10-15 15:45:23 +02:00 |
|
Panda.com
|
349c57aef4
|
a
|
2020-10-15 15:44:32 +02:00 |
|
Panda.com
|
7dbbb87af5
|
?
|
2020-10-15 15:43:28 +02:00 |
|
Panda.com
|
6611eaf444
|
idk whats wrong with "values"
|
2020-10-15 15:43:06 +02:00 |
|