1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

4267 Commits

Author SHA1 Message Date
HeroBrineKing
191c4ffa60 Translate researches_zh-TW.yml via GitLocalize 2020-07-25 13:33:44 +00:00
TheBusyBiscuit
9435dfa2f2 Reduced technical debt and fixed a small issue 2020-07-25 15:29:45 +02:00
TheBusyBiscuit
66f79a0b7f
[CI skip] Merge pull request #2129 from TheBusyBiscuit/gitlocalize-12446
Tagalog/Filipino Translation Update
2020-07-25 15:22:31 +02:00
Scott Gomez Andoy
8792d8eace Translate researches_tl.yml via GitLocalize 2020-07-25 13:19:02 +00:00
Scott Gomez Andoy
9d1b307568 Translate messages_tl.yml via GitLocalize 2020-07-25 13:19:00 +00:00
TheBusyBiscuit
eccfc115ed
Merge pull request #2128 from TheBusyBiscuit/gitlocalize-12445
Updated german translations
2020-07-25 15:15:47 +02:00
TheBusyBiscuit
5234efb64f Translate researches_de.yml via GitLocalize 2020-07-25 13:15:19 +00:00
MeerBiene
85d7cb0f69 Translate researches_de.yml via GitLocalize 2020-07-25 13:15:18 +00:00
TheBusyBiscuit
5b706ca6b3 Translate messages_de.yml via GitLocalize 2020-07-25 13:15:17 +00:00
TheBusyBiscuit
17cd55bf53
Merge pull request #2072 from TheBusyBiscuit/experimental
Merge of "experimental" branch
2020-07-25 15:07:47 +02:00
TheBusyBiscuit
447012efdf Don't consume zombie pills in creative 2020-07-25 15:02:51 +02:00
TheBusyBiscuit
dc854326ff Added sound effects to the Iron Golem Assembler 2020-07-25 14:59:53 +02:00
TheBusyBiscuit
e92e95c59e Fixed Enchantment Rune 2020-07-25 14:57:05 +02:00
TheBusyBiscuit
f9dfb135d0
[CI skip] Merge pull request #2127 from TheBusyBiscuit/gitlocalize-12444
Tagalog/Filipino Translation Update
2020-07-25 14:46:35 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +02:00
TheBusyBiscuit
f15efd6cc2 Iron Golems require Carved Pumpkins 2020-07-25 14:42:29 +02:00
Scott Gomez Andoy
30e1a6ce0a Translate messages_tl.yml via GitLocalize 2020-07-25 12:41:27 +00:00
TheBusyBiscuit
107957a805 Fixed lore 2020-07-25 14:41:15 +02:00
TheBusyBiscuit
88604ee432 Fixed Iron Golem Assembler spawning Withers :o 2020-07-25 14:37:04 +02:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
2020-07-25 14:27:12 +02:00
TheBusyBiscuit
20372f7e05
[CI skip] Merge pull request #2125 from TheBusyBiscuit/gitlocalize-12442
Updated Ukrainian localizations
2020-07-25 14:23:10 +02:00
TheBusyBiscuit
583a971c4f
[CI skip] Merge pull request #2124 from TheBusyBiscuit/gitlocalize-12441
Updated Russian localizations
2020-07-25 14:22:44 +02:00
TheBusyBiscuit
2ef9dc9181
[CI skip] Merge pull request #2126 from TheBusyBiscuit/gitlocalize-12443
Updated german messages
2020-07-25 14:22:13 +02:00
TheBusyBiscuit
6374f09d29 Translate messages_de.yml via GitLocalize 2020-07-25 12:21:58 +00:00
TheBusyBiscuit
4b7e933410
[CI skip] Merge pull request #2123 from TheBusyBiscuit/gitlocalize-12440
Updated Turkish Translation
2020-07-25 14:19:52 +02:00
TheBusyBiscuit
42c57f8907 [CI skip] Small change 2020-07-25 14:19:09 +02:00
SoSeDiK
77f5224d14 Translate messages_uk.yml via GitLocalize 2020-07-25 12:05:24 +00:00
SoSeDiK
df088d17d7 Translate recipes_ru.yml via GitLocalize 2020-07-25 12:04:27 +00:00
TheBusyBiscuit
41fa798bd3 Translate messages_ru.yml via GitLocalize 2020-07-25 12:04:25 +00:00
SoSeDiK
c6db53205c Translate messages_ru.yml via GitLocalize 2020-07-25 12:04:24 +00:00
LinoxGH
b68227b7b8 Translate messages_tr.yml via GitLocalize 2020-07-25 12:03:34 +00:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097
Fixed piglin SlimefunItem pickup
2020-07-25 13:56:58 +02:00
TheBusyBiscuit
da37e78ffc
[CI skip] Updated change log 2020-07-25 13:55:52 +02:00
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
poma123
a323b09e38 Fixed a tremendous mistake 2020-07-25 13:41:11 +02:00
poma123
5ff93b75e0 Added PiglinListener 2020-07-25 13:37:04 +02:00
poma123
a6d69ee9d6 Requested changes 2020-07-25 12:31:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
poma123
17a68ddcf5 Removed unnecessary Zombified Piglin check 2020-07-25 12:19:02 +02:00
poma123
9fb79c8622 Fixed piglin SlimefunItem pickup 2020-07-25 12:04:22 +02:00
dniym
e61b4dca70
Merge pull request #6 from TheBusyBiscuit/master
updated to current sf
2020-07-24 21:47:38 -04:00
TheBusyBiscuit
c212345a92 [CI skip] Updated issue template 2020-07-24 19:23:00 +02:00
TheBusyBiscuit
abc47af565 Fixed exception handling 2020-07-24 19:11:38 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
6a11c6af88
[CI skip] Merge pull request #2118 from TheBusyBiscuit/gitlocalize-12439
Updated hungarian translations
2020-07-24 16:35:02 +02:00
András Marczinkó
6d74effbdf Translate resources_hu.yml via GitLocalize 2020-07-24 14:34:45 +00:00
András Marczinkó
3e5799391a Translate recipes_hu.yml via GitLocalize 2020-07-24 14:34:44 +00:00
András Marczinkó
b9fb1fe7bd Translate researches_hu.yml via GitLocalize 2020-07-24 14:34:42 +00:00
András Marczinkó
6cfc8b7bfc Translate categories_hu.yml via GitLocalize 2020-07-24 14:34:41 +00:00