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
4,838 Commits 1 Branch 0 Tags 64 MiB
7814bdcdee
Commit Graph

906 Commits

Author SHA1 Message Date
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02: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
TheBusyBiscuit
655b429f0d Added a new super tag 2020-10-04 13:31:52 +02: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
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
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
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
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