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 |
|
CactusTheGuy
|
4096315e7d
|
Translate categories_vi.yml via GitLocalize
|
2021-02-19 07:30:35 +00: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
|
c09773fcef
|
[CI skip] Manually sync czech translations
|
2021-02-13 13:10:45 +01:00 |
|
TheBusyBiscuit
|
c27eb2959a
|
[CI skip] Manually update dutch translations...
|
2021-02-12 20:09:19 +01:00 |
|
TheBusyBiscuit
|
ce643ad87f
|
Update Translators.java
|
2021-02-12 18:35:44 +01:00 |
|
peppower
|
40754d7da0
|
Translate categories_nl.yml via GitLocalize
|
2021-02-12 17:33:32 +00:00 |
|
Nikolay
|
eebaa069c9
|
Translate messages_bg.yml via GitLocalize
|
2021-02-12 16:08:55 +00: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
|
7ddd0469eb
|
Deprecated Automated Crafting Chamber (soon to be replaced)
|
2021-02-06 19:32:41 +01:00 |
|
TheBusyBiscuit
|
47743b632e
|
Fixed an exception when disabled in an invalid environment.
|
2021-02-06 11:18:09 +01:00 |
|
TheBusyBiscuit
|
dec868284d
|
Updated dependencies
|
2021-02-06 11:11:58 +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 |
|
LirCZE
|
a2c3e24a95
|
Translate recipes_cs.yml via GitLocalize
|
2021-02-04 19:07:50 +00:00 |
|
100petr
|
e6a9511136
|
Translate recipes_cs.yml via GitLocalize
|
2021-02-04 19:07:49 +00:00 |
|
jakmanda05
|
bbce73ce76
|
Translate recipes_cs.yml via GitLocalize
|
2021-02-04 19:07:47 +00:00 |
|
100petr
|
c94add139b
|
Translate categories_cs.yml via GitLocalize
|
2021-02-04 19:07:45 +00:00 |
|
Jan Vrska
|
405b553f0b
|
Translate researches_cs.yml via GitLocalize
|
2021-02-04 19:07:44 +00:00 |
|
frfole
|
08942610af
|
Translate researches_cs.yml via GitLocalize
|
2021-02-04 19:07:43 +00:00 |
|
100petr
|
4c16273097
|
Translate researches_cs.yml via GitLocalize
|
2021-02-04 19:07:42 +00:00 |
|
Renzotom
|
4b4ef00ecb
|
Translate researches_cs.yml via GitLocalize
|
2021-02-04 19:07:41 +00: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 |
|
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 |
|
PaladinBear
|
6f8134a800
|
Translate researches_he.yml via GitLocalize
|
2021-01-31 07:52:59 +00:00 |
|
PaladinBear
|
dabc8bbbc0
|
Translate messages_he.yml via GitLocalize
|
2021-01-31 07:52:58 +00:00 |
|
TheBusyBiscuit
|
418b6ffa74
|
[CI skip] Merge pull request #2787 from Slimefun/gitlocalize-14895
|
2021-01-31 00:28:14 +01:00 |
|
TheBusyBiscuit
|
c78092bb85
|
[CI skip] Updated translators list
|
2021-01-31 00:27:14 +01:00 |
|
amarcais53
|
704e100e07
|
Translate messages_fr.yml via GitLocalize
|
2021-01-30 21:07:29 +00:00 |
|
Maxime
|
d6ae3ac81d
|
Translate messages_fr.yml via GitLocalize
|
2021-01-30 21:07:28 +00:00 |
|
Pierre
|
dbe127a1d1
|
Translate messages_fr.yml via GitLocalize
|
2021-01-30 21:07:27 +00: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
|
f207601244
|
Translate messages_de.yml via GitLocalize
|
2021-01-29 10:51:06 +00:00 |
|
TheBusyBiscuit
|
d1b907dc02
|
Translate researches_de.yml via GitLocalize
|
2021-01-29 10:51:04 +00:00 |
|
HeroBrineKing
|
76d4c1362d
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-29 08:43:23 +00:00 |
|
TheBusyBiscuit
|
9415a446f3
|
[CI skip] Merge pull request #2784 from Slimefun/gitlocalize-14892
Synced up zhCN translation
|
2021-01-29 09:23:59 +01:00 |
|
TheBusyBiscuit
|
24d0a87fe0
|
[CI skip] Updated translators list
|
2021-01-29 09:23:47 +01:00 |
|
Nameless
|
9e6c24a46a
|
Translate messages_zh-CN.yml via GitLocalize
|
2021-01-29 08:22:17 +00:00 |
|
Jiejue233
|
fed5925892
|
Translate researches_zh-CN.yml via GitLocalize
|
2021-01-29 08:22:15 +00:00 |
|
Just Mango
|
a7bf430183
|
Translate researches_vi.yml via GitLocalize
|
2021-01-29 08:20:43 +00:00 |
|
Just Mango
|
5ba1eaadff
|
Translate messages_vi.yml via GitLocalize
|
2021-01-29 08:20:41 +00:00 |
|
nahkd123
|
38d959d44c
|
Translate messages_vi.yml via GitLocalize
|
2021-01-29 08:20:40 +00: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
|
d75e693ceb
|
[CI skip] Merge pull request #2780 from Slimefun/gitlocalize-14890
Translated the new string
|
2021-01-28 23:16:28 +01:00 |
|
Nikolay
|
6505b1c624
|
Translate messages_bg.yml via GitLocalize
|
2021-01-28 21:28:58 +00:00 |
|
bito-blosh
|
1c404d7f66
|
Translate messages_ja.yml via GitLocalize
|
2021-01-28 17:55:10 +00:00 |
|
TheBusyBiscuit
|
835e8fa384
|
Translate messages_ja.yml via GitLocalize
|
2021-01-28 17:55:09 +00: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
|
20d6656f35
|
[CI skip] Merge pull request #2777 from Slimefun/gitlocalize-14884
add zh-TW wise talisman and enchantment book binding
|
2021-01-28 14:28:30 +01:00 |
|
HeroBrineKing
|
afb492fb3b
|
Translate researches_zh-TW.yml via GitLocalize
|
2021-01-28 13:09:52 +00:00 |
|
HeroBrineKing
|
8399136bc1
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-28 13:08:40 +00:00 |
|
TheBusyBiscuit
|
1d111772f2
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-28 13:08:39 +00: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 |
|
Daniel Walsh
|
23efc9b6f0
|
REEE Im not having a good day
|
2021-01-26 13:01:07 +00:00 |
|
Daniel Walsh
|
f923612388
|
oops
|
2021-01-26 12:58:14 +00:00 |
|
Daniel Walsh
|
03cce6265d
|
Make it return an immutable map
|
2021-01-26 12:55:03 +00:00 |
|
Daniel Walsh
|
5aa4361a92
|
Merge branch 'api/access-raw-storage' of github.com:Slimefun/Slimefun4 into api/access-raw-storage
|
2021-01-26 12:52:35 +00: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 |
|
Daniel Walsh
|
986eb38e81
|
Whoops forgot to change this one
|
2021-01-26 07:47:41 +00:00 |
|
Daniel Walsh
|
d0e0aa3c65
|
getStorage -> getRawStorage
|
2021-01-26 07:44:04 +00:00 |
|
Daniel Walsh
|
fd40737682
|
Oops
|
2021-01-26 07:40:37 +00:00 |
|
Daniel Walsh
|
6c7b8fd9da
|
Add a way to retrieve the raw storage
|
2021-01-26 07:30:42 +00:00 |
|
bito-blosh
|
177c67d25c
|
Translate researches_ja.yml via GitLocalize
|
2021-01-26 04:15:47 +00: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
|
30202d3f51
|
Merge pull request #2755 from kii-chan-reloaded/master
Check inv maxStackSize
|
2021-01-25 16:34:47 +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 |
|
TheBusyBiscuit
|
5ac3b9ec53
|
[CI skip] Merge pull request #2766 from Slimefun/gitlocalize-14860
Updated Hungarian translations
|
2021-01-25 12:25:58 +01:00 |
|