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
TheBusyBiscuit
5ac3b9ec53
[CI skip] Merge pull request #2766 from Slimefun/gitlocalize-14860
...
Updated Hungarian translations
2021-01-25 12:25:58 +01:00
TheBusyBiscuit
842308cce7
[CI skip] Merge pull request #2762 from Slimefun/gitlocalize-14855
...
Update Japanese translation files.
2021-01-25 12:25:13 +01:00
poma123
290afb4746
Translate researches_hu.yml via GitLocalize
2021-01-25 08:04:24 +00:00
KingDead
6792ee765f
Translate messages_hu.yml via GitLocalize
2021-01-25 08:04:22 +00:00
poma123
e47b89de4e
Translate messages_hu.yml via GitLocalize
2021-01-25 08:04:21 +00:00
StarWishsama
a6bcab266f
chore: remove register call when initialize
2021-01-25 12:18:24 +08:00
Name1ess
8d844254c2
fix: register recipes when speed is not 0
2021-01-25 12:15:18 +08:00
Nameless
76ebff105b
Translate researches_zh-CN.yml via GitLocalize
2021-01-25 04:06:01 +00:00
Nameless
89370d31f9
Translate messages_zh-CN.yml via GitLocalize
2021-01-25 04:05:59 +00:00
Nikolay
3b564c0486
Translate messages_bg.yml via GitLocalize
2021-01-24 22:55:41 +00:00
bito-blosh
826e90ef82
Translate messages_ja.yml via GitLocalize
2021-01-24 21:22:01 +00:00
TheBusyBiscuit
c9cdffdfac
Translate messages_ja.yml via GitLocalize
2021-01-24 21:22:00 +00:00
bito-blosh
ce869b2acc
Translate researches_ja.yml via GitLocalize
2021-01-24 21:21:58 +00:00
TheBusyBiscuit
abf948e4ed
Translate messages_de.yml via GitLocalize
2021-01-24 19:27:24 +00:00
TheBusyBiscuit
e5d5b2950d
Translate researches_de.yml via GitLocalize
2021-01-24 19:27:23 +00:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java
2021-01-24 20:23:30 +01:00
Luu7
794d184a41
Translate researches_es.yml via GitLocalize
2021-01-24 19:21:47 +00:00
Luu7
0da0468b23
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:46 +00:00
dylan
cd643cabb5
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:45 +00:00
TheBusyBiscuit
f958385f3d
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:44 +00:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master
2021-01-24 18:09:40 +01:00
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
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
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
95170b6115
Update messages_he.yml
2021-01-22 13:16:40 +01:00