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

3976 Commits

Author SHA1 Message Date
dniym
8305729cfb
Update RandomMobDrop.java
made requested changes.
2020-08-02 11:45:19 -04:00
dniym
80ee551ca2 Made requested changes. 2020-07-30 20:14:14 -04:00
dniym
4f5c1f6760 made requested changes 2020-07-26 12:06:06 -04:00
dniym
260a6f4f61 forgot one 2020-07-26 10:51:18 -04:00
dniym
65f8519805 made requested changes 2020-07-26 10:49:41 -04:00
dniym
ba8aafe312 made requested changes 2020-07-26 10:20:17 -04:00
dniym
22a0623485 fixed formatting 2020-07-25 20:41:27 -04:00
dniym
9093e292a1 Rebased and re-commital of Piglin barter recipe addition. 2020-07-25 20:38:15 -04:00
TheBusyBiscuit
1fbacdc656
[Ci skip] Merge pull request #2135 from TheBusyBiscuit/gitlocalize-12452 2020-07-26 01:29:58 +02:00
bito-blosh
d1224b2d44 Translate resources_ja.yml via GitLocalize 2020-07-25 23:03:32 +00:00
bito-blosh
cb439b5aee Translate messages_ja.yml via GitLocalize 2020-07-25 23:03:31 +00:00
bito-blosh
9e317e8c4e Translate researches_ja.yml via GitLocalize 2020-07-25 23:03:30 +00:00
bito-blosh
ea3c680aaf Translate recipes_ja.yml via GitLocalize 2020-07-25 23:03:29 +00:00
TheBusyBiscuit
3ef6e2066a
Fixed a typo 2020-07-25 23:15:24 +02:00
TheBusyBiscuit
c717c0e4ce
[CI skip] Merge pull request #2130 from TheBusyBiscuit/gitlocalize-12447
Updated researches for chinese (Taiwan)
2020-07-25 15:39:47 +02:00
TheBusyBiscuit
0fab85de36
[CI skip] Merge pull request #2131 from TheBusyBiscuit/gitlocalize-12448
Updated TR localization
2020-07-25 15:39:30 +02:00
LinoxGH
8844ec17d7 Translate researches_tr.yml via GitLocalize 2020-07-25 13:36:45 +00:00
LinoxGH
8230987cfc Translate messages_tr.yml via GitLocalize 2020-07-25 13:36:44 +00:00
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