mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
5,490 Commits 1 Branch 0 Tags 64 MiB
e36027fb48
Commit Graph

1058 Commits

Author SHA1 Message Date
Om Uparkar
12038c2c96 updated wiki.json 2020-10-05 03:35:03 +05:30
TheBusyBiscuit
655b429f0d Added a new super tag 2020-10-04 13:31:52 +02:00
LinoxGH
6347e2f6ca
Merge branch 'master' into beeArmor 2020-10-04 08:48:05 +03:00
TheBusyBiscuit
8bbdc37130 Refactored Climbing Picks and added Tags 2020-10-04 02:28:59 +02:00
Seggan
23efd62c49 Added crash helmet listener and research 2020-10-03 16:31:27 -04:00
TheBusyBiscuit
e1a8c6f52e Added caveman talisman tag 2020-10-03 22:21:01 +02:00
LinoxGH
4b2f70203c
Merge branch 'master' into EnergyConnector 2020-10-03 23:19:04 +03:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
TheBusyBiscuit
b6a3b38294
Merge pull request #2377 from poma123/fix/cartography-table fixes #2357 
Cartography Table fix
 2020-10-03 21:29:26 +02:00
LinoxGH
f6492e74fb Added the research to language files. 2020-10-03 21:48:36 +03:00
Senne Van Rompaey
178fc6eb22 Rename Hastier to Caveman 2020-10-03 16:52:49 +02:00
Senne Van Rompaey
357f325792 Add message entry for hastier talisman 2020-10-02 22:04:21 +02:00
Senne Van Rompaey
4692bce343 Add entry to researches_en 2020-10-02 21:53:53 +02:00
poma123
76bc9b1192 Fixed capitalization 2020-10-01 21:25:56 +02:00
poma123
30603d9bf5 Added an EventHandler for Cartography Table 2020-10-01 19:12:09 +02:00
TheBusyBiscuit
d4c26f20f0
Merge branch 'master' into beeArmor 2020-09-21 15:59:56 +02:00
TheBusyBiscuit
4412b40709
Merge branch 'master' into tags 2020-09-21 15:59:08 +02:00
Seggan
5857b85199 Added research text 2020-09-20 12:52:16 -04:00
TheBusyBiscuit
23bf314905 Added fluid-sensitive tag 2020-09-19 11:39:35 +02:00
TheBusyBiscuit
a98ff148e6 Jigsaw! 2020-09-13 12:06:43 +02:00
TheBusyBiscuit
b14f0b76c0 Added unbreakable tag 2020-09-13 12:00:45 +02:00
poma123
12b32b0856 Merge remote-tracking branch 'upstream/master' into pr/1909 2020-09-12 12:27:24 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
 2020-09-11 10:33:02 +02:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05:00
TheBusyBiscuit
8a3165e9ba Fixed some tags and added glass 2020-09-10 00:33:47 +02:00
TheBusyBiscuit
81a8732f41 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-07 13:06:50 +02:00
TheBusyBiscuit
4fe2aee565 Another mistake 2020-09-07 13:00:15 +02:00
TheBusyBiscuit
7e7fde9a47 Slight correction 2020-09-07 12:59:38 +02:00
TheBusyBiscuit
3220a124aa Added more Unit Tests 2020-09-07 12:41:04 +02:00
TheBusyBiscuit
5b72faddc3 Implemented tags 2020-09-07 11:08:39 +02:00
TheBusyBiscuit
06498e3f63 Added Unit Test and loop detection 2020-09-07 01:13:25 +02:00
TheBusyBiscuit
773996617d Added Tags 2020-09-07 00:31:26 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
Nameless
3b9a42713a Translate researches_zh-CN.yml via GitLocalize 2020-09-06 04:24:14 +00:00
TheBusyBiscuit
4ef4332ffa Translate messages_zh-CN.yml via GitLocalize 2020-09-06 04:24:10 +00:00
TheBusyBiscuit
5f897de0b0
[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867 
messges_es
 2020-09-05 09:57:06 +02:00
Luu7
1c1b2251d0 Translate researches_es.yml via GitLocalize 2020-09-04 20:21:14 +00:00
Luu7
d11145d98c Translate messages_es.yml via GitLocalize 2020-09-04 20:09:41 +00:00
TheBusyBiscuit
120d3299ee
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841 
New pull request
 2020-09-04 10:02:31 +02:00
Pierre
1ee04e79b3 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:25 +00:00
amarcais53
d22c14e5a6 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:24 +00:00
TheBusyBiscuit
cc2dd0dd64 Translate messages_ja.yml via GitLocalize 2020-09-03 05:32:59 +00:00
bito-blosh
af89dba9f6 Translate researches_ja.yml via GitLocalize 2020-09-03 05:32:27 +00:00
TheBusyBiscuit
d0498f51c5 Translate messages_de.yml via GitLocalize 2020-09-02 10:13:36 +00:00
TheBusyBiscuit
2dfa2f139b Translate researches_de.yml via GitLocalize 2020-09-02 10:13:35 +00:00
LinoxGH
4fde84d521 Translate researches_tr.yml via GitLocalize 2020-09-02 10:06:23 +00:00
LinoxGH
7db615fb82 Translate messages_tr.yml via GitLocalize 2020-09-02 10:06:20 +00:00
TheBusyBiscuit
486253973c Renamed to Villager Rune 2020-09-02 11:16:45 +02:00
TheBusyBiscuit
4bc22ab106 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
into experimental

Conflicts:
	CHANGELOG.md
 2020-08-24 21:12:04 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
Sfiguz7
e06d17f8e5 Restored original plugin.yml as pulling hadn't 2020-08-23 13:58:29 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
100petr
d6e519c840 Translate messages_cs.yml via GitLocalize 2020-08-21 13:27:22 +00:00
TheBusyBiscuit
29092b87c9
Merge branch 'experimental' into IcePick 2020-08-20 22:56:09 +02:00
TheBusyBiscuit
d8d4811974 Merged Nitwit Rune and Shulker Shell PRs 2020-08-20 18:20:25 +02:00
TheBusyBiscuit
65021f7615
Merge branch 'rune' into ShulkerShell 2020-08-20 17:33:27 +02:00
LinoxGH
a54e8623d3
Merge branch 'master' into ShulkerShell 2020-08-20 12:21:50 +03:00
LinoxGH
5f78e7a854
Merge branch 'master' into IcePick 2020-08-20 11:43:14 +03:00
Vravinite
310622c3ac Translate messages_es.yml via GitLocalize 2020-08-19 23:50:04 +00:00
LinoxGH
5f0df75b81 Translate messages_tr.yml via GitLocalize 2020-08-19 12:42:33 +00:00
TheBusyBiscuit
4f3854877b
[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659 
Updated Russian localizations
 2020-08-19 14:37:35 +02:00
TheBusyBiscuit
15487fb333 Translate messages_de.yml via GitLocalize 2020-08-19 12:33:36 +00:00
SoSeDiK
273e459e26 Translate recipes_ru.yml via GitLocalize 2020-08-19 12:20:10 +00:00
SoSeDiK
dbd5cc1641 Translate messages_ru.yml via GitLocalize 2020-08-19 12:20:08 +00:00
TheBusyBiscuit
57b3f06aa6
Merge pull request #2220 from dniym/NitwitRune 
Added Rune of Unemployment
 2020-08-19 13:58:16 +02:00
TheBusyBiscuit
9d4d2060ba [CI skip] Added a few more strings to translation files 2020-08-18 14:45:51 +02:00
Scott Gomez Andoy
646fb6d523 Translate messages_tl.yml via GitLocalize 2020-08-17 11:26:10 +00:00
TheBusyBiscuit
0d27a787ab Added a new config option for setting Players on fire when radioactive 2020-08-17 02:23:59 +02:00
TheBusyBiscuit
c98fe74ea9
Merge branch 'master' into NitwitRune 2020-08-17 00:25:18 +02:00
dniym
b22bdb55ff Made requested changes 2020-08-16 13:33:36 -04:00
Luu7
9a6b8d697d Translate messages_es.yml via GitLocalize 2020-08-14 21:53:14 +00:00
TheBusyBiscuit
bae8421511 Translate messages_de.yml via GitLocalize 2020-08-13 23:51:00 +00:00
LinoxGH
acfc3c6880 Translate messages_tr.yml via GitLocalize 2020-08-13 19:53:13 +00:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +02:00
dniym
a1be08034b made requested changes 2020-08-12 16:04:35 -04:00
dniym
b27059240b Added Rune of Unemployment 
Approved Suggestion: #284 - Vitamin_CE#9804
 2020-08-11 20:58:17 -04:00
Nameless
517bd6139e Translate messages_zh-CN.yml via GitLocalize 2020-08-10 06:47:24 +00:00
LinoxGH
9175f27fdd Translate messages_tr.yml via GitLocalize 2020-08-09 14:59:09 +00:00
Luu7
adddf4811d Translate messages_es.yml via GitLocalize 2020-08-09 13:07:04 +00:00
TheBusyBiscuit
bb40017985 Translate messages_de.yml via GitLocalize 2020-08-09 09:48:03 +00:00
TheBusyBiscuit
e4f5ea62d9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-09 11:44:03 +02:00
TheBusyBiscuit
66f4c48b4b Fixes #2205 2020-08-09 11:33:48 +02:00
TheBusyBiscuit
e6958f8e34
[CI skip] Merge pull request #2210 from TheBusyBiscuit/gitlocalize-12575 
Updated messages_zh-CN.yml
 2020-08-09 11:20:57 +02:00
Nameless
af32c0ed4a Translate recipes_zh-CN.yml via GitLocalize 2020-08-09 08:20:48 +00:00
Nameless
a3f58150ee Translate messages_zh-CN.yml via GitLocalize 2020-08-09 08:17:17 +00:00
Vravinite
b0c040ea7a Translate recipes_es.yml via GitLocalize 2020-08-06 07:47:06 +00:00
Luu7
4a45757a53 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:03 +00:00
Luu7
33d802b940 Translate researches_es.yml via GitLocalize 2020-08-06 07:47:02 +00:00
TheBusyBiscuit
dde0ab7de6
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544 
Updated hungarian translations
 2020-08-05 23:39:44 +02:00
TheBusyBiscuit
94843c79c0
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540 
Update Japanese translation
 2020-08-05 23:39:18 +02:00
TheBusyBiscuit
a032d151f1
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539 
Updated TR localization
 2020-08-05 23:38:52 +02:00
TheBusyBiscuit
e758be8d3c
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538 
Tagalog/Filipino Translation Update
 2020-08-05 23:38:28 +02:00
poma123
f89f3a35bb Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:36 +00:00
András Marczinkó
9594046bd5 Translate recipes_hu.yml via GitLocalize 2020-08-05 21:36:35 +00:00
TheBusyBiscuit
c2cc7ab96c Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:07 +00:00
LinoxGH
cd7a94516a Translate messages_tr.yml via GitLocalize 2020-08-05 15:06:58 +00:00
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525 
Added korean as a language
 2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523 
Updated german translation
 2020-08-04 12:54:20 +02:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482 
Categories_it
 2020-08-01 16:58:41 +02:00
prolletto64
bf3a0391d0 Translate categories_it.yml via GitLocalize 2020-07-31 13:43:17 +00:00
prolletto64
db424e0437 Translate researches_it.yml via GitLocalize 2020-07-31 13:41:59 +00:00
Scott Gomez Andoy
5d22bfb109 Translate recipes_tl.yml via GitLocalize 2020-07-30 23:59:34 +00:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
SoSeDiK
8ddb055083 Translate researches_ru.yml via GitLocalize 2020-07-30 11:45:13 +00:00
SoSeDiK
2999e777f9 Translate messages_ru.yml via GitLocalize 2020-07-30 11:45:09 +00:00
TheBusyBiscuit
771456b6cd [CI skip] Fixed some malformed yaml 2020-07-30 13:30:20 +02:00
TheBusyBiscuit
a363cd1f5f
[CI skip] Removed trailing-spaces from config 2020-07-30 13:24:56 +02:00
Nameless
08412f3c6c Translate researches_zh-CN.yml via GitLocalize 2020-07-28 01:16:18 +00:00
Nameless
641d24d48d Translate messages_zh-CN.yml via GitLocalize 2020-07-28 01:16:15 +00:00
TheBusyBiscuit
3573628621 Translate messages_hu.yml via GitLocalize 2020-07-26 23:00:23 +00:00
András Marczinkó
d01dadfa42 Translate researches_hu.yml via GitLocalize 2020-07-26 23:00:22 +00: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
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
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
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
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
Scott Gomez Andoy
30e1a6ce0a Translate messages_tl.yml via GitLocalize 2020-07-25 12:41:27 +00: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
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
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
LinoxGH
3b17874ea2
Merge branch 'experimental' into IcePick 2020-07-24 19:39:59 +03: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
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
572d3dceec
Merge branch 'experimental' into ShulkerShell 2020-07-13 17:05:39 +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
LinoxGH
ca2c068e7a
Merge branch 'experimental' into IcePick 2020-07-06 20:13:18 +03:00
bito-blosh
0c0e45a34b Translate recipes_ja.yml via GitLocalize 2020-07-05 16:46:45 +00:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02: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
LinoxGH
12176a9ae7
Merge branch 'experimental' into IcePick 2020-06-30 13:09:02 +03: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
LinoxGH
005d4c04cc Did the requested changes. 2020-06-28 18:53:12 +03:00
LinoxGH
073fe1322b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into IcePick 
 Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-06-28 14:42:34 +03:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02: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
207cb35dda Added Climbing Pick 2020-06-26 22:03:17 +03: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
Scott Gomez Andoy
526c2e5228 Translate recipes_tl.yml via GitLocalize 2020-06-25 23:36:17 +00:00