mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
3,939 Commits 1 Branch 0 Tags 64 MiB
92ca696140
Commit Graph

709 Commits

Author SHA1 Message Date
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
6374f09d29 Translate messages_de.yml via GitLocalize 2020-07-25 12:21:58 +00:00
SoSeDiK
77f5224d14 Translate messages_uk.yml via GitLocalize 2020-07-25 12:05:24 +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
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +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
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-13 10:41:53 +02:00
koloksk
28b44f8dd8 Translate categories_pl.yml via GitLocalize 2020-07-13 08:32:18 +00:00
Wirusiu
8c1c72cafd Translate messages_pl.yml via GitLocalize 2020-07-13 08:32:17 +00:00
Wirusiu
5ccf0faedf Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:12 +00:00
Nathan Adhitya
a342aaa1cc Translate categories_id.yml via GitLocalize 2020-07-13 08:16:08 +00:00
Scott Gomez Andoy
8dbb2cf2fb Translate researches_tl.yml via GitLocalize 2020-07-12 14:09:00 +00:00
bito-blosh
0c0e45a34b Translate recipes_ja.yml via GitLocalize 2020-07-05 16:46:45 +00:00
EnderWingZ
ceb8af5e58 Translate messages_id.yml via GitLocalize 2020-07-05 12:36:19 +00:00
Frozenkamui
fe6f61cce2 Translate researches_id.yml via GitLocalize 2020-07-05 12:36:11 +00:00
TheBusyBiscuit
6a950fe8d6 Fixed lore 2020-07-05 13:06:13 +02:00
TheBusyBiscuit
9426ebb2e9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
 2020-07-05 12:08:30 +02:00
LinoxGH
bbcf1da3e2 Translate recipes_tr.yml via GitLocalize 2020-07-02 20:47:59 +00:00
Scott Gomez Andoy
424cf12b64 Translate messages_tl.yml via GitLocalize 2020-07-02 11:27:02 +00:00
Scott Gomez Andoy
144483178d Translate categories_tl.yml via GitLocalize 2020-07-02 11:27:01 +00:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune 
Enchantment Rune
 2020-06-30 01:23:20 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00:00
HeroBrineKing
758e687783 Translate messages_zh-TW.yml via GitLocalize 2020-06-26 21:51:20 +00:00
HeroBrineKing
3ba284746b Translate researches_zh-TW.yml via GitLocalize 2020-06-26 21:51:18 +00:00
HeroBrineKing
6b89cd3fc2 Translate recipes_zh-TW.yml via GitLocalize 2020-06-26 21:51:17 +00:00
HeroBrineKing
dab48cbe13 Translate categories_zh-TW.yml via GitLocalize 2020-06-26 21:51:16 +00:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
SoSeDiK
6ab2b34a83 Translate researches_uk.yml via GitLocalize 2020-06-26 08:53:56 +00:00
SoSeDiK
ca73b4a891 Translate recipes_uk.yml via GitLocalize 2020-06-26 08:53:54 +00:00
SoSeDiK
1e6ac71bef Translate messages_uk.yml via GitLocalize 2020-06-26 08:53:53 +00:00
TheBusyBiscuit
05740b4459
[CI skip] Merge pull request #2051 from TheBusyBiscuit/gitlocalize-12226 
Updated Russian messages
 2020-06-26 10:43:43 +02:00
TheBusyBiscuit
2b1acfd121
[CI skip] Merge pull request #2052 from TheBusyBiscuit/gitlocalize-12227 
Updated Russian researches
 2020-06-26 10:41:29 +02:00
SoSeDiK
5d283c053d Translate recipes_ru.yml via GitLocalize 2020-06-26 08:38:51 +00:00
SoSeDiK
1b159091a0 Translate researches_ru.yml via GitLocalize 2020-06-26 08:38:41 +00:00
SoSeDiK
e358289c4b Translate messages_ru.yml via GitLocalize 2020-06-26 08:38:32 +00:00
TheBusyBiscuit
df8ae5738d
[CI skip] Merge pull request #2050 from TheBusyBiscuit/gitlocalize-12224 
Update recipes_zh-CN.yml
 2020-06-26 10:34:58 +02:00
Nameless
682dcf1189 Translate recipes_zh-CN.yml via GitLocalize 2020-06-26 04:57:58 +00:00