1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

891 Commits

Author SHA1 Message Date
poma123
bd0f15bc95 Translate messages_hu.yml via GitLocalize 2020-10-09 14:30:38 +00:00
bito-blosh
3e20911c48 Translate researches_ja.yml via GitLocalize 2020-10-09 12:13:19 +00:00
TheBusyBiscuit
c440fd0778 Translate messages_ja.yml via GitLocalize 2020-10-09 12:13:17 +00:00
TheBusyBiscuit
01d233af4d
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix
GPS Control Panel and GEO Scanner access checks
2020-10-08 14:37:16 +02:00
NCBPFluffyBear
b577c1e4a3 Did changes 2020-10-07 13:45:49 -05:00
Seggan
bb24bdd837 Merge remote-tracking branch 'upstream/master' 2020-10-05 10:55:26 -04:00
Om Uparkar
bf625c3371 corrected spelling mistakes and stuff in wiki.json 2020-10-05 11:55:53 +05:30
Seggan
3dcd5942aa Changed some linguistic things (Biscuit needs to be an English professor) 2020-10-04 22:03:48 -04:00
Om Uparkar
12038c2c96 updated wiki.json 2020-10-05 03:35:03 +05:30
Seggan
23efd62c49 Added crash helmet listener and research 2020-10-03 16:31:27 -04: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
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
Seggan
5857b85199 Added research text 2020-09-20 12:52:16 -04:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05: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